blob: 6bc5e8d0ae84ff65c9bb8ccee4c6146b4de17d49 [file] [log] [blame]
Josip Sokcevic4de5dea2022-03-23 21:15:14 +00001#!/usr/bin/env vpython3
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000045import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
Josip Sokcevic7958e302023-03-01 23:02:21 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
Josip Sokcevic7958e302023-03-01 23:02:21 +000050import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000055import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
Edward Lemur79d4f992019-11-11 23:49:02 +000058from third_party import six
59from six.moves import urllib
60
61
62if sys.version_info.major == 3:
63 basestring = (str,) # pylint: disable=redefined-builtin
64
Edward Lemurb9830242019-10-30 22:19:20 +000065
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
Edward Lemur0f58ae42019-04-30 17:24:12 +000068# Traces for git push will be stored in a traces directory inside the
69# depot_tools checkout.
70DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
71TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000072PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000073
74# When collecting traces, Git hashes will be reduced to 6 characters to reduce
75# the size after compression.
76GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
77# Used to redact the cookies from the gitcookies file.
78GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
79
Edward Lemurd4d1ba42019-09-20 21:46:37 +000080MAX_ATTEMPTS = 3
81
Edward Lemur1b52d872019-05-09 21:12:12 +000082# The maximum number of traces we will keep. Multiplied by 3 since we store
83# 3 files per trace.
84MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000085# Message to be displayed to the user to inform where to find the traces for a
86# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000087TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000088'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000090' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000091'Copies of your gitcookies file and git config have been recorded at:\n'
92' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000093# Format of the message to be stored as part of the traces to give developers a
94# better context when they go through traces.
95TRACES_README_FORMAT = (
96'Date: %(now)s\n'
97'\n'
98'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
99'Title: %(title)s\n'
100'\n'
101'%(description)s\n'
102'\n'
103'Execution time: %(execution_time)s\n'
104'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000105
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800106POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000107DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000108REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000109 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
110 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000111}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000113DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
114DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
115
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000116DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
117
thestig@chromium.org44202a22014-03-11 19:22:18 +0000118# Valid extensions for files we want to lint.
119DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
120DEFAULT_LINT_IGNORE_REGEX = r"$^"
121
Aiden Bennerc08566e2018-10-03 17:52:42 +0000122# File name for yapf style config files.
123YAPF_CONFIG_FILENAME = '.style.yapf'
124
Edward Lesmes50da7702020-03-30 19:23:43 +0000125# The issue, patchset and codereview server are stored on git config for each
126# branch under branch.<branch-name>.<config-key>.
127ISSUE_CONFIG_KEY = 'gerritissue'
128PATCHSET_CONFIG_KEY = 'gerritpatchset'
129CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000130# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
131# you make to Gerrit. Instead, it creates a new commit object that contains all
132# changes you've made, diffed against a parent/merge base.
133# This is the hash of the new squashed commit and you can find this on Gerrit.
134GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
135# This is the latest uploaded local commit hash.
136LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000137
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000138# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000139Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000140
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000141# Initialized in main()
142settings = None
143
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100144# Used by tests/git_cl_test.py to add extra logging.
145# Inside the weirdly failing test, add this:
146# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700147# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100148_IS_BEING_TESTED = False
149
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000150_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000151
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000152_KNOWN_GERRIT_TO_SHORT_URLS = {
153 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
154 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
155}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000156assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
157 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000158
159
Joanna Wang18de1f62023-01-21 01:24:24 +0000160# Maximum number of branches in a stack that can be traversed and uploaded
161# at once. Picked arbitrarily.
162_MAX_STACKED_BRANCHES_UPLOAD = 20
163
164
Joanna Wang892f2ce2023-03-14 21:39:47 +0000165# Environment variable to indicate if user is participating in the stcked
166# changes dogfood.
167DOGFOOD_STACKED_CHANGES_VAR = 'DOGFOOD_STACKED_CHANGES'
168
169
Joanna Wang5051ffe2023-03-01 22:24:07 +0000170# Repo prefixes that are enrolled in the stacked changes dogfood.
171DOGFOOD_STACKED_CHANGES_REPOS = [
172 'chromium.googlesource.com/infra/',
173 'chrome-internal.googlesource.com/infra/'
174]
175
176
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000177class GitPushError(Exception):
178 pass
179
180
Christopher Lamf732cd52017-01-24 12:40:11 +1100181def DieWithError(message, change_desc=None):
182 if change_desc:
183 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000184 print('\n ** Content of CL description **\n' +
185 '='*72 + '\n' +
186 change_desc.description + '\n' +
187 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100188
vapiera7fbd5a2016-06-16 09:17:49 -0700189 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000190 sys.exit(1)
191
192
Christopher Lamf732cd52017-01-24 12:40:11 +1100193def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000194 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000195 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000196 with open(backup_path, 'wb') as backup_file:
197 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100198
199
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000200def GetNoGitPagerEnv():
201 env = os.environ.copy()
202 # 'cat' is a magical git string that disables pagers on all platforms.
203 env['GIT_PAGER'] = 'cat'
204 return env
205
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000206
bsep@chromium.org627d9002016-04-29 00:00:52 +0000207def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000208 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000209 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
210 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000211 except subprocess2.CalledProcessError as e:
212 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000213 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000214 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
215 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000216 out = e.stdout.decode('utf-8', 'replace')
217 if e.stderr:
218 out += e.stderr.decode('utf-8', 'replace')
219 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000220
221
222def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000223 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000224 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000225
226
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000227def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000228 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700229 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000230 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700231 else:
232 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000233 try:
tandrii5d48c322016-08-18 16:19:37 -0700234 (out, _), code = subprocess2.communicate(['git'] + args,
235 env=GetNoGitPagerEnv(),
236 stdout=subprocess2.PIPE,
237 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000238 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700239 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900240 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000241 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000242
243
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000244def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000245 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000246 return RunGitWithCode(args, suppress_stderr=True)[1]
247
248
tandrii2a16b952016-10-19 07:09:44 -0700249def time_sleep(seconds):
250 # Use this so that it can be mocked in tests without interfering with python
251 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700252 return time.sleep(seconds)
253
254
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000255def time_time():
256 # Use this so that it can be mocked in tests without interfering with python
257 # system machinery.
258 return time.time()
259
260
Edward Lemur1b52d872019-05-09 21:12:12 +0000261def datetime_now():
262 # Use this so that it can be mocked in tests without interfering with python
263 # system machinery.
264 return datetime.datetime.now()
265
266
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100267def confirm_or_exit(prefix='', action='confirm'):
268 """Asks user to press enter to continue or press Ctrl+C to abort."""
269 if not prefix or prefix.endswith('\n'):
270 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100271 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100272 mid = ' Press'
273 elif prefix.endswith(' '):
274 mid = 'press'
275 else:
276 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000277 gclient_utils.AskForData(
278 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100279
280
281def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000282 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000283 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100284 while True:
285 if 'yes'.startswith(result):
286 return True
287 if 'no'.startswith(result):
288 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000289 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100290
291
machenbach@chromium.org45453142015-09-15 08:45:22 +0000292def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000293 prop_list = getattr(options, 'properties', [])
294 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000295 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000296 try:
297 properties[key] = json.loads(val)
298 except ValueError:
299 pass # If a value couldn't be evaluated, treat it as a string.
300 return properties
301
302
Edward Lemur4c707a22019-09-24 21:13:43 +0000303def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000304 """Calls a buildbucket v2 method and returns the parsed json response."""
305 headers = {
306 'Accept': 'application/json',
307 'Content-Type': 'application/json',
308 }
309 request = json.dumps(request)
310 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
311
312 logging.info('POST %s with %s' % (url, request))
313
314 attempts = 1
315 time_to_sleep = 1
316 while True:
317 response, content = http.request(url, 'POST', body=request, headers=headers)
318 if response.status == 200:
319 return json.loads(content[4:])
320 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
321 msg = '%s error when calling POST %s with %s: %s' % (
322 response.status, url, request, content)
323 raise BuildbucketResponseException(msg)
324 logging.debug(
325 '%s error when calling POST %s with %s. '
326 'Sleeping for %d seconds and retrying...' % (
327 response.status, url, request, time_to_sleep))
328 time.sleep(time_to_sleep)
329 time_to_sleep *= 2
330 attempts += 1
331
332 assert False, 'unreachable'
333
334
Edward Lemur6215c792019-10-03 21:59:05 +0000335def _parse_bucket(raw_bucket):
336 legacy = True
337 project = bucket = None
338 if '/' in raw_bucket:
339 legacy = False
340 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000341 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000342 elif raw_bucket.startswith('luci.'):
343 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000344 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000345 elif '.' in raw_bucket:
346 project = raw_bucket.split('.')[0]
347 bucket = raw_bucket
348 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000349 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000350 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
351 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000352
353
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000354def _canonical_git_googlesource_host(host):
355 """Normalizes Gerrit hosts (with '-review') to Git host."""
356 assert host.endswith(_GOOGLESOURCE)
357 # Prefix doesn't include '.' at the end.
358 prefix = host[:-(1 + len(_GOOGLESOURCE))]
359 if prefix.endswith('-review'):
360 prefix = prefix[:-len('-review')]
361 return prefix + '.' + _GOOGLESOURCE
362
363
364def _canonical_gerrit_googlesource_host(host):
365 git_host = _canonical_git_googlesource_host(host)
366 prefix = git_host.split('.', 1)[0]
367 return prefix + '-review.' + _GOOGLESOURCE
368
369
370def _get_counterpart_host(host):
371 assert host.endswith(_GOOGLESOURCE)
372 git = _canonical_git_googlesource_host(host)
373 gerrit = _canonical_gerrit_googlesource_host(git)
374 return git if gerrit == host else gerrit
375
376
Quinten Yearsley777660f2020-03-04 23:37:06 +0000377def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000378 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700379
380 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000381 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000382 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700383 options: Command-line options.
384 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000385 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000386 for project, bucket, builder in jobs:
387 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000388 print('To see results here, run: git cl try-results')
389 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700390
Quinten Yearsley777660f2020-03-04 23:37:06 +0000391 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000392 if not requests:
393 return
394
Edward Lemur5b929a42019-10-21 17:57:39 +0000395 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000396 http.force_exception_to_status_code = True
397
398 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000399 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
400 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000401
402 errors = [
403 ' ' + response['error']['message']
404 for response in batch_response.get('responses', [])
405 if 'error' in response
406 ]
407 if errors:
408 raise BuildbucketResponseException(
409 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
410
411
Quinten Yearsley777660f2020-03-04 23:37:06 +0000412def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000413 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000414 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000415 shared_properties = {
416 'category': options.ensure_value('category', 'git_cl_try')
417 }
418 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000419 shared_properties['clobber'] = True
420 shared_properties.update(_get_properties_from_options(options) or {})
421
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000422 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000423 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000424 shared_tags.append({'key': 'retry_failed',
425 'value': '1'})
426
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000427 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000428 for (project, bucket, builder) in jobs:
429 properties = shared_properties.copy()
430 if 'presubmit' in builder.lower():
431 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000432
Edward Lemur45768512020-03-02 19:03:14 +0000433 requests.append({
434 'scheduleBuild': {
435 'requestId': str(uuid.uuid4()),
436 'builder': {
437 'project': getattr(options, 'project', None) or project,
438 'bucket': bucket,
439 'builder': builder,
440 },
441 'gerritChanges': gerrit_changes,
442 'properties': properties,
443 'tags': [
444 {'key': 'builder', 'value': builder},
445 ] + shared_tags,
446 }
447 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000448
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000449 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000450 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000451 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000452 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000453 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000454 'id': options.revision,
455 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000456 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000457
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000458 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000459
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000460
Quinten Yearsley777660f2020-03-04 23:37:06 +0000461def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000462 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000463
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000464 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000465 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000466 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000467 request = {
468 'predicate': {
469 'gerritChanges': [changelist.GetGerritChange(patchset)],
470 },
471 'fields': ','.join('builds.*.' + field for field in fields),
472 }
tandrii221ab252016-10-06 08:12:04 -0700473
Edward Lemur5b929a42019-10-21 17:57:39 +0000474 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000475 if authenticator.has_cached_credentials():
476 http = authenticator.authorize(httplib2.Http())
477 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700478 print('Warning: Some results might be missing because %s' %
479 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000480 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000481 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000482 http.force_exception_to_status_code = True
483
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000484 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
485 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000486
Edward Lemur45768512020-03-02 19:03:14 +0000487
Edward Lemur5b929a42019-10-21 17:57:39 +0000488def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000489 """Fetches builds from the latest patchset that has builds (within
490 the last few patchsets).
491
492 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 changelist (Changelist): The CL to fetch builds for
494 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000495 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
496 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000497 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000498 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
499 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000500 """
501 assert buildbucket_host
502 assert changelist.GetIssue(), 'CL must be uploaded first'
503 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000504 if latest_patchset is None:
505 assert changelist.GetMostRecentPatchset()
506 ps = changelist.GetMostRecentPatchset()
507 else:
508 assert latest_patchset > 0, latest_patchset
509 ps = latest_patchset
510
Quinten Yearsley983111f2019-09-26 17:18:48 +0000511 min_ps = max(1, ps - 5)
512 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000513 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000514 if len(builds):
515 return builds, ps
516 ps -= 1
517 return [], 0
518
519
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000520def _filter_failed_for_retry(all_builds):
521 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000522
523 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000524 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000525 i.e. a list of buildbucket.v2.Builds which includes status and builder
526 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000527
528 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000529 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000530 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000531 """
Edward Lemur45768512020-03-02 19:03:14 +0000532 grouped = {}
533 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000534 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000535 key = (builder['project'], builder['bucket'], builder['builder'])
536 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000537
Edward Lemur45768512020-03-02 19:03:14 +0000538 jobs = []
539 for (project, bucket, builder), builds in grouped.items():
540 if 'triggered' in builder:
541 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
542 'from a parent. Please schedule a manual job for the parent '
543 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000544 continue
545 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
546 # Don't retry if any are running.
547 continue
Edward Lemur45768512020-03-02 19:03:14 +0000548 # If builder had several builds, retry only if the last one failed.
549 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
550 # build, but in case of retrying failed jobs retrying a flaky one makes
551 # sense.
552 builds = sorted(builds, key=lambda b: b['createTime'])
553 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
554 continue
555 # Don't retry experimental build previously triggered by CQ.
556 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
557 for t in builds[-1]['tags']):
558 continue
559 jobs.append((project, bucket, builder))
560
561 # Sort the jobs to make testing easier.
562 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000563
564
Quinten Yearsley777660f2020-03-04 23:37:06 +0000565def _print_tryjobs(options, builds):
566 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000568 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 return
570
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000571 longest_builder = max(len(b['builder']['builder']) for b in builds)
572 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000573 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000574 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
575 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000576
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000577 builds_by_status = {}
578 for b in builds:
579 builds_by_status.setdefault(b['status'], []).append({
580 'id': b['id'],
581 'name': name_fmt.format(
582 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
583 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000585 sort_key = lambda b: (b['name'], b['id'])
586
587 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000589 if not builds:
590 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000592 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000593 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000594 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595 else:
596 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
597
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000598 print(colorize(title))
599 for b in sorted(builds, key=sort_key):
600 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000601
602 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000603 print_builds(
604 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
605 print_builds(
606 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
607 color=Fore.MAGENTA)
608 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
609 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
610 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000611 print_builds('Started:', builds_by_status.pop('STARTED', []),
612 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000613 print_builds(
614 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000616 print_builds(
617 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000618 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000619
620
Aiden Bennerc08566e2018-10-03 17:52:42 +0000621def _ComputeDiffLineRanges(files, upstream_commit):
622 """Gets the changed line ranges for each file since upstream_commit.
623
624 Parses a git diff on provided files and returns a dict that maps a file name
625 to an ordered list of range tuples in the form (start_line, count).
626 Ranges are in the same format as a git diff.
627 """
628 # If files is empty then diff_output will be a full diff.
629 if len(files) == 0:
630 return {}
631
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000632 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000633 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000634 diff_output = RunGit(diff_cmd)
635
636 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
637 # 2 capture groups
638 # 0 == fname of diff file
639 # 1 == 'diff_start,diff_count' or 'diff_start'
640 # will match each of
641 # diff --git a/foo.foo b/foo.py
642 # @@ -12,2 +14,3 @@
643 # @@ -12,2 +17 @@
644 # running re.findall on the above string with pattern will give
645 # [('foo.py', ''), ('', '14,3'), ('', '17')]
646
647 curr_file = None
648 line_diffs = {}
649 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
650 if match[0] != '':
651 # Will match the second filename in diff --git a/a.py b/b.py.
652 curr_file = match[0]
653 line_diffs[curr_file] = []
654 else:
655 # Matches +14,3
656 if ',' in match[1]:
657 diff_start, diff_count = match[1].split(',')
658 else:
659 # Single line changes are of the form +12 instead of +12,1.
660 diff_start = match[1]
661 diff_count = 1
662
663 diff_start = int(diff_start)
664 diff_count = int(diff_count)
665
666 # If diff_count == 0 this is a removal we can ignore.
667 line_diffs[curr_file].append((diff_start, diff_count))
668
669 return line_diffs
670
671
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000672def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000673 """Checks if a yapf file is in any parent directory of fpath until top_dir.
674
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000675 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000676 is found returns None. Uses yapf_config_cache as a cache for previously found
677 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000678 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000679 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680 # Return result if we've already computed it.
681 if fpath in yapf_config_cache:
682 return yapf_config_cache[fpath]
683
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000684 parent_dir = os.path.dirname(fpath)
685 if os.path.isfile(fpath):
686 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000687 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000688 # Otherwise fpath is a directory
689 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
690 if os.path.isfile(yapf_file):
691 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000692 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000693 # If we're at the top level directory, or if we're at root
694 # there is no provided style.
695 ret = None
696 else:
697 # Otherwise recurse on the current directory.
698 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000699 yapf_config_cache[fpath] = ret
700 return ret
701
702
Brian Sheedyb4307d52019-12-02 19:18:17 +0000703def _GetYapfIgnorePatterns(top_dir):
704 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000705
706 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
707 but this functionality appears to break when explicitly passing files to
708 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000709 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000710 the .yapfignore file should be in the directory that yapf is invoked from,
711 which we assume to be the top level directory in this case.
712
713 Args:
714 top_dir: The top level directory for the repository being formatted.
715
716 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000717 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000718 """
719 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000720 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000721 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000722 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000723
Anthony Politoc64e3902021-04-30 21:55:25 +0000724 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
725 stripped_line = line.strip()
726 # Comments and blank lines should be ignored.
727 if stripped_line.startswith('#') or stripped_line == '':
728 continue
729 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000730 return ignore_patterns
731
732
733def _FilterYapfIgnoredFiles(filepaths, patterns):
734 """Filters out any filepaths that match any of the given patterns.
735
736 Args:
737 filepaths: An iterable of strings containing filepaths to filter.
738 patterns: An iterable of strings containing fnmatch patterns to filter on.
739
740 Returns:
741 A list of strings containing all the elements of |filepaths| that did not
742 match any of the patterns in |patterns|.
743 """
744 # Not inlined so that tests can use the same implementation.
745 return [f for f in filepaths
746 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000747
748
Aaron Gable13101a62018-02-09 13:20:41 -0800749def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000750 """Prints statistics about the change to the user."""
751 # --no-ext-diff is broken in some versions of Git, so try to work around
752 # this by overriding the environment (but there is still a problem if the
753 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000754 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000755 if 'GIT_EXTERNAL_DIFF' in env:
756 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000757
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000758 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800759 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000760 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000761
762
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000763class BuildbucketResponseException(Exception):
764 pass
765
766
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000767class Settings(object):
768 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000770 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000771 self.tree_status_url = None
772 self.viewvc_url = None
773 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000774 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000775 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000776 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000777 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000778 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000779 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000780
Edward Lemur26964072020-02-19 19:18:51 +0000781 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000782 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000783 if self.updated:
784 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000785
Edward Lemur26964072020-02-19 19:18:51 +0000786 # The only value that actually changes the behavior is
787 # autoupdate = "false". Everything else means "true".
788 autoupdate = (
789 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
790
791 cr_settings_file = FindCodereviewSettingsFile()
792 if autoupdate != 'false' and cr_settings_file:
793 LoadCodereviewSettingsFromFile(cr_settings_file)
794 cr_settings_file.close()
795
796 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000798 @staticmethod
799 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000800 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000801
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000803 if self.root is None:
804 self.root = os.path.abspath(self.GetRelativeRoot())
805 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000806
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807 def GetTreeStatusUrl(self, error_ok=False):
808 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000809 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
810 if self.tree_status_url is None and not error_ok:
811 DieWithError(
812 'You must configure your tree status URL by running '
813 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814 return self.tree_status_url
815
816 def GetViewVCUrl(self):
817 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000818 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000819 return self.viewvc_url
820
rmistry@google.com90752582014-01-14 21:04:50 +0000821 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000822 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000823
rmistry@google.com5626a922015-02-26 14:03:30 +0000824 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000825 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000826 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000827 return run_post_upload_hook == "True"
828
Joanna Wangc8f23e22023-01-19 21:18:10 +0000829 def GetDefaultCCList(self):
830 return self._GetConfig('rietveld.cc')
831
Dirk Pranke6f0df682021-06-25 00:42:33 +0000832 def GetUsePython3(self):
833 return self._GetConfig('rietveld.use-python3')
834
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000835 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000836 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000837 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000838 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
839 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000840 # Default is squash now (http://crbug.com/611892#c23).
841 self.squash_gerrit_uploads = self._GetConfig(
842 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000843 return self.squash_gerrit_uploads
844
Edward Lesmes4de54132020-05-05 19:41:33 +0000845 def GetSquashGerritUploadsOverride(self):
846 """Return True or False if codereview.settings should be overridden.
847
848 Returns None if no override has been defined.
849 """
850 # See also http://crbug.com/611892#c23
851 result = self._GetConfig('gerrit.override-squash-uploads').lower()
852 if result == 'true':
853 return True
854 if result == 'false':
855 return False
856 return None
857
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000858 def GetIsGerrit(self):
859 """Return True if gerrit.host is set."""
860 if self.is_gerrit is None:
861 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
862 return self.is_gerrit
863
tandrii@chromium.org28253532016-04-14 13:46:56 +0000864 def GetGerritSkipEnsureAuthenticated(self):
865 """Return True if EnsureAuthenticated should not be done for Gerrit
866 uploads."""
867 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000868 self.gerrit_skip_ensure_authenticated = self._GetConfig(
869 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000870 return self.gerrit_skip_ensure_authenticated
871
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000872 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000873 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000874 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000875 # Git requires single quotes for paths with spaces. We need to replace
876 # them with double quotes for Windows to treat such paths as a single
877 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000878 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000879 return self.git_editor or None
880
thestig@chromium.org44202a22014-03-11 19:22:18 +0000881 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000882 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000883
884 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000885 return self._GetConfig(
886 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000887
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000888 def GetFormatFullByDefault(self):
889 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000890 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000891 result = (
892 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
893 error_ok=True).strip())
894 self.format_full_by_default = (result == 'true')
895 return self.format_full_by_default
896
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000897 def IsStatusCommitOrderByDate(self):
898 if self.is_status_commit_order_by_date is None:
899 result = (RunGit(['config', '--bool', 'cl.date-order'],
900 error_ok=True).strip())
901 self.is_status_commit_order_by_date = (result == 'true')
902 return self.is_status_commit_order_by_date
903
Edward Lemur26964072020-02-19 19:18:51 +0000904 def _GetConfig(self, key, default=''):
905 self._LazyUpdateIfNeeded()
906 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000907
908
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000909class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000910 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000911 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000912 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000913 DRY_RUN = 'dry_run'
914 COMMIT = 'commit'
915
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000916 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000917
918
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000919class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000920 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000921 self.issue = issue
922 self.patchset = patchset
923 self.hostname = hostname
924
925 @property
926 def valid(self):
927 return self.issue is not None
928
929
Edward Lemurf38bc172019-09-03 21:02:13 +0000930def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000931 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
932 fail_result = _ParsedIssueNumberArgument()
933
Edward Lemur678a6842019-10-03 22:25:05 +0000934 if isinstance(arg, int):
935 return _ParsedIssueNumberArgument(issue=arg)
936 if not isinstance(arg, basestring):
937 return fail_result
938
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000939 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000940 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700941
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000942 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000943 if not url.startswith('http'):
944 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000945 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
946 if url.startswith(short_url):
947 url = gerrit_url + url[len(short_url):]
948 break
949
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000950 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000951 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000952 except ValueError:
953 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200954
Alex Turner30ae6372022-01-04 02:32:52 +0000955 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
956 # URL.
957 if not arg.startswith('http') and '.' not in parsed_url.netloc:
958 return fail_result
959
Edward Lemur678a6842019-10-03 22:25:05 +0000960 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
961 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
962 # Short urls like https://domain/<issue_number> can be used, but don't allow
963 # specifying the patchset (you'd 404), but we allow that here.
964 if parsed_url.path == '/':
965 part = parsed_url.fragment
966 else:
967 part = parsed_url.path
968
969 match = re.match(
970 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
971 if not match:
972 return fail_result
973
974 issue = int(match.group('issue'))
975 patchset = match.group('patchset')
976 return _ParsedIssueNumberArgument(
977 issue=issue,
978 patchset=int(patchset) if patchset else None,
979 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000980
981
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000982def _create_description_from_log(args):
983 """Pulls out the commit log to use as a base for the CL description."""
984 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000985 if len(args) == 1 and args[0] == None:
986 # Handle the case where None is passed as the branch.
987 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000988 if len(args) == 1 and not args[0].endswith('.'):
989 log_args = [args[0] + '..']
990 elif len(args) == 1 and args[0].endswith('...'):
991 log_args = [args[0][:-1]]
992 elif len(args) == 2:
993 log_args = [args[0] + '..' + args[1]]
994 else:
995 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000996 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000997
998
Aaron Gablea45ee112016-11-22 15:14:38 -0800999class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001000 def __init__(self, issue, url):
1001 self.issue = issue
1002 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001003 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001004
1005 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001006 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001007 self.issue, self.url)
1008
1009
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001010_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001011 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001012 # TODO(tandrii): these two aren't known in Gerrit.
1013 'approval', 'disapproval'])
1014
1015
Joanna Wang6215dd02023-02-07 15:58:03 +00001016# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001017_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001018 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001019 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001020])
1021
1022
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024 """Changelist works with one changelist in local branch.
1025
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001026 Notes:
1027 * Not safe for concurrent multi-{thread,process} use.
1028 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001029 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001030 """
1031
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001032 def __init__(self,
1033 branchref=None,
1034 issue=None,
1035 codereview_host=None,
1036 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001037 """Create a new ChangeList instance.
1038
Edward Lemurf38bc172019-09-03 21:02:13 +00001039 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001040 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001042 global settings
1043 if not settings:
1044 # Happens when git_cl.py is used as a utility library.
1045 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001046
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 self.branchref = branchref
1048 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001049 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001050 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001051 else:
1052 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001053 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001054 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001055 self.lookedup_issue = False
1056 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001057 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001058 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001060 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001061 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001062 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001063 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001064
Edward Lemur125d60a2019-09-13 18:25:41 +00001065 # Lazily cached values.
1066 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1067 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001068 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001069 # Map from change number (issue) to its detail cache.
1070 self._detail_cache = {}
1071
1072 if codereview_host is not None:
1073 assert not codereview_host.startswith('https://'), codereview_host
1074 self._gerrit_host = codereview_host
1075 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001076
Edward Lesmese1576912021-02-16 21:53:34 +00001077 @property
1078 def owners_client(self):
1079 if self._owners_client is None:
1080 remote, remote_branch = self.GetRemoteBranch()
1081 branch = GetTargetRef(remote, remote_branch, None)
1082 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001083 host=self.GetGerritHost(),
1084 project=self.GetGerritProject(),
1085 branch=branch)
1086 return self._owners_client
1087
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001088 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001089 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001090
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001091 The return value is a string suitable for passing to git cl with the --cc
1092 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001093 """
1094 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001095 base_cc = settings.GetDefaultCCList()
1096 more_cc = ','.join(self.more_cc)
1097 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001098 return self.cc
1099
Daniel Cheng7227d212017-11-17 08:12:37 -08001100 def ExtendCC(self, more_cc):
1101 """Extends the list of users to cc on this CL based on the changed files."""
1102 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001104 def GetCommitDate(self):
1105 """Returns the commit date as provided in the constructor"""
1106 return self.commit_date
1107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001109 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001110 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001111 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001112 if not branchref:
1113 return None
1114 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001115 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 return self.branch
1117
1118 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001119 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 self.GetBranch() # Poke the lazy loader.
1121 return self.branchref
1122
Edward Lemur85153282020-02-14 22:06:29 +00001123 def _GitGetBranchConfigValue(self, key, default=None):
1124 return scm.GIT.GetBranchConfig(
1125 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001126
Edward Lemur85153282020-02-14 22:06:29 +00001127 def _GitSetBranchConfigValue(self, key, value):
1128 action = 'set %s to %r' % (key, value)
1129 if not value:
1130 action = 'unset %s' % key
1131 assert self.GetBranch(), 'a branch is needed to ' + action
1132 return scm.GIT.SetBranchConfig(
1133 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001134
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001135 @staticmethod
1136 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001137 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001138 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001140 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1141 settings.GetRoot(), branch)
1142 if not remote or not upstream_branch:
1143 DieWithError(
1144 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001145 'Verify this branch is set up to track another \n'
1146 '(via the --track argument to "git checkout -b ..."). \n'
1147 'or pass complete "git diff"-style arguments if supported, like\n'
1148 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149
1150 return remote, upstream_branch
1151
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001152 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001153 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001154 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001155 DieWithError('The upstream for the current branch (%s) does not exist '
1156 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001157 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001158 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001159
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001160 def GetUpstreamBranch(self):
1161 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001162 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001163 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001164 upstream_branch = upstream_branch.replace('refs/heads/',
1165 'refs/remotes/%s/' % remote)
1166 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1167 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001168 self.upstream_branch = upstream_branch
1169 return self.upstream_branch
1170
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001171 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001172 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 remote, branch = None, self.GetBranch()
1174 seen_branches = set()
1175 while branch not in seen_branches:
1176 seen_branches.add(branch)
1177 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001178 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 if remote != '.' or branch.startswith('refs/remotes'):
1180 break
1181 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001182 remotes = RunGit(['remote'], error_ok=True).split()
1183 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001184 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001185 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001186 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001187 logging.warning('Could not determine which remote this change is '
1188 'associated with, so defaulting to "%s".' %
1189 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001190 else:
Gavin Make6a62332020-12-04 21:57:10 +00001191 logging.warning('Could not determine which remote this change is '
1192 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 branch = 'HEAD'
1194 if branch.startswith('refs/remotes'):
1195 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001196 elif branch.startswith('refs/branch-heads/'):
1197 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001198 else:
1199 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001200 return self._remote
1201
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001202 def GetRemoteUrl(self):
1203 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1204
1205 Returns None if there is no remote.
1206 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001207 is_cached, value = self._cached_remote_url
1208 if is_cached:
1209 return value
1210
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001211 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001212 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001213
Edward Lemur298f2cf2019-02-22 21:40:39 +00001214 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001215 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001216 if host:
1217 self._cached_remote_url = (True, url)
1218 return url
1219
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001220 # If it cannot be parsed as an url, assume it is a local directory,
1221 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222 logging.warning('"%s" doesn\'t appear to point to a git host. '
1223 'Interpreting it as a local directory.', url)
1224 if not os.path.isdir(url):
1225 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001226 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1227 'but it doesn\'t exist.',
1228 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001229 return None
1230
1231 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001232 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001233
Edward Lemur79d4f992019-11-11 23:49:02 +00001234 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001235 if not host:
1236 logging.error(
1237 'Remote "%(remote)s" for branch "%(branch)s" points to '
1238 '"%(cache_path)s", but it is misconfigured.\n'
1239 '"%(cache_path)s" must be a git repo and must have a remote named '
1240 '"%(remote)s" pointing to the git host.', {
1241 'remote': remote,
1242 'cache_path': cache_path,
1243 'branch': self.GetBranch()})
1244 return None
1245
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001246 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001247 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001248
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001249 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001250 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001251 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001252 if self.GetBranch():
1253 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001254 if self.issue is not None:
1255 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001256 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 return self.issue
1258
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001259 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001261 issue = self.GetIssue()
1262 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001263 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001264 server = self.GetCodereviewServer()
1265 if short:
1266 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1267 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001268
Dirk Pranke6f0df682021-06-25 00:42:33 +00001269 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001270 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001271
Edward Lemur6c6827c2020-02-06 21:15:18 +00001272 def FetchDescription(self, pretty=False):
1273 assert self.GetIssue(), 'issue is required to query Gerrit'
1274
Edward Lemur9aa1a962020-02-25 00:58:38 +00001275 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001276 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1277 current_rev = data['current_revision']
1278 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001279
1280 if not pretty:
1281 return self.description
1282
1283 # Set width to 72 columns + 2 space indent.
1284 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1285 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1286 lines = self.description.splitlines()
1287 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001288
1289 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001290 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001291 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001292 if self.GetBranch():
1293 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001294 if self.patchset is not None:
1295 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001296 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 return self.patchset
1298
Edward Lemur9aa1a962020-02-25 00:58:38 +00001299 def GetAuthor(self):
1300 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1301
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001302 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001303 """Set this branch's patchset. If patchset=0, clears the patchset."""
1304 assert self.GetBranch()
1305 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001306 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001307 else:
1308 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001309 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001310
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001311 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001312 """Set this branch's issue. If issue isn't given, clears the issue."""
1313 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001314 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001315 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001316 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001317 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001318 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001319 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001320 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001321 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001322 else:
tandrii5d48c322016-08-18 16:19:37 -07001323 # Reset all of these just to be clean.
1324 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001325 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001326 ISSUE_CONFIG_KEY,
1327 PATCHSET_CONFIG_KEY,
1328 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001329 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001330 ]
tandrii5d48c322016-08-18 16:19:37 -07001331 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001332 try:
1333 self._GitSetBranchConfigValue(prop, None)
1334 except subprocess2.CalledProcessError:
1335 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001336 msg = RunGit(['log', '-1', '--format=%B']).strip()
1337 if msg and git_footers.get_footer_change_id(msg):
1338 print('WARNING: The change patched into this branch has a Change-Id. '
1339 'Removing it.')
1340 RunGit(['commit', '--amend', '-m',
1341 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001342 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001343 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001344 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001345
Joanna Wangb46232e2023-01-21 01:58:46 +00001346 def GetAffectedFiles(self, upstream, end_commit=None):
1347 # type: (str, Optional[str]) -> Sequence[str]
1348 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001349 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001350 return [
1351 f for _, f in scm.GIT.CaptureStatus(
1352 settings.GetRoot(), upstream, end_commit=end_commit)
1353 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001354 except subprocess2.CalledProcessError:
1355 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001356 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001357 'This branch probably doesn\'t exist anymore. To reset the\n'
1358 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001359 ' git branch --set-upstream-to origin/main %s\n'
1360 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001361 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001362
dsansomee2d6fd92016-09-08 00:10:47 -07001363 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001364 assert self.GetIssue(), 'issue is required to update description'
1365
1366 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001367 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001368 if not force:
1369 confirm_or_exit(
1370 'The description cannot be modified while the issue has a pending '
1371 'unpublished edit. Either publish the edit in the Gerrit web UI '
1372 'or delete it.\n\n', action='delete the unpublished edit')
1373
1374 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001375 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001376 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001377 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001378 description, notify='NONE')
1379
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001380 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001381
Edward Lemur75526302020-02-27 22:31:05 +00001382 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001383 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001384 '--root', settings.GetRoot(),
1385 '--upstream', upstream,
1386 ]
1387
1388 args.extend(['--verbose'] * verbose)
1389
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001390 remote, remote_branch = self.GetRemoteBranch()
1391 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001392 if settings.GetIsGerrit():
1393 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1394 args.extend(['--gerrit_project', self.GetGerritProject()])
1395 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001396
Edward Lemur99df04e2020-03-05 19:39:43 +00001397 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001398 issue = self.GetIssue()
1399 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001400 if author:
1401 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001402 if issue:
1403 args.extend(['--issue', str(issue)])
1404 if patchset:
1405 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001406
Edward Lemur75526302020-02-27 22:31:05 +00001407 return args
1408
Josip Sokcevic017544d2022-03-31 23:47:53 +00001409 def RunHook(self,
1410 committing,
1411 may_prompt,
1412 verbose,
1413 parallel,
1414 upstream,
1415 description,
1416 all_files,
1417 files=None,
1418 resultdb=False,
1419 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001420 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1421 args = self._GetCommonPresubmitArgs(verbose, upstream)
1422 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001423 if may_prompt:
1424 args.append('--may_prompt')
1425 if parallel:
1426 args.append('--parallel')
1427 if all_files:
1428 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001429 if files:
1430 args.extend(files.split(';'))
1431 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001432 if files or all_files:
1433 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001434
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001435 if resultdb and not realm:
1436 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1437 # it is not required to pass the realm flag
1438 print('Note: ResultDB reporting will NOT be performed because --realm'
1439 ' was not specified. To enable ResultDB, please run the command'
1440 ' again with the --realm argument to specify the LUCI realm.')
1441
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001442 py3_results = self._RunPresubmit(args,
1443 description,
1444 use_python3=True,
1445 resultdb=resultdb,
1446 realm=realm)
1447 if py3_results.get('skipped_presubmits', 1) == 0:
1448 print('No more presubmits to run - skipping Python 2 presubmits.')
1449 return py3_results
1450
1451 py2_results = self._RunPresubmit(args,
1452 description,
1453 use_python3=False,
1454 resultdb=resultdb,
1455 realm=realm)
1456 return self._MergePresubmitResults(py2_results, py3_results)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001457
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001458 def _RunPresubmit(self,
1459 args,
1460 description,
1461 use_python3,
1462 resultdb=None,
1463 realm=None):
1464 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1465 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001466 args = args[:]
1467 vpython = 'vpython3' if use_python3 else 'vpython'
1468
Edward Lemur227d5102020-02-25 23:45:35 +00001469 with gclient_utils.temporary_file() as description_file:
1470 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001471 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001472 args.extend(['--json_output', json_output])
1473 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001474 if self.GetUsePython3():
1475 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001476 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001477 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001478 if resultdb and realm:
1479 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001480
1481 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001482 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001483
Edward Lemur227d5102020-02-25 23:45:35 +00001484 metrics.collector.add_repeated('sub_commands', {
1485 'command': 'presubmit',
1486 'execution_time': time_time() - start,
1487 'exit_code': exit_code,
1488 })
1489
1490 if exit_code:
1491 sys.exit(exit_code)
1492
1493 json_results = gclient_utils.FileRead(json_output)
1494 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001495
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001496 def _MergePresubmitResults(self, py2_results, py3_results):
1497 return {
1498 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1499 py3_results.get('more_cc', []))),
1500 'errors': (
1501 py2_results.get('errors', []) + py3_results.get('errors', [])),
1502 'notifications': (
1503 py2_results.get('notifications', []) +
1504 py3_results.get('notifications', [])),
1505 'warnings': (
1506 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1507 }
1508
Brian Sheedy7326ca22022-11-02 18:36:17 +00001509 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001510 args = self._GetCommonPresubmitArgs(verbose, upstream)
1511 args.append('--post_upload')
1512
1513 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001514 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001515 args.extend(['--description_file', description_file])
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001516 if not py3_only:
1517 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1518 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1519 ['--use-python3'])
1520 if not py3_only:
1521 p_py2.wait()
1522 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001523
Edward Lemur5a644f82020-03-18 16:44:57 +00001524 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001525 # type: (optparse.Values, Sequence[str], Sequence[str]
1526 # ) -> ChangeDescription
1527 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001528 if self.GetIssue():
1529 description = self.FetchDescription()
1530 elif options.message:
1531 description = options.message
1532 else:
1533 description = _create_description_from_log(git_diff_args)
1534 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001535 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001536
Edward Lemur5a644f82020-03-18 16:44:57 +00001537 bug = options.bug
1538 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001539 if not self.GetIssue():
1540 # Extract bug number from branch name, but only if issue is being created.
1541 # It must start with bug or fix, followed by _ or - and number.
1542 # Optionally, it may contain _ or - after number with arbitrary text.
1543 # Examples:
1544 # bug-123
1545 # bug_123
1546 # fix-123
1547 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001548 branch = self.GetBranch()
1549 if branch is not None:
1550 match = re.match(
1551 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1552 if not bug and not fixed and match:
1553 if match.group('type') == 'bug':
1554 bug = match.group('bugnum')
1555 else:
1556 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001557
1558 change_description = ChangeDescription(description, bug, fixed)
1559
Joanna Wang39811b12023-01-20 23:09:48 +00001560 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001561 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001562 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001563 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001564 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001565 missing_files = [
1566 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001567 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001568 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001569 owners = self.owners_client.SuggestOwners(
1570 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001571 assert isinstance(options.reviewers, list), options.reviewers
1572 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001573
Edward Lemur5a644f82020-03-18 16:44:57 +00001574 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001575 if options.reviewers:
1576 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001577
1578 return change_description
1579
Joanna Wanga1abbed2023-01-24 01:41:05 +00001580 def _GetTitleForUpload(self, options, multi_change_upload=False):
1581 # type: (optparse.Values, Optional[bool]) -> str
1582
1583 # Getting titles for multipl commits is not supported so we return the
1584 # default.
1585 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001586 return options.title
1587
1588 # On first upload, patchset title is always this string, while options.title
1589 # gets converted to first line of message.
1590 if not self.GetIssue():
1591 return 'Initial upload'
1592
1593 # When uploading subsequent patchsets, options.message is taken as the title
1594 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001595 if options.message:
1596 return options.message.strip()
1597
1598 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001599 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001600 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001601 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001602 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001603
1604 # Use the default title if the user confirms the default with a 'y'.
1605 if user_title.lower() == 'y':
1606 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001607 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001608
Joanna Wang562481d2023-01-26 21:57:14 +00001609 def _GetRefSpecOptions(self,
1610 options,
1611 change_desc,
1612 multi_change_upload=False,
1613 dogfood_path=False):
1614 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1615 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001616
1617 # Extra options that can be specified at push time. Doc:
1618 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1619 refspec_opts = []
1620
1621 # By default, new changes are started in WIP mode, and subsequent patchsets
1622 # don't send email. At any time, passing --send-mail or --send-email will
1623 # mark the change ready and send email for that particular patch.
1624 if options.send_mail:
1625 refspec_opts.append('ready')
1626 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001627 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001628 refspec_opts.append('wip')
1629 else:
1630 refspec_opts.append('notify=NONE')
1631
1632 # TODO(tandrii): options.message should be posted as a comment if
1633 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1634 # to do it.
1635
1636 # Set options.title in case user was prompted in _GetTitleForUpload and
1637 # _CMDUploadChange needs to be called again.
1638 options.title = self._GetTitleForUpload(
1639 options, multi_change_upload=multi_change_upload)
1640
1641 if options.title:
1642 # Punctuation and whitespace in |title| must be percent-encoded.
1643 refspec_opts.append('m=' +
1644 gerrit_util.PercentEncodeForGitRef(options.title))
1645
1646 if options.private:
1647 refspec_opts.append('private')
1648
1649 if options.topic:
1650 # Documentation on Gerrit topics is here:
1651 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1652 refspec_opts.append('topic=%s' % options.topic)
1653
1654 if options.enable_auto_submit:
1655 refspec_opts.append('l=Auto-Submit+1')
1656 if options.set_bot_commit:
1657 refspec_opts.append('l=Bot-Commit+1')
1658 if options.use_commit_queue:
1659 refspec_opts.append('l=Commit-Queue+2')
1660 elif options.cq_dry_run:
1661 refspec_opts.append('l=Commit-Queue+1')
1662 elif options.cq_quick_run:
1663 refspec_opts.append('l=Commit-Queue+1')
1664 refspec_opts.append('l=Quick-Run+1')
1665
1666 if change_desc.get_reviewers(tbr_only=True):
1667 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1668 self.GetGerritProject())
1669 refspec_opts.append('l=Code-Review+%s' % score)
1670
Joanna Wang40497912023-01-24 21:18:16 +00001671 # Gerrit sorts hashtags, so order is not important.
1672 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1673 # We check GetIssue because we only add hashtags from the
1674 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001675 # TODO(b/265929888): When we fully launch the new path:
1676 # 1) remove fetching hashtags from description alltogether
1677 # 2) Or use descrtiption hashtags for:
1678 # `not (self.GetIssue() and multi_change_upload)`
1679 # 3) Or enabled change description tags for multi and single changes
1680 # by adding them post `git push`.
1681 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001682 hashtags.update(change_desc.get_hash_tags())
1683 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001684
1685 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001686 # branch/change.
1687 return refspec_opts
1688
Joanna Wang05b60342023-03-29 20:25:57 +00001689 def PrepareSquashedCommit(self,
1690 options,
1691 parent,
1692 orig_parent,
1693 end_commit=None):
1694 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1695 """Create a squashed commit to upload.
1696
1697
1698 Args:
1699 parent: The commit to use as the parent for the new squashed.
1700 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1701 is part of the same original tree as end_commit, which does not
1702 contain squashed commits. This is used to create the change
1703 description for the new squashed commit with:
1704 `git log orig_parent..end_commit`.
1705 end_commit: The commit to use as the end of the new squashed commit.
1706 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001707
1708 if end_commit is None:
1709 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1710
Joanna Wang05b60342023-03-29 20:25:57 +00001711 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001712 end_commit)
1713 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1714 with gclient_utils.temporary_file() as desc_tempfile:
1715 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1716 commit_to_push = RunGit(
1717 ['commit-tree', latest_tree, '-p', parent, '-F',
1718 desc_tempfile]).strip()
1719
Joanna Wang7603f042023-03-01 22:17:36 +00001720 # Gerrit may or may not update fast enough to return the correct patchset
1721 # number after we push. Get the pre-upload patchset and increment later.
1722 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001723 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001724 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001725
Joanna Wang6215dd02023-02-07 15:58:03 +00001726 def PrepareCherryPickSquashedCommit(self, options, parent):
1727 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001728 """Create a commit cherry-picked on parent to push."""
1729
Joanna Wang6215dd02023-02-07 15:58:03 +00001730 # The `parent` is what we will cherry-pick on top of.
1731 # The `cherry_pick_base` is the beginning range of what
1732 # we are cherry-picking.
1733 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1734 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001735 self.branchref)
1736
1737 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1738 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1739 with gclient_utils.temporary_file() as desc_tempfile:
1740 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001741 commit_to_cp = RunGit([
1742 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1743 desc_tempfile
1744 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001745
Joanna Wang6215dd02023-02-07 15:58:03 +00001746 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001747 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1748 if ret:
1749 RunGit(['cherry-pick', '--abort'])
1750 RunGit(['checkout', '-q', self.branch])
1751 DieWithError('Could not cleanly cherry-pick')
1752
Joanna Wang6215dd02023-02-07 15:58:03 +00001753 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001754 RunGit(['checkout', '-q', self.branch])
1755
Joanna Wang7603f042023-03-01 22:17:36 +00001756 # Gerrit may or may not update fast enough to return the correct patchset
1757 # number after we push. Get the pre-upload patchset and increment later.
1758 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001759 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001760 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001761
Joanna Wangb46232e2023-01-21 01:58:46 +00001762 def _PrepareChange(self, options, parent, end_commit):
1763 # type: (optparse.Values, str, str) ->
1764 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1765 """Prepares the change to be uploaded."""
1766 self.EnsureCanUploadPatchset(options.force)
1767
1768 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1769 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1770 files)
1771
1772 watchlist = watchlists.Watchlists(settings.GetRoot())
1773 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1774 if not options.bypass_hooks:
1775 hook_results = self.RunHook(committing=False,
1776 may_prompt=not options.force,
1777 verbose=options.verbose,
1778 parallel=options.parallel,
1779 upstream=parent,
1780 description=change_desc.description,
1781 all_files=False)
1782 self.ExtendCC(hook_results['more_cc'])
1783
1784 # Update the change description and ensure we have a Change Id.
1785 if self.GetIssue():
1786 if options.edit_description:
1787 change_desc.prompt()
1788 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1789 change_id = change_detail['change_id']
1790 change_desc.ensure_change_id(change_id)
1791
Joanna Wangb46232e2023-01-21 01:58:46 +00001792 else: # No change issue. First time uploading
1793 if not options.force and not options.message_file:
1794 change_desc.prompt()
1795
1796 # Check if user added a change_id in the descripiton.
1797 change_ids = git_footers.get_footer_change_id(change_desc.description)
1798 if len(change_ids) == 1:
1799 change_id = change_ids[0]
1800 else:
1801 change_id = GenerateGerritChangeId(change_desc.description)
1802 change_desc.ensure_change_id(change_id)
1803
1804 if options.preserve_tryjobs:
1805 change_desc.set_preserve_tryjobs()
1806
1807 SaveDescriptionBackup(change_desc)
1808
1809 # Add ccs
1810 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001811 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001812 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001813 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001814 ccs = self.GetCCList().split(',')
1815 if len(ccs) > 100:
1816 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1817 'process/lsc/lsc_workflow.md')
1818 print('WARNING: This will auto-CC %s users.' % len(ccs))
1819 print('LSC may be more appropriate: %s' % lsc)
1820 print('You can also use the --no-autocc flag to disable auto-CC.')
1821 confirm_or_exit(action='continue')
1822
1823 # Add ccs from the --cc flag.
1824 if options.cc:
1825 ccs.extend(options.cc)
1826
1827 ccs = [email.strip() for email in ccs if email.strip()]
1828 if change_desc.get_cced():
1829 ccs.extend(change_desc.get_cced())
1830
1831 return change_desc.get_reviewers(), ccs, change_desc
1832
Joanna Wang40497912023-01-24 21:18:16 +00001833 def PostUploadUpdates(self, options, new_upload, change_number):
1834 # type: (optparse.Values, _NewUpload, change_number) -> None
1835 """Makes necessary post upload changes to the local and remote cl."""
1836 if not self.GetIssue():
1837 self.SetIssue(change_number)
1838
Joanna Wang7603f042023-03-01 22:17:36 +00001839 self.SetPatchset(new_upload.prev_patchset + 1)
1840
Joanna Wang40497912023-01-24 21:18:16 +00001841 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1842 new_upload.commit_to_push)
1843 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1844 new_upload.new_last_uploaded_commit)
1845
1846 if settings.GetRunPostUploadHook():
1847 self.RunPostUploadHook(options.verbose, new_upload.parent,
1848 new_upload.change_desc.description,
1849 options.no_python2_post_upload_hooks)
1850
1851 if new_upload.reviewers or new_upload.ccs:
1852 gerrit_util.AddReviewers(self.GetGerritHost(),
1853 self._GerritChangeIdentifier(),
1854 reviewers=new_upload.reviewers,
1855 ccs=new_upload.ccs,
1856 notify=bool(options.send_mail))
1857
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001858 def CMDUpload(self, options, git_diff_args, orig_args):
1859 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001860 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001861 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001862 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001863 else:
1864 if self.GetBranch() is None:
1865 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1866
1867 # Default to diffing against common ancestor of upstream branch
1868 base_branch = self.GetCommonAncestorWithUpstream()
1869 git_diff_args = [base_branch, 'HEAD']
1870
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001871 # Fast best-effort checks to abort before running potentially expensive
1872 # hooks if uploading is likely to fail anyway. Passing these checks does
1873 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001874 self.EnsureAuthenticated(force=options.force)
1875 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001876
1877 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001878 watchlist = watchlists.Watchlists(settings.GetRoot())
1879 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001880 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001881 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001882
Edward Lemur5a644f82020-03-18 16:44:57 +00001883 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001884 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001885 hook_results = self.RunHook(committing=False,
1886 may_prompt=not options.force,
1887 verbose=options.verbose,
1888 parallel=options.parallel,
1889 upstream=base_branch,
1890 description=change_desc.description,
1891 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001892 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001893
Aaron Gable13101a62018-02-09 13:20:41 -08001894 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001895 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001896 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001897 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001898 if self.GetBranch() is not None:
1899 self._GitSetBranchConfigValue(
1900 LAST_UPLOAD_HASH_CONFIG_KEY,
1901 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001902 # Run post upload hooks, if specified.
1903 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001904 self.RunPostUploadHook(options.verbose, base_branch,
1905 change_desc.description,
1906 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001907
1908 # Upload all dependencies if specified.
1909 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001910 print()
1911 print('--dependencies has been specified.')
1912 print('All dependent local branches will be re-uploaded.')
1913 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001914 # Remove the dependencies flag from args so that we do not end up in a
1915 # loop.
1916 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001917 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001918 return ret
1919
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001920 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001921 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001922
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001923 Issue must have been already uploaded and known. Optionally allows for
1924 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001925 """
1926 assert new_state in _CQState.ALL_STATES
1927 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001928 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001929 vote_map = {
1930 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001931 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001932 _CQState.DRY_RUN: 1,
1933 _CQState.COMMIT: 2,
1934 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001935 if new_state == _CQState.QUICK_RUN:
1936 labels = {
1937 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1938 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1939 }
1940 else:
1941 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001942 notify = False if new_state == _CQState.DRY_RUN else None
1943 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001944 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001945 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001946 return 0
1947 except KeyboardInterrupt:
1948 raise
1949 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001950 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001951 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001952 ' * Your project has no CQ,\n'
1953 ' * You don\'t have permission to change the CQ state,\n'
1954 ' * There\'s a bug in this code (see stack trace below).\n'
1955 'Consider specifying which bots to trigger manually or asking your '
1956 'project owners for permissions or contacting Chrome Infra at:\n'
1957 'https://www.chromium.org/infra\n\n' %
1958 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001959 # Still raise exception so that stack trace is printed.
1960 raise
1961
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001962 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001963 # Lazy load of configs.
1964 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001965 if self._gerrit_host and '.' not in self._gerrit_host:
1966 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1967 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001968 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001969 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001970 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001971 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001972 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1973 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001974 return self._gerrit_host
1975
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001976 def _GetGitHost(self):
1977 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001978 remote_url = self.GetRemoteUrl()
1979 if not remote_url:
1980 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001981 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001982
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001983 def GetCodereviewServer(self):
1984 if not self._gerrit_server:
1985 # If we're on a branch then get the server potentially associated
1986 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001987 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001988 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001989 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001990 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001991 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001992 if not self._gerrit_server:
1993 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1994 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001995 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001996 parts[0] = parts[0] + '-review'
1997 self._gerrit_host = '.'.join(parts)
1998 self._gerrit_server = 'https://%s' % self._gerrit_host
1999 return self._gerrit_server
2000
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002001 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002002 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002003 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002004 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002005 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002006 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00002007 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002008 if project.endswith('.git'):
2009 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002010 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2011 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2012 # gitiles/git-over-https protocol. E.g.,
2013 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2014 # as
2015 # https://chromium.googlesource.com/v8/v8
2016 if project.startswith('a/'):
2017 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002018 return project
2019
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002020 def _GerritChangeIdentifier(self):
2021 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2022
2023 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002024 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002025 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002026 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002027 if project:
2028 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2029 # Fall back on still unique, but less efficient change number.
2030 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002031
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002032 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002033 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002034 if settings.GetGerritSkipEnsureAuthenticated():
2035 # For projects with unusual authentication schemes.
2036 # See http://crbug.com/603378.
2037 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002038
2039 # Check presence of cookies only if using cookies-based auth method.
2040 cookie_auth = gerrit_util.Authenticator.get()
2041 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002042 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002043
Florian Mayerae510e82020-01-30 21:04:48 +00002044 remote_url = self.GetRemoteUrl()
2045 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002046 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002047 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002048 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2049 logging.warning(
2050 'Ignoring branch %(branch)s with non-https/sso remote '
2051 '%(remote)s', {
2052 'branch': self.branch,
2053 'remote': self.GetRemoteUrl()
2054 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002055 return
2056
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002057 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002058 self.GetCodereviewServer()
2059 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002060 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002061
2062 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2063 git_auth = cookie_auth.get_auth_header(git_host)
2064 if gerrit_auth and git_auth:
2065 if gerrit_auth == git_auth:
2066 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002067 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002068 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002069 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002070 ' %s\n'
2071 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002072 ' Consider running the following command:\n'
2073 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002074 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002075 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002076 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002077 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002078 cookie_auth.get_new_password_message(git_host)))
2079 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002080 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002081 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002082
2083 missing = (
2084 ([] if gerrit_auth else [self._gerrit_host]) +
2085 ([] if git_auth else [git_host]))
2086 DieWithError('Credentials for the following hosts are required:\n'
2087 ' %s\n'
2088 'These are read from %s (or legacy %s)\n'
2089 '%s' % (
2090 '\n '.join(missing),
2091 cookie_auth.get_gitcookies_path(),
2092 cookie_auth.get_netrc_path(),
2093 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002094
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002095 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002096 if not self.GetIssue():
2097 return
2098
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002099 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002100 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002101 DieWithError(
2102 'Change %s has been abandoned, new uploads are not allowed' %
2103 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002104 if status == 'MERGED':
2105 answer = gclient_utils.AskForData(
2106 'Change %s has been submitted, new uploads are not allowed. '
2107 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2108 ).lower()
2109 if answer not in ('y', ''):
2110 DieWithError('New uploads are not allowed.')
2111 self.SetIssue()
2112 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002113
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002114 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2115 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2116 # Apparently this check is not very important? Otherwise get_auth_email
2117 # could have been added to other implementations of Authenticator.
2118 cookies_auth = gerrit_util.Authenticator.get()
2119 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002120 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002121
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002122 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002123 if self.GetIssueOwner() == cookies_user:
2124 return
2125 logging.debug('change %s owner is %s, cookies user is %s',
2126 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002127 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002128 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002129 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002130 if details['email'] == self.GetIssueOwner():
2131 return
2132 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002133 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002134 'as %s.\n'
2135 'Uploading may fail due to lack of permissions.' %
2136 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2137 confirm_or_exit(action='upload')
2138
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002139 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002140 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002141 or CQ status, assuming adherence to a common workflow.
2142
2143 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002144 * 'error' - error from review tool (including deleted issues)
2145 * 'unsent' - no reviewers added
2146 * 'waiting' - waiting for review
2147 * 'reply' - waiting for uploader to reply to review
2148 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002149 * 'dry-run' - dry-running in the CQ
2150 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002151 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002152 """
2153 if not self.GetIssue():
2154 return None
2155
2156 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002157 data = self._GetChangeDetail([
2158 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002159 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002160 return 'error'
2161
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002162 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002163 return 'closed'
2164
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002165 cq_label = data['labels'].get('Commit-Queue', {})
2166 max_cq_vote = 0
2167 for vote in cq_label.get('all', []):
2168 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2169 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002170 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002171 if max_cq_vote == 1:
2172 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002173
Aaron Gable9ab38c62017-04-06 14:36:33 -07002174 if data['labels'].get('Code-Review', {}).get('approved'):
2175 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002176
2177 if not data.get('reviewers', {}).get('REVIEWER', []):
2178 return 'unsent'
2179
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002180 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002181 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002182 while messages:
2183 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002184 if (m.get('tag', '').startswith('autogenerated:cq') or
2185 m.get('tag', '').startswith('autogenerated:cv')):
2186 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002187 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002188 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002189 # Most recent message was by owner.
2190 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002191
2192 # Some reply from non-owner.
2193 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002194
2195 # Somehow there are no messages even though there are reviewers.
2196 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002197
Gavin Mak4e5e3992022-11-14 22:40:12 +00002198 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002199 if not self.GetIssue():
2200 return None
2201
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002202 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002203 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002204 if update:
2205 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002206 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002207
Gavin Makf35a9eb2022-11-17 18:34:36 +00002208 def _IsPatchsetRangeSignificant(self, lower, upper):
2209 """Returns True if the inclusive range of patchsets contains any reworks or
2210 rebases."""
2211 if not self.GetIssue():
2212 return False
2213
2214 data = self._GetChangeDetail(['ALL_REVISIONS'])
2215 ps_kind = {}
2216 for rev_info in data.get('revisions', {}).values():
2217 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2218
2219 for ps in range(lower, upper + 1):
2220 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2221 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2222 return True
2223 return False
2224
Gavin Make61ccc52020-11-13 00:12:57 +00002225 def GetMostRecentDryRunPatchset(self):
2226 """Get patchsets equivalent to the most recent patchset and return
2227 the patchset with the latest dry run. If none have been dry run, return
2228 the latest patchset."""
2229 if not self.GetIssue():
2230 return None
2231
2232 data = self._GetChangeDetail(['ALL_REVISIONS'])
2233 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002234 dry_run = {int(m['_revision_number'])
2235 for m in data.get('messages', [])
2236 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002237
2238 for revision_info in sorted(data.get('revisions', {}).values(),
2239 key=lambda c: c['_number'], reverse=True):
2240 if revision_info['_number'] in dry_run:
2241 patchset = revision_info['_number']
2242 break
2243 if revision_info.get('kind', '') not in \
2244 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2245 break
2246 self.SetPatchset(patchset)
2247 return patchset
2248
Aaron Gable636b13f2017-07-14 10:42:48 -07002249 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002250 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002251 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002252 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002253
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002254 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002255 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002256 # CURRENT_REVISION is included to get the latest patchset so that
2257 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002258 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002259 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2260 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002261 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002262 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002263 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002264 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002265
2266 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002267 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002268 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002269 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002270 line_comments = file_comments.setdefault(path, [])
2271 line_comments.extend(
2272 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002273
2274 # Build dictionary of file comments for easy access and sorting later.
2275 # {author+date: {path: {patchset: {line: url+message}}}}
2276 comments = collections.defaultdict(
2277 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002278
2279 server = self.GetCodereviewServer()
2280 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2281 # /c/ is automatically added by short URL server.
2282 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2283 self.GetIssue())
2284 else:
2285 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2286
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002287 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002288 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002289 tag = comment.get('tag', '')
2290 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002291 continue
2292 key = (comment['author']['email'], comment['updated'])
2293 if comment.get('side', 'REVISION') == 'PARENT':
2294 patchset = 'Base'
2295 else:
2296 patchset = 'PS%d' % comment['patch_set']
2297 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002298 url = ('%s/%s/%s#%s%s' %
2299 (url_prefix, comment['patch_set'], path,
2300 'b' if comment.get('side') == 'PARENT' else '',
2301 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002302 comments[key][path][patchset][line] = (url, comment['message'])
2303
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002304 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002305 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002306 summary = self._BuildCommentSummary(msg, comments, readable)
2307 if summary:
2308 summaries.append(summary)
2309 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002310
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002311 @staticmethod
2312 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002313 if 'email' not in msg['author']:
2314 # Some bot accounts may not have an email associated.
2315 return None
2316
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002317 key = (msg['author']['email'], msg['date'])
2318 # Don't bother showing autogenerated messages that don't have associated
2319 # file or line comments. this will filter out most autogenerated
2320 # messages, but will keep robot comments like those from Tricium.
2321 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2322 if is_autogenerated and not comments.get(key):
2323 return None
2324 message = msg['message']
2325 # Gerrit spits out nanoseconds.
2326 assert len(msg['date'].split('.')[-1]) == 9
2327 date = datetime.datetime.strptime(msg['date'][:-3],
2328 '%Y-%m-%d %H:%M:%S.%f')
2329 if key in comments:
2330 message += '\n'
2331 for path, patchsets in sorted(comments.get(key, {}).items()):
2332 if readable:
2333 message += '\n%s' % path
2334 for patchset, lines in sorted(patchsets.items()):
2335 for line, (url, content) in sorted(lines.items()):
2336 if line:
2337 line_str = 'Line %d' % line
2338 path_str = '%s:%d:' % (path, line)
2339 else:
2340 line_str = 'File comment'
2341 path_str = '%s:0:' % path
2342 if readable:
2343 message += '\n %s, %s: %s' % (patchset, line_str, url)
2344 message += '\n %s\n' % content
2345 else:
2346 message += '\n%s ' % path_str
2347 message += '\n%s\n' % content
2348
2349 return _CommentSummary(
2350 date=date,
2351 message=message,
2352 sender=msg['author']['email'],
2353 autogenerated=is_autogenerated,
2354 # These could be inferred from the text messages and correlated with
2355 # Code-Review label maximum, however this is not reliable.
2356 # Leaving as is until the need arises.
2357 approval=False,
2358 disapproval=False,
2359 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002360
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002361 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002362 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002363 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002364
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002365 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002366 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002367 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002368
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002369 def _GetChangeDetail(self, options=None):
2370 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002371 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002372 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002373
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002374 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002375 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002376 options.append('CURRENT_COMMIT')
2377
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002378 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002379 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002380 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002381
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002382 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2383 # Assumption: data fetched before with extra options is suitable
2384 # for return for a smaller set of options.
2385 # For example, if we cached data for
2386 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2387 # and request is for options=[CURRENT_REVISION],
2388 # THEN we can return prior cached data.
2389 if options_set.issubset(cached_options_set):
2390 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002391
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002392 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002393 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002394 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002395 except gerrit_util.GerritError as e:
2396 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002397 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002398 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002399
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002400 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002401 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002402
Gavin Mak4e5e3992022-11-14 22:40:12 +00002403 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002404 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002405 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002406 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2407 self._GerritChangeIdentifier(),
2408 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002409 except gerrit_util.GerritError as e:
2410 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002411 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002412 raise
agable32978d92016-11-01 12:55:02 -07002413 return data
2414
Karen Qian40c19422019-03-13 21:28:29 +00002415 def _IsCqConfigured(self):
2416 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002417 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002418
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002419 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002420 if git_common.is_dirty_git_tree('land'):
2421 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002422
tandriid60367b2016-06-22 05:25:12 -07002423 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002424 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002425 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002426 'which can test and land changes for you. '
2427 'Are you sure you wish to bypass it?\n',
2428 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002429 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002430 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002431 # Note: git diff outputs nothing if there is no diff.
2432 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002433 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002434 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002435 if detail['current_revision'] == last_upload:
2436 differs = False
2437 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002438 print('WARNING: Local branch contents differ from latest uploaded '
2439 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002440 if differs:
2441 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002442 confirm_or_exit(
2443 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2444 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002445 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002446 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002447 upstream = self.GetCommonAncestorWithUpstream()
2448 if self.GetIssue():
2449 description = self.FetchDescription()
2450 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002451 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002452 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002453 committing=True,
2454 may_prompt=not force,
2455 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002456 parallel=parallel,
2457 upstream=upstream,
2458 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002459 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002460 resultdb=resultdb,
2461 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002462
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002463 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002464 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002465 links = self._GetChangeCommit().get('web_links', [])
2466 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002467 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002468 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002469 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002470 return 0
2471
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002472 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2473 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002474 assert parsed_issue_arg.valid
2475
Edward Lemur125d60a2019-09-13 18:25:41 +00002476 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002477
2478 if parsed_issue_arg.hostname:
2479 self._gerrit_host = parsed_issue_arg.hostname
2480 self._gerrit_server = 'https://%s' % self._gerrit_host
2481
tandriic2405f52016-10-10 08:13:15 -07002482 try:
2483 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002484 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002485 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002486
2487 if not parsed_issue_arg.patchset:
2488 # Use current revision by default.
2489 revision_info = detail['revisions'][detail['current_revision']]
2490 patchset = int(revision_info['_number'])
2491 else:
2492 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002493 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002494 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2495 break
2496 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002497 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002498 (parsed_issue_arg.patchset, self.GetIssue()))
2499
Edward Lemur125d60a2019-09-13 18:25:41 +00002500 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002501 if remote_url.endswith('.git'):
2502 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002503 remote_url = remote_url.rstrip('/')
2504
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002505 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002506 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002507
2508 if remote_url != fetch_info['url']:
2509 DieWithError('Trying to patch a change from %s but this repo appears '
2510 'to be %s.' % (fetch_info['url'], remote_url))
2511
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002512 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002513
Joanna Wangc023a632023-01-26 17:59:25 +00002514 # Set issue immediately in case the cherry-pick fails, which happens
2515 # when resolving conflicts.
2516 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002517 self.SetIssue(parsed_issue_arg.issue)
2518
Aaron Gable62619a32017-06-16 08:22:09 -07002519 if force:
2520 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2521 print('Checked out commit for change %i patchset %i locally' %
2522 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002523 elif nocommit:
2524 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2525 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002526 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002527 RunGit(['cherry-pick', 'FETCH_HEAD'])
2528 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002529 (parsed_issue_arg.issue, patchset))
2530 print('Note: this created a local commit which does not have '
2531 'the same hash as the one uploaded for review. This will make '
2532 'uploading changes based on top of this branch difficult.\n'
2533 'If you want to do that, use "git cl patch --force" instead.')
2534
Stefan Zagerd08043c2017-10-12 12:07:02 -07002535 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002536 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002537 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002538 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2539 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002540 else:
2541 print('WARNING: You are in detached HEAD state.\n'
2542 'The patch has been applied to your checkout, but you will not be '
2543 'able to upload a new patch set to the gerrit issue.\n'
2544 'Try using the \'-b\' option if you would like to work on a '
2545 'branch and/or upload a new patch set.')
2546
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002547 return 0
2548
Joanna Wang18de1f62023-01-21 01:24:24 +00002549 @staticmethod
2550 def _GerritCommitMsgHookCheck(offer_removal):
2551 # type: (bool) -> None
2552 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002553 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2554 if not os.path.exists(hook):
2555 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002556 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2557 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002558 data = gclient_utils.FileRead(hook)
2559 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2560 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002561 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002562 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002563 'and may interfere with it in subtle ways.\n'
2564 'We recommend you remove the commit-msg hook.')
2565 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002566 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002567 gclient_utils.rm_file_or_tree(hook)
2568 print('Gerrit commit-msg hook removed.')
2569 else:
2570 print('OK, will keep Gerrit commit-msg hook in place.')
2571
Edward Lemur1b52d872019-05-09 21:12:12 +00002572 def _CleanUpOldTraces(self):
2573 """Keep only the last |MAX_TRACES| traces."""
2574 try:
2575 traces = sorted([
2576 os.path.join(TRACES_DIR, f)
2577 for f in os.listdir(TRACES_DIR)
2578 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2579 and not f.startswith('tmp'))
2580 ])
2581 traces_to_delete = traces[:-MAX_TRACES]
2582 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002583 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002584 except OSError:
2585 print('WARNING: Failed to remove old git traces from\n'
2586 ' %s'
2587 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002588
Edward Lemur5737f022019-05-17 01:24:00 +00002589 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002590 """Zip and write the git push traces stored in traces_dir."""
2591 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002592 traces_zip = trace_name + '-traces'
2593 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002594 # Create a temporary dir to store git config and gitcookies in. It will be
2595 # compressed and stored next to the traces.
2596 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002597 git_info_zip = trace_name + '-git-info'
2598
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002599 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002600
Edward Lemur1b52d872019-05-09 21:12:12 +00002601 git_push_metadata['trace_name'] = trace_name
2602 gclient_utils.FileWrite(
2603 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2604
2605 # Keep only the first 6 characters of the git hashes on the packet
2606 # trace. This greatly decreases size after compression.
2607 packet_traces = os.path.join(traces_dir, 'trace-packet')
2608 if os.path.isfile(packet_traces):
2609 contents = gclient_utils.FileRead(packet_traces)
2610 gclient_utils.FileWrite(
2611 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2612 shutil.make_archive(traces_zip, 'zip', traces_dir)
2613
2614 # Collect and compress the git config and gitcookies.
2615 git_config = RunGit(['config', '-l'])
2616 gclient_utils.FileWrite(
2617 os.path.join(git_info_dir, 'git-config'),
2618 git_config)
2619
2620 cookie_auth = gerrit_util.Authenticator.get()
2621 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2622 gitcookies_path = cookie_auth.get_gitcookies_path()
2623 if os.path.isfile(gitcookies_path):
2624 gitcookies = gclient_utils.FileRead(gitcookies_path)
2625 gclient_utils.FileWrite(
2626 os.path.join(git_info_dir, 'gitcookies'),
2627 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2628 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2629
Edward Lemur1b52d872019-05-09 21:12:12 +00002630 gclient_utils.rmtree(git_info_dir)
2631
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002632 def _RunGitPushWithTraces(self,
2633 refspec,
2634 refspec_opts,
2635 git_push_metadata,
2636 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002637 """Run git push and collect the traces resulting from the execution."""
2638 # Create a temporary directory to store traces in. Traces will be compressed
2639 # and stored in a 'traces' dir inside depot_tools.
2640 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002641 trace_name = os.path.join(
2642 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002643
2644 env = os.environ.copy()
2645 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2646 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002647 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002648 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2649 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2650 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2651
2652 try:
2653 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002654 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002655 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002656 push_cmd = ['git', 'push', remote_url, refspec]
2657 if git_push_options:
2658 for opt in git_push_options:
2659 push_cmd.extend(['-o', opt])
2660
Edward Lemur0f58ae42019-04-30 17:24:12 +00002661 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002662 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002663 env=env,
2664 print_stdout=True,
2665 # Flush after every line: useful for seeing progress when running as
2666 # recipe.
2667 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002668 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002669 except subprocess2.CalledProcessError as e:
2670 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002671 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002672 raise GitPushError(
2673 'Failed to create a change, very likely due to blocked keyword. '
2674 'Please examine output above for the reason of the failure.\n'
2675 'If this is a false positive, you can try to bypass blocked '
2676 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002677 '-o banned-words~skip, e.g.:\n'
2678 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002679 'If git-cl is not working correctly, file a bug under the '
2680 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002681 if 'git push -o nokeycheck' in str(e.stdout):
2682 raise GitPushError(
2683 'Failed to create a change, very likely due to a private key being '
2684 'detected. Please examine output above for the reason of the '
2685 'failure.\n'
2686 'If this is a false positive, you can try to bypass private key '
2687 'detection by using push option '
2688 '-o nokeycheck, e.g.:\n'
2689 'git cl upload -o nokeycheck\n\n'
2690 'If git-cl is not working correctly, file a bug under the '
2691 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002692
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002693 raise GitPushError(
2694 'Failed to create a change. Please examine output above for the '
2695 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002696 'For emergencies, Googlers can escalate to '
2697 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002698 'Hint: run command below to diagnose common Git/Gerrit '
2699 'credential problems:\n'
2700 ' git cl creds-check\n'
2701 '\n'
2702 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2703 'component including the files below.\n'
2704 'Review the files before upload, since they might contain sensitive '
2705 'information.\n'
2706 'Set the Restrict-View-Google label so that they are not publicly '
2707 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002708 finally:
2709 execution_time = time_time() - before_push
2710 metrics.collector.add_repeated('sub_commands', {
2711 'command': 'git push',
2712 'execution_time': execution_time,
2713 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002714 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002715 })
2716
Edward Lemur1b52d872019-05-09 21:12:12 +00002717 git_push_metadata['execution_time'] = execution_time
2718 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002719 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002720
Edward Lemur1b52d872019-05-09 21:12:12 +00002721 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002722 gclient_utils.rmtree(traces_dir)
2723
2724 return push_stdout
2725
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002726 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2727 change_desc):
2728 """Upload the current branch to Gerrit, retry if new remote HEAD is
2729 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002730 remote, remote_branch = self.GetRemoteBranch()
2731 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2732
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002733 try:
2734 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002735 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002736 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002737 # Repository might be in the middle of transition to main branch as
2738 # default, and uploads to old default might be blocked.
2739 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002740 DieWithError(str(e), change_desc)
2741
Josip Sokcevicb631a882021-01-06 18:18:10 +00002742 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2743 self.GetGerritProject())
2744 if project_head == branch:
2745 DieWithError(str(e), change_desc)
2746 branch = project_head
2747
2748 print("WARNING: Fetching remote state and retrying upload to default "
2749 "branch...")
2750 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002751 options.edit_description = False
2752 options.force = True
2753 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002754 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2755 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002756 except GitPushError as e:
2757 DieWithError(str(e), change_desc)
2758
2759 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002760 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002761 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002762 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002763 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002764 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002765 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002766 # User requested to change description
2767 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002768 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002769 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2770 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002771 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002772
2773 # Check if changes outside of this workspace have been uploaded.
2774 current_rev = change_detail['current_revision']
2775 last_uploaded_rev = self._GitGetBranchConfigValue(
2776 GERRIT_SQUASH_HASH_CONFIG_KEY)
2777 if last_uploaded_rev and current_rev != last_uploaded_rev:
2778 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002779 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002780 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002781 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002782 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002783 if len(change_ids) == 1:
2784 change_id = change_ids[0]
2785 else:
2786 change_id = GenerateGerritChangeId(change_desc.description)
2787 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002788
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002789 if options.preserve_tryjobs:
2790 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002791
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002792 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002793 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002794 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002795 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002796 with gclient_utils.temporary_file() as desc_tempfile:
2797 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2798 ref_to_push = RunGit(
2799 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002800 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002801 if options.no_add_changeid:
2802 pass
2803 else: # adding Change-Ids is okay.
2804 if not git_footers.get_footer_change_id(change_desc.description):
2805 DownloadGerritHook(False)
2806 change_desc.set_description(
2807 self._AddChangeIdToCommitMessage(change_desc.description,
2808 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002809 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002810 # For no-squash mode, we assume the remote called "origin" is the one we
2811 # want. It is not worthwhile to support different workflows for
2812 # no-squash mode.
2813 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002814 # attempt to extract the changeid from the current description
2815 # fail informatively if not possible.
2816 change_id_candidates = git_footers.get_footer_change_id(
2817 change_desc.description)
2818 if not change_id_candidates:
2819 DieWithError("Unable to extract change-id from message.")
2820 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002821
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002822 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002823 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2824 ref_to_push)]).splitlines()
2825 if len(commits) > 1:
2826 print('WARNING: This will upload %d commits. Run the following command '
2827 'to see which commits will be uploaded: ' % len(commits))
2828 print('git log %s..%s' % (parent, ref_to_push))
2829 print('You can also use `git squash-branch` to squash these into a '
2830 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002831 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002832
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002833 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002834 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002835 # Add default, watchlist, presubmit ccs if this is the initial upload
2836 # and CL is not private and auto-ccing has not been disabled.
2837 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002838 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002839 if len(cc) > 100:
2840 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2841 'process/lsc/lsc_workflow.md')
2842 print('WARNING: This will auto-CC %s users.' % len(cc))
2843 print('LSC may be more appropriate: %s' % lsc)
2844 print('You can also use the --no-autocc flag to disable auto-CC.')
2845 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002846 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002847 if options.cc:
2848 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002849 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002850 if change_desc.get_cced():
2851 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002852 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002853 valid_accounts = set(reviewers + cc)
2854 # TODO(crbug/877717): relax this for all hosts.
2855 else:
2856 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002857 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002858 logging.info('accounts %s are recognized, %s invalid',
2859 sorted(valid_accounts),
2860 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002861
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002862 # Extra options that can be specified at push time. Doc:
2863 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002864 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002865
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002866 for r in sorted(reviewers):
2867 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002868 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002869 reviewers.remove(r)
2870 else:
2871 # TODO(tandrii): this should probably be a hard failure.
2872 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2873 % r)
2874 for c in sorted(cc):
2875 # refspec option will be rejected if cc doesn't correspond to an
2876 # account, even though REST call to add such arbitrary cc may succeed.
2877 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002878 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002879 cc.remove(c)
2880
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002881 refspec_suffix = ''
2882 if refspec_opts:
2883 refspec_suffix = '%' + ','.join(refspec_opts)
2884 assert ' ' not in refspec_suffix, (
2885 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2886 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002887
Edward Lemur1b52d872019-05-09 21:12:12 +00002888 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002889 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002890 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002891 'change_id': change_id,
2892 'description': change_desc.description,
2893 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002894
Gavin Mak4e5e3992022-11-14 22:40:12 +00002895 # Gerrit may or may not update fast enough to return the correct patchset
2896 # number after we push. Get the pre-upload patchset and increment later.
2897 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2898
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002899 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002900 git_push_metadata,
2901 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002902
2903 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002904 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002905 change_numbers = [m.group(1)
2906 for m in map(regex.match, push_stdout.splitlines())
2907 if m]
2908 if len(change_numbers) != 1:
2909 DieWithError(
2910 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002911 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002912 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002913 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002914 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002915
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002916 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002917 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002918 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002919 gerrit_util.AddReviewers(self.GetGerritHost(),
2920 self._GerritChangeIdentifier(),
2921 reviewers,
2922 cc,
2923 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002924
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002925 return 0
2926
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002927 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2928 change_desc):
2929 """Computes parent of the generated commit to be uploaded to Gerrit.
2930
2931 Returns revision or a ref name.
2932 """
2933 if custom_cl_base:
2934 # Try to avoid creating additional unintended CLs when uploading, unless
2935 # user wants to take this risk.
2936 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2937 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2938 local_ref_of_target_remote])
2939 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002940 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002941 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2942 'If you proceed with upload, more than 1 CL may be created by '
2943 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2944 'If you are certain that specified base `%s` has already been '
2945 'uploaded to Gerrit as another CL, you may proceed.\n' %
2946 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2947 if not force:
2948 confirm_or_exit(
2949 'Do you take responsibility for cleaning up potential mess '
2950 'resulting from proceeding with upload?',
2951 action='upload')
2952 return custom_cl_base
2953
Aaron Gablef97e33d2017-03-30 15:44:27 -07002954 if remote != '.':
2955 return self.GetCommonAncestorWithUpstream()
2956
2957 # If our upstream branch is local, we base our squashed commit on its
2958 # squashed version.
2959 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2960
Aaron Gablef97e33d2017-03-30 15:44:27 -07002961 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002962 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002963 if upstream_branch_name == 'main':
2964 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002965
2966 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002967 # TODO(tandrii): consider checking parent change in Gerrit and using its
2968 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2969 # the tree hash of the parent branch. The upside is less likely bogus
2970 # requests to reupload parent change just because it's uploadhash is
2971 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002972 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2973 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002974 # Verify that the upstream branch has been uploaded too, otherwise
2975 # Gerrit will create additional CLs when uploading.
2976 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2977 RunGitSilent(['rev-parse', parent + ':'])):
2978 DieWithError(
2979 '\nUpload upstream branch %s first.\n'
2980 'It is likely that this branch has been rebased since its last '
2981 'upload, so you just need to upload it again.\n'
2982 '(If you uploaded it with --no-squash, then branch dependencies '
2983 'are not supported, and you should reupload with --squash.)'
2984 % upstream_branch_name,
2985 change_desc)
2986 return parent
2987
Gavin Mak4e5e3992022-11-14 22:40:12 +00002988 def _UpdateWithExternalChanges(self):
2989 """Updates workspace with external changes.
2990
2991 Returns the commit hash that should be used as the merge base on upload.
2992 """
2993 local_ps = self.GetPatchset()
2994 if local_ps is None:
2995 return
2996
2997 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002998 if external_ps is None or local_ps == external_ps or \
2999 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003000 return
3001
3002 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00003003 if num_changes > 1:
3004 change_words = 'changes were'
3005 else:
3006 change_words = 'change was'
3007 print('\n%d external %s published to %s:\n' %
3008 (num_changes, change_words, self.GetIssueURL(short=True)))
3009
3010 # Print an overview of external changes.
3011 ps_to_commit = {}
3012 ps_to_info = {}
3013 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
3014 for commit_id, revision_info in revisions.get('revisions', {}).items():
3015 ps_num = revision_info['_number']
3016 ps_to_commit[ps_num] = commit_id
3017 ps_to_info[ps_num] = revision_info
3018
3019 for ps in range(external_ps, local_ps, -1):
3020 commit = ps_to_commit[ps][:8]
3021 desc = ps_to_info[ps].get('description', '')
3022 print('Patchset %d [%s] %s' % (ps, commit, desc))
3023
3024 if not ask_for_explicit_yes('\nUploading as-is will override them. '
3025 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003026 return
3027
3028 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3029 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3030 external_base = external_parent['commit']
3031
3032 branch = git_common.current_branch()
3033 local_base = self.GetCommonAncestorWithUpstream()
3034 if local_base != external_base:
3035 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3036 (local_base, external_base))
3037 if git_common.upstream(branch):
3038 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3039 'to make these the same.')
3040 print('No upstream branch set. Consider setting it and using '
3041 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3042
3043 # Fetch Gerrit's CL base if it doesn't exist locally.
3044 remote, _ = self.GetRemoteBranch()
3045 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3046 RunGitSilent(['fetch', remote, external_base])
3047
3048 # Get the diff between local_ps and external_ps.
3049 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003050 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003051 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3052 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3053 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3054 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3055 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3056
3057 # Diff can be empty in the case of trivial rebases.
3058 if not diff:
3059 return external_base
3060
3061 # Apply the diff.
3062 with gclient_utils.temporary_file() as diff_tempfile:
3063 gclient_utils.FileWrite(diff_tempfile, diff)
3064 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3065 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3066 if not clean_patch:
3067 # Normally patchset is set after upload. But because we exit, that never
3068 # happens. Updating here makes sure that subsequent uploads don't need
3069 # to fetch/apply the same diff again.
3070 self.SetPatchset(external_ps)
3071 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3072 'conflicts and reupload.')
3073
3074 message = 'Incorporate external changes from '
3075 if num_changes == 1:
3076 message += 'patchset %d' % external_ps
3077 else:
3078 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3079 RunGitSilent(['commit', '-am', message])
3080 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3081 # patchset title instead of this 'Incorporate' message.
3082 return external_base
3083
Edward Lemura12175c2020-03-09 16:58:26 +00003084 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003085 """Re-commits using the current message, assumes the commit hook is in
3086 place.
3087 """
Edward Lemura12175c2020-03-09 16:58:26 +00003088 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003089 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003090 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003091 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003092 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003093
3094 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003095
tandriie113dfd2016-10-11 10:20:12 -07003096 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003097 try:
3098 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003099 except GerritChangeNotExists:
3100 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003101
3102 if data['status'] in ('ABANDONED', 'MERGED'):
3103 return 'CL %s is closed' % self.GetIssue()
3104
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003105 def GetGerritChange(self, patchset=None):
3106 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003107 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003108 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003109 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003110 data = self._GetChangeDetail(['ALL_REVISIONS'])
3111
3112 assert host and issue and patchset, 'CL must be uploaded first'
3113
3114 has_patchset = any(
3115 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003116 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003117 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003118 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003119 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003120
tandrii8c5a3532016-11-04 07:52:02 -07003121 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003122 'host': host,
3123 'change': issue,
3124 'project': data['project'],
3125 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003126 }
tandriie113dfd2016-10-11 10:20:12 -07003127
tandriide281ae2016-10-12 06:02:30 -07003128 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003129 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003130
Edward Lemur707d70b2018-02-07 00:50:14 +01003131 def GetReviewers(self):
3132 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003133 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003134
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003135
Lei Zhang8a0efc12020-08-05 19:58:45 +00003136def _get_bug_line_values(default_project_prefix, bugs):
3137 """Given default_project_prefix and comma separated list of bugs, yields bug
3138 line values.
tandriif9aefb72016-07-01 09:06:51 -07003139
3140 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003141 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003142 * string, which is left as is.
3143
3144 This function may produce more than one line, because bugdroid expects one
3145 project per line.
3146
Lei Zhang8a0efc12020-08-05 19:58:45 +00003147 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003148 ['v8:123', 'chromium:789']
3149 """
3150 default_bugs = []
3151 others = []
3152 for bug in bugs.split(','):
3153 bug = bug.strip()
3154 if bug:
3155 try:
3156 default_bugs.append(int(bug))
3157 except ValueError:
3158 others.append(bug)
3159
3160 if default_bugs:
3161 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003162 if default_project_prefix:
3163 if not default_project_prefix.endswith(':'):
3164 default_project_prefix += ':'
3165 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003166 else:
3167 yield default_bugs
3168 for other in sorted(others):
3169 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3170 yield other
3171
3172
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003173class ChangeDescription(object):
3174 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003175 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003176 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003177 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003178 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003179 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003180 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3181 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003182 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003183 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003184
Dan Beamd8b04ca2019-10-10 21:23:26 +00003185 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003186 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003187 if bug:
3188 regexp = re.compile(self.BUG_LINE)
3189 prefix = settings.GetBugPrefix()
3190 if not any((regexp.match(line) for line in self._description_lines)):
3191 values = list(_get_bug_line_values(prefix, bug))
3192 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003193 if fixed:
3194 regexp = re.compile(self.FIXED_LINE)
3195 prefix = settings.GetBugPrefix()
3196 if not any((regexp.match(line) for line in self._description_lines)):
3197 values = list(_get_bug_line_values(prefix, fixed))
3198 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003199
agable@chromium.org42c20792013-09-12 17:34:49 +00003200 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003201 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003202 return '\n'.join(self._description_lines)
3203
3204 def set_description(self, desc):
3205 if isinstance(desc, basestring):
3206 lines = desc.splitlines()
3207 else:
3208 lines = [line.rstrip() for line in desc]
3209 while lines and not lines[0]:
3210 lines.pop(0)
3211 while lines and not lines[-1]:
3212 lines.pop(-1)
3213 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003214
Edward Lemur5a644f82020-03-18 16:44:57 +00003215 def ensure_change_id(self, change_id):
3216 description = self.description
3217 footer_change_ids = git_footers.get_footer_change_id(description)
3218 # Make sure that the Change-Id in the description matches the given one.
3219 if footer_change_ids != [change_id]:
3220 if footer_change_ids:
3221 # Remove any existing Change-Id footers since they don't match the
3222 # expected change_id footer.
3223 description = git_footers.remove_footer(description, 'Change-Id')
3224 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3225 'if you want to set a new one.')
3226 # Add the expected Change-Id footer.
3227 description = git_footers.add_footer_change_id(description, change_id)
3228 self.set_description(description)
3229
Joanna Wang39811b12023-01-20 23:09:48 +00003230 def update_reviewers(self, reviewers):
3231 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003232
3233 Args:
3234 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003235 """
Joanna Wang39811b12023-01-20 23:09:48 +00003236 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003237 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003238
3239 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003240
Joanna Wang39811b12023-01-20 23:09:48 +00003241 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003242 regexp = re.compile(self.R_LINE)
3243 matches = [regexp.match(line) for line in self._description_lines]
3244 new_desc = [l for i, l in enumerate(self._description_lines)
3245 if not matches[i]]
3246 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003247
Joanna Wang39811b12023-01-20 23:09:48 +00003248 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003249
Joanna Wang39811b12023-01-20 23:09:48 +00003250 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003251 for match in matches:
3252 if not match:
3253 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003254 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003255
Joanna Wang39811b12023-01-20 23:09:48 +00003256 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003257
3258 # Put the new lines in the description where the old first R= line was.
3259 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3260 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003261 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003262 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003263 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003264
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003265 def set_preserve_tryjobs(self):
3266 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3267 footers = git_footers.parse_footers(self.description)
3268 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3269 if v.lower() == 'true':
3270 return
3271 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3272
Anthony Polito8b955342019-09-24 19:01:36 +00003273 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003274 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003275 self.set_description([
3276 '# Enter a description of the change.',
3277 '# This will be displayed on the codereview site.',
3278 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003279 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003280 '--------------------',
3281 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003282 bug_regexp = re.compile(self.BUG_LINE)
3283 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003284 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003285 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003286
Dan Beamd8b04ca2019-10-10 21:23:26 +00003287 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003288 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003289
Bruce Dawsonfc487042020-10-27 19:11:37 +00003290 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003291 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003292 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003293 if not content:
3294 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003295 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003296
Bruce Dawson2377b012018-01-11 16:46:49 -08003297 # Strip off comments and default inserted "Bug:" line.
3298 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003299 (line.startswith('#') or
3300 line.rstrip() == "Bug:" or
3301 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003302 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003303 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003304 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003305
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003306 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003307 """Adds a footer line to the description.
3308
3309 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3310 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3311 that Gerrit footers are always at the end.
3312 """
3313 parsed_footer_line = git_footers.parse_footer(line)
3314 if parsed_footer_line:
3315 # Line is a gerrit footer in the form: Footer-Key: any value.
3316 # Thus, must be appended observing Gerrit footer rules.
3317 self.set_description(
3318 git_footers.add_footer(self.description,
3319 key=parsed_footer_line[0],
3320 value=parsed_footer_line[1]))
3321 return
3322
3323 if not self._description_lines:
3324 self._description_lines.append(line)
3325 return
3326
3327 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3328 if gerrit_footers:
3329 # git_footers.split_footers ensures that there is an empty line before
3330 # actual (gerrit) footers, if any. We have to keep it that way.
3331 assert top_lines and top_lines[-1] == ''
3332 top_lines, separator = top_lines[:-1], top_lines[-1:]
3333 else:
3334 separator = [] # No need for separator if there are no gerrit_footers.
3335
3336 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003337 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3338 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003339 top_lines.append('')
3340 top_lines.append(line)
3341 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003342
tandrii99a72f22016-08-17 14:33:24 -07003343 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003344 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003345 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003346 reviewers = [match.group(2).strip()
3347 for match in matches
3348 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003349 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003350
bradnelsond975b302016-10-23 12:20:23 -07003351 def get_cced(self):
3352 """Retrieves the list of reviewers."""
3353 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3354 cced = [match.group(2).strip() for match in matches if match]
3355 return cleanup_list(cced)
3356
Nodir Turakulov23b82142017-11-16 11:04:25 -08003357 def get_hash_tags(self):
3358 """Extracts and sanitizes a list of Gerrit hashtags."""
3359 subject = (self._description_lines or ('',))[0]
3360 subject = re.sub(
3361 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3362
3363 tags = []
3364 start = 0
3365 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3366 while True:
3367 m = bracket_exp.match(subject, start)
3368 if not m:
3369 break
3370 tags.append(self.sanitize_hash_tag(m.group(1)))
3371 start = m.end()
3372
3373 if not tags:
3374 # Try "Tag: " prefix.
3375 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3376 if m:
3377 tags.append(self.sanitize_hash_tag(m.group(1)))
3378 return tags
3379
3380 @classmethod
3381 def sanitize_hash_tag(cls, tag):
3382 """Returns a sanitized Gerrit hash tag.
3383
3384 A sanitized hashtag can be used as a git push refspec parameter value.
3385 """
3386 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3387
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003388
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003389def FindCodereviewSettingsFile(filename='codereview.settings'):
3390 """Finds the given file starting in the cwd and going up.
3391
3392 Only looks up to the top of the repository unless an
3393 'inherit-review-settings-ok' file exists in the root of the repository.
3394 """
3395 inherit_ok_file = 'inherit-review-settings-ok'
3396 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003397 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003398 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003399 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003400 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003401 if os.path.isfile(os.path.join(cwd, filename)):
3402 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003403 if cwd == root:
3404 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003405 parent_dir = os.path.dirname(cwd)
3406 if parent_dir == cwd:
3407 # We hit the system root directory.
3408 break
3409 cwd = parent_dir
3410 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003411
3412
3413def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003414 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003415 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003416
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003417 def SetProperty(name, setting, unset_error_ok=False):
3418 fullname = 'rietveld.' + name
3419 if setting in keyvals:
3420 RunGit(['config', fullname, keyvals[setting]])
3421 else:
3422 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3423
tandrii48df5812016-10-17 03:55:37 -07003424 if not keyvals.get('GERRIT_HOST', False):
3425 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003426 # Only server setting is required. Other settings can be absent.
3427 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003428 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003429 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3430 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003431 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003432 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3433 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003434 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3435 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003436 SetProperty(
3437 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003438 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003439
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003440 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003441 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003442
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003443 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003444 RunGit(['config', 'gerrit.squash-uploads',
3445 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003446
tandrii@chromium.org28253532016-04-14 13:46:56 +00003447 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003448 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003449 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3450
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003451 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003452 # should be of the form
3453 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3454 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003455 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3456 keyvals['ORIGIN_URL_CONFIG']])
3457
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003458
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003459def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003460 """Downloads a network object to a local file, like urllib.urlretrieve.
3461
3462 This is necessary because urllib is broken for SSL connections via a proxy.
3463 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003464 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003465 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003466
3467
ukai@chromium.org712d6102013-11-27 00:52:58 +00003468def hasSheBang(fname):
3469 """Checks fname is a #! script."""
3470 with open(fname) as f:
3471 return f.read(2).startswith('#!')
3472
3473
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003474def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003475 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003476
3477 Args:
3478 force: True to update hooks. False to install hooks if not present.
3479 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003480 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003481 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3482 if not os.access(dst, os.X_OK):
3483 if os.path.exists(dst):
3484 if not force:
3485 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003486 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003487 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003488 if not hasSheBang(dst):
3489 DieWithError('Not a script: %s\n'
3490 'You need to download from\n%s\n'
3491 'into .git/hooks/commit-msg and '
3492 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003493 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3494 except Exception:
3495 if os.path.exists(dst):
3496 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003497 DieWithError('\nFailed to download hooks.\n'
3498 'You need to download from\n%s\n'
3499 'into .git/hooks/commit-msg and '
3500 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003501
3502
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003503class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003504 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003505
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003506 def __init__(self):
3507 # Cached list of [host, identity, source], where source is either
3508 # .gitcookies or .netrc.
3509 self._all_hosts = None
3510
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003511 def ensure_configured_gitcookies(self):
3512 """Runs checks and suggests fixes to make git use .gitcookies from default
3513 path."""
3514 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3515 configured_path = RunGitSilent(
3516 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003517 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003518 if configured_path:
3519 self._ensure_default_gitcookies_path(configured_path, default)
3520 else:
3521 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003522
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003523 @staticmethod
3524 def _ensure_default_gitcookies_path(configured_path, default_path):
3525 assert configured_path
3526 if configured_path == default_path:
3527 print('git is already configured to use your .gitcookies from %s' %
3528 configured_path)
3529 return
3530
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003531 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003532 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3533 (configured_path, default_path))
3534
3535 if not os.path.exists(configured_path):
3536 print('However, your configured .gitcookies file is missing.')
3537 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3538 action='reconfigure')
3539 RunGit(['config', '--global', 'http.cookiefile', default_path])
3540 return
3541
3542 if os.path.exists(default_path):
3543 print('WARNING: default .gitcookies file already exists %s' %
3544 default_path)
3545 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3546 default_path)
3547
3548 confirm_or_exit('Move existing .gitcookies to default location?',
3549 action='move')
3550 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003551 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003552 print('Moved and reconfigured git to use .gitcookies from %s' %
3553 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003554
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003555 @staticmethod
3556 def _configure_gitcookies_path(default_path):
3557 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3558 if os.path.exists(netrc_path):
3559 print('You seem to be using outdated .netrc for git credentials: %s' %
3560 netrc_path)
3561 print('This tool will guide you through setting up recommended '
3562 '.gitcookies store for git credentials.\n'
3563 '\n'
3564 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3565 ' git config --global --unset http.cookiefile\n'
3566 ' mv %s %s.backup\n\n' % (default_path, default_path))
3567 confirm_or_exit(action='setup .gitcookies')
3568 RunGit(['config', '--global', 'http.cookiefile', default_path])
3569 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003570
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003571 def get_hosts_with_creds(self, include_netrc=False):
3572 if self._all_hosts is None:
3573 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003574 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3575 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3576 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3577 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003578
3579 if include_netrc:
3580 return self._all_hosts
3581 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3582
3583 def print_current_creds(self, include_netrc=False):
3584 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3585 if not hosts:
3586 print('No Git/Gerrit credentials found')
3587 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003588 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003589 header = [('Host', 'User', 'Which file'),
3590 ['=' * l for l in lengths]]
3591 for row in (header + hosts):
3592 print('\t'.join((('%%+%ds' % l) % s)
3593 for l, s in zip(lengths, row)))
3594
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003595 @staticmethod
3596 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003597 """Parses identity "git-<username>.domain" into <username> and domain."""
3598 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003599 # distinguishable from sub-domains. But we do know typical domains:
3600 if identity.endswith('.chromium.org'):
3601 domain = 'chromium.org'
3602 username = identity[:-len('.chromium.org')]
3603 else:
3604 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003605 if username.startswith('git-'):
3606 username = username[len('git-'):]
3607 return username, domain
3608
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003609 def has_generic_host(self):
3610 """Returns whether generic .googlesource.com has been configured.
3611
3612 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3613 """
3614 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003615 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003616 return True
3617 return False
3618
3619 def _get_git_gerrit_identity_pairs(self):
3620 """Returns map from canonic host to pair of identities (Git, Gerrit).
3621
3622 One of identities might be None, meaning not configured.
3623 """
3624 host_to_identity_pairs = {}
3625 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003626 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003627 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3628 idx = 0 if canonical == host else 1
3629 pair[idx] = identity
3630 return host_to_identity_pairs
3631
3632 def get_partially_configured_hosts(self):
3633 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003634 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003635 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003636 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003637
3638 def get_conflicting_hosts(self):
3639 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003640 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003641 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003642 if None not in (i1, i2) and i1 != i2)
3643
3644 def get_duplicated_hosts(self):
3645 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003646 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003647
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003648
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003649 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003650 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003651 hosts = sorted(hosts)
3652 assert hosts
3653 if extra_column_func is None:
3654 extras = [''] * len(hosts)
3655 else:
3656 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003657 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3658 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003659 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003660 lines.append(tmpl % he)
3661 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003662
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003663 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003664 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003665 yield ('.googlesource.com wildcard record detected',
3666 ['Chrome Infrastructure team recommends to list full host names '
3667 'explicitly.'],
3668 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003669
3670 dups = self.get_duplicated_hosts()
3671 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003672 yield ('The following hosts were defined twice',
3673 self._format_hosts(dups),
3674 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003675
3676 partial = self.get_partially_configured_hosts()
3677 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003678 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3679 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003680 self._format_hosts(
3681 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3682 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003683
3684 conflicting = self.get_conflicting_hosts()
3685 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003686 yield ('The following Git hosts have differing credentials from their '
3687 'Gerrit counterparts',
3688 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3689 tuple(self._get_git_gerrit_identity_pairs()[host])),
3690 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003691
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003692 def find_and_report_problems(self):
3693 """Returns True if there was at least one problem, else False."""
3694 found = False
3695 bad_hosts = set()
3696 for title, sublines, hosts in self._find_problems():
3697 if not found:
3698 found = True
3699 print('\n\n.gitcookies problem report:\n')
3700 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003701 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003702 if sublines:
3703 print()
3704 print(' %s' % '\n '.join(sublines))
3705 print()
3706
3707 if bad_hosts:
3708 assert found
3709 print(' You can manually remove corresponding lines in your %s file and '
3710 'visit the following URLs with correct account to generate '
3711 'correct credential lines:\n' %
3712 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003713 print(' %s' % '\n '.join(
3714 sorted(
3715 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3716 _canonical_git_googlesource_host(host))
3717 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003718 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003719
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003720
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003721@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003722def CMDcreds_check(parser, args):
3723 """Checks credentials and suggests changes."""
3724 _, _ = parser.parse_args(args)
3725
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003726 # Code below checks .gitcookies. Abort if using something else.
3727 authn = gerrit_util.Authenticator.get()
3728 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003729 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003730 'This command is not designed for bot environment. It checks '
3731 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003732 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3733 if isinstance(authn, gerrit_util.GceAuthenticator):
3734 message += (
3735 '\n'
3736 'If you need to run this on GCE or a cloudtop instance, '
3737 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3738 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003739
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003740 checker = _GitCookiesChecker()
3741 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003742
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003743 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003744 checker.print_current_creds(include_netrc=True)
3745
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003746 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003747 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003748 return 0
3749 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003750
3751
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003752@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003753def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003754 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003755 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003756 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003757 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003758 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003759 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003760 return RunGit(['config', 'branch.%s.base-url' % branch],
3761 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003762
3763 print('Setting base-url to %s' % args[0])
3764 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3765 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003766
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003767
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003768def color_for_status(status):
3769 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003770 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003771 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003772 'unsent': BOLD + Fore.YELLOW,
3773 'waiting': BOLD + Fore.RED,
3774 'reply': BOLD + Fore.YELLOW,
3775 'not lgtm': BOLD + Fore.RED,
3776 'lgtm': BOLD + Fore.GREEN,
3777 'commit': BOLD + Fore.MAGENTA,
3778 'closed': BOLD + Fore.CYAN,
3779 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003780 }.get(status, Fore.WHITE)
3781
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003782
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003783def get_cl_statuses(changes, fine_grained, max_processes=None):
3784 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003785
3786 If fine_grained is true, this will fetch CL statuses from the server.
3787 Otherwise, simply indicate if there's a matching url for the given branches.
3788
3789 If max_processes is specified, it is used as the maximum number of processes
3790 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3791 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003792
3793 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003794 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003795 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003796 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003797
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003798 if not fine_grained:
3799 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003800 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003801 for cl in changes:
3802 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003803 return
3804
3805 # First, sort out authentication issues.
3806 logging.debug('ensuring credentials exist')
3807 for cl in changes:
3808 cl.EnsureAuthenticated(force=False, refresh=True)
3809
3810 def fetch(cl):
3811 try:
3812 return (cl, cl.GetStatus())
3813 except:
3814 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003815 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003816 raise
3817
3818 threads_count = len(changes)
3819 if max_processes:
3820 threads_count = max(1, min(threads_count, max_processes))
3821 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3822
Edward Lemur61bf4172020-02-24 23:22:37 +00003823 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003824 fetched_cls = set()
3825 try:
3826 it = pool.imap_unordered(fetch, changes).__iter__()
3827 while True:
3828 try:
3829 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003830 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003831 break
3832 fetched_cls.add(cl)
3833 yield cl, status
3834 finally:
3835 pool.close()
3836
3837 # Add any branches that failed to fetch.
3838 for cl in set(changes) - fetched_cls:
3839 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003840
rmistry@google.com2dd99862015-06-22 12:22:18 +00003841
Jose Lopes3863fc52020-04-07 17:00:25 +00003842def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003843 """Uploads CLs of local branches that are dependents of the current branch.
3844
3845 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003846
3847 test1 -> test2.1 -> test3.1
3848 -> test3.2
3849 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003850
3851 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3852 run on the dependent branches in this order:
3853 test2.1, test3.1, test3.2, test2.2, test3.3
3854
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003855 Note: This function does not rebase your local dependent branches. Use it
3856 when you make a change to the parent branch that will not conflict
3857 with its dependent branches, and you would like their dependencies
3858 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003859 """
3860 if git_common.is_dirty_git_tree('upload-branch-deps'):
3861 return 1
3862
3863 root_branch = cl.GetBranch()
3864 if root_branch is None:
3865 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3866 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003867 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003868 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3869 'patchset dependencies without an uploaded CL.')
3870
3871 branches = RunGit(['for-each-ref',
3872 '--format=%(refname:short) %(upstream:short)',
3873 'refs/heads'])
3874 if not branches:
3875 print('No local branches found.')
3876 return 0
3877
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003878 # Create a dictionary of all local branches to the branches that are
3879 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003880 tracked_to_dependents = collections.defaultdict(list)
3881 for b in branches.splitlines():
3882 tokens = b.split()
3883 if len(tokens) == 2:
3884 branch_name, tracked = tokens
3885 tracked_to_dependents[tracked].append(branch_name)
3886
vapiera7fbd5a2016-06-16 09:17:49 -07003887 print()
3888 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003889 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003890
rmistry@google.com2dd99862015-06-22 12:22:18 +00003891 def traverse_dependents_preorder(branch, padding=''):
3892 dependents_to_process = tracked_to_dependents.get(branch, [])
3893 padding += ' '
3894 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003895 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003896 dependents.append(dependent)
3897 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003898
rmistry@google.com2dd99862015-06-22 12:22:18 +00003899 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003900 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003901
3902 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003903 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003904 return 0
3905
rmistry@google.com2dd99862015-06-22 12:22:18 +00003906 # Record all dependents that failed to upload.
3907 failures = {}
3908 # Go through all dependents, checkout the branch and upload.
3909 try:
3910 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003911 print()
3912 print('--------------------------------------')
3913 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003914 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003915 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003916 try:
3917 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003918 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003919 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003920 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003921 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003922 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003923 finally:
3924 # Swap back to the original root branch.
3925 RunGit(['checkout', '-q', root_branch])
3926
vapiera7fbd5a2016-06-16 09:17:49 -07003927 print()
3928 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003929 for dependent_branch in dependents:
3930 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003931 print(' %s : %s' % (dependent_branch, upload_status))
3932 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003933
3934 return 0
3935
3936
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003937def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003938 """Given a proposed tag name, returns a tag name that is guaranteed to be
3939 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3940 or 'foo-3', and so on."""
3941
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003942 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003943 for suffix_num in itertools.count(1):
3944 if suffix_num == 1:
3945 to_check = proposed_tag
3946 else:
3947 to_check = '%s-%d' % (proposed_tag, suffix_num)
3948
3949 if to_check not in existing_tags:
3950 return to_check
3951
3952
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003953@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003954def CMDarchive(parser, args):
3955 """Archives and deletes branches associated with closed changelists."""
3956 parser.add_option(
3957 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003958 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003959 parser.add_option(
3960 '-f', '--force', action='store_true',
3961 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003962 parser.add_option(
3963 '-d', '--dry-run', action='store_true',
3964 help='Skip the branch tagging and removal steps.')
3965 parser.add_option(
3966 '-t', '--notags', action='store_true',
3967 help='Do not tag archived branches. '
3968 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003969 parser.add_option(
3970 '-p',
3971 '--pattern',
3972 default='git-cl-archived-{issue}-{branch}',
3973 help='Format string for archive tags. '
3974 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003975
kmarshall3bff56b2016-06-06 18:31:47 -07003976 options, args = parser.parse_args(args)
3977 if args:
3978 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003979
3980 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3981 if not branches:
3982 return 0
3983
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003984 tags = RunGit(['for-each-ref', '--format=%(refname)',
3985 'refs/tags']).splitlines() or []
3986 tags = [t.split('/')[-1] for t in tags]
3987
vapiera7fbd5a2016-06-16 09:17:49 -07003988 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003989 changes = [Changelist(branchref=b)
3990 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003991 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3992 statuses = get_cl_statuses(changes,
3993 fine_grained=True,
3994 max_processes=options.maxjobs)
3995 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003996 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3997 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003998 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003999 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07004000 proposal.sort()
4001
4002 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004003 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004004 return 0
4005
Edward Lemur85153282020-02-14 22:06:29 +00004006 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07004007
vapiera7fbd5a2016-06-16 09:17:49 -07004008 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004009 if options.notags:
4010 for next_item in proposal:
4011 print(' ' + next_item[0])
4012 else:
4013 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4014 for next_item in proposal:
4015 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004016
kmarshall9249e012016-08-23 12:02:16 -07004017 # Quit now on precondition failure or if instructed by the user, either
4018 # via an interactive prompt or by command line flags.
4019 if options.dry_run:
4020 print('\nNo changes were made (dry run).\n')
4021 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004022
4023 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004024 print('You are currently on a branch \'%s\' which is associated with a '
4025 'closed codereview issue, so archive cannot proceed. Please '
4026 'checkout another branch and run this command again.' %
4027 current_branch)
4028 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004029
4030 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004031 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004032 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004033 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004034 return 1
4035
4036 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004037 if not options.notags:
4038 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004039
4040 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4041 # Clean up the tag if we failed to delete the branch.
4042 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004043
vapiera7fbd5a2016-06-16 09:17:49 -07004044 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004045
4046 return 0
4047
4048
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004049@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004050def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004051 """Show status of changelists.
4052
4053 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004054 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004055 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004056 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004057 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004058 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004059 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004060 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004061
4062 Also see 'git cl comments'.
4063 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004064 parser.add_option(
4065 '--no-branch-color',
4066 action='store_true',
4067 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004068 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004069 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004070 parser.add_option('-f', '--fast', action='store_true',
4071 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004072 parser.add_option(
4073 '-j', '--maxjobs', action='store', type=int,
4074 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004075 parser.add_option(
4076 '-i', '--issue', type=int,
4077 help='Operate on this issue instead of the current branch\'s implicit '
4078 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004079 parser.add_option('-d',
4080 '--date-order',
4081 action='store_true',
4082 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004083 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004084 if args:
4085 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004086
iannuccie53c9352016-08-17 14:40:40 -07004087 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004088 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004089
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004090 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004091 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004092 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004093 if cl.GetIssue():
4094 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004095 elif options.field == 'id':
4096 issueid = cl.GetIssue()
4097 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004098 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004099 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004100 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004101 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004102 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004103 elif options.field == 'status':
4104 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004105 elif options.field == 'url':
4106 url = cl.GetIssueURL()
4107 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004108 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004109 return 0
4110
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004111 branches = RunGit([
4112 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4113 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004114 if not branches:
4115 print('No local branch found.')
4116 return 0
4117
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004118 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004119 Changelist(branchref=b, commit_date=ct)
4120 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4121 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004122 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004123 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004124 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004125 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004126
Edward Lemur85153282020-02-14 22:06:29 +00004127 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004128
4129 def FormatBranchName(branch, colorize=False):
4130 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4131 an asterisk when it is the current branch."""
4132
4133 asterisk = ""
4134 color = Fore.RESET
4135 if branch == current_branch:
4136 asterisk = "* "
4137 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004138 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004139
4140 if colorize:
4141 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004142 return asterisk + branch_name
4143
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004144 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004145
4146 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004147
4148 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004149 sorted_changes = sorted(changes,
4150 key=lambda c: c.GetCommitDate(),
4151 reverse=True)
4152 else:
4153 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4154 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004155 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004156 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004157 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004158 branch_statuses[c.GetBranch()] = status
4159 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004160 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004161 if url and (not status or status == 'error'):
4162 # The issue probably doesn't exist anymore.
4163 url += ' (broken)'
4164
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004165 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004166 # Turn off bold as well as colors.
4167 END = '\033[0m'
4168 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004169 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004170 color = ''
4171 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004172 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004173
Alan Cuttera3be9a52019-03-04 18:50:33 +00004174 branch_display = FormatBranchName(branch)
4175 padding = ' ' * (alignment - len(branch_display))
4176 if not options.no_branch_color:
4177 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004178
Alan Cuttera3be9a52019-03-04 18:50:33 +00004179 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4180 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004181
vapiera7fbd5a2016-06-16 09:17:49 -07004182 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004183 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004184 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004185 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004186 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004187 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004188 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004189 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004190 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004191 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004192 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004193 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004194 return 0
4195
4196
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004197def colorize_CMDstatus_doc():
4198 """To be called once in main() to add colors to git cl status help."""
4199 colors = [i for i in dir(Fore) if i[0].isupper()]
4200
4201 def colorize_line(line):
4202 for color in colors:
4203 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004204 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004205 indent = len(line) - len(line.lstrip(' ')) + 1
4206 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4207 return line
4208
4209 lines = CMDstatus.__doc__.splitlines()
4210 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4211
4212
phajdan.jre328cf92016-08-22 04:12:17 -07004213def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004214 if path == '-':
4215 json.dump(contents, sys.stdout)
4216 else:
4217 with open(path, 'w') as f:
4218 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004219
4220
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004221@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004222@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004223def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004224 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004225
4226 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004227 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004228 parser.add_option('-r', '--reverse', action='store_true',
4229 help='Lookup the branch(es) for the specified issues. If '
4230 'no issues are specified, all branches with mapped '
4231 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004232 parser.add_option('--json',
4233 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004234 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004235
dnj@chromium.org406c4402015-03-03 17:22:28 +00004236 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004237 branches = RunGit(['for-each-ref', 'refs/heads',
4238 '--format=%(refname)']).splitlines()
4239 # Reverse issue lookup.
4240 issue_branch_map = {}
4241
4242 git_config = {}
4243 for config in RunGit(['config', '--get-regexp',
4244 r'branch\..*issue']).splitlines():
4245 name, _space, val = config.partition(' ')
4246 git_config[name] = val
4247
4248 for branch in branches:
4249 issue = git_config.get(
4250 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4251 if issue:
4252 issue_branch_map.setdefault(int(issue), []).append(branch)
4253 if not args:
4254 args = sorted(issue_branch_map.keys())
4255 result = {}
4256 for issue in args:
4257 try:
4258 issue_num = int(issue)
4259 except ValueError:
4260 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4261 continue
4262 result[issue_num] = issue_branch_map.get(issue_num)
4263 print('Branch for issue number %s: %s' %
4264 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4265 if options.json:
4266 write_json(options.json, result)
4267 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004268
4269 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004270 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004271 if not issue.valid:
4272 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4273 'or no argument to list it.\n'
4274 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004275 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004276 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004277 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004278 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004279 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4280 if options.json:
4281 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004282 'gerrit_host': cl.GetGerritHost(),
4283 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004284 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004285 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004286 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004287 return 0
4288
4289
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004290@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004291def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004292 """Shows or posts review comments for any changelist."""
4293 parser.add_option('-a', '--add-comment', dest='comment',
4294 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004295 parser.add_option('-p', '--publish', action='store_true',
4296 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004297 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004298 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004299 parser.add_option('-m', '--machine-readable', dest='readable',
4300 action='store_false', default=True,
4301 help='output comments in a format compatible with '
4302 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004303 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004304 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004305 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004306
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004307 issue = None
4308 if options.issue:
4309 try:
4310 issue = int(options.issue)
4311 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004312 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004313
Edward Lemur934836a2019-09-09 20:16:54 +00004314 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004315
4316 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004317 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004318 return 0
4319
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004320 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4321 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004322 for comment in summary:
4323 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004324 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004325 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004326 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004327 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004328 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004329 elif comment.autogenerated:
4330 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004331 else:
4332 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004333 print('\n%s%s %s%s\n%s' % (
4334 color,
4335 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4336 comment.sender,
4337 Fore.RESET,
4338 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4339
smut@google.comc85ac942015-09-15 16:34:43 +00004340 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004341 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004342 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004343 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4344 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004345 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004346 return 0
4347
4348
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004349@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004350@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004351def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004352 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004353 parser.add_option('-d', '--display', action='store_true',
4354 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004355 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004356 help='New description to set for this issue (- for stdin, '
4357 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004358 parser.add_option('-f', '--force', action='store_true',
4359 help='Delete any unpublished Gerrit edits for this issue '
4360 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004361
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004362 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004363
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004364 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004365 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004366 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004367 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004368 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004369
Edward Lemur934836a2019-09-09 20:16:54 +00004370 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004371 if target_issue_arg:
4372 kwargs['issue'] = target_issue_arg.issue
4373 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004374
4375 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004376 if not cl.GetIssue():
4377 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004378
Edward Lemur678a6842019-10-03 22:25:05 +00004379 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004380 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004381
Edward Lemur6c6827c2020-02-06 21:15:18 +00004382 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004383
smut@google.com34fb6b12015-07-13 20:03:26 +00004384 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004385 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004386 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004387
4388 if options.new_description:
4389 text = options.new_description
4390 if text == '-':
4391 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004392 elif text == '+':
4393 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004394 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004395
4396 description.set_description(text)
4397 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004398 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004399 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004400 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004401 return 0
4402
4403
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004404@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004405def CMDlint(parser, args):
4406 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004407 parser.add_option('--filter', action='append', metavar='-x,+y',
4408 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004409 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004410
4411 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004412 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004413 try:
4414 import cpplint
4415 import cpplint_chromium
4416 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004417 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004418 return 1
4419
4420 # Change the current working directory before calling lint so that it
4421 # shows the correct base.
4422 previous_cwd = os.getcwd()
4423 os.chdir(settings.GetRoot())
4424 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004425 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004426 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004427 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004428 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004429 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004430
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004431 # Process cpplint arguments, if any.
4432 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4433 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004434 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004435
Lei Zhang379d1ad2020-07-15 19:40:06 +00004436 include_regex = re.compile(settings.GetLintRegex())
4437 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004438 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4439 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004440 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004442 continue
4443
4444 if ignore_regex.match(filename):
4445 print('Ignoring file %s' % filename)
4446 continue
4447
4448 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4449 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004450 finally:
4451 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004452 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004453 if cpplint._cpplint_state.error_count != 0:
4454 return 1
4455 return 0
4456
4457
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004458@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004459def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004460 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004461 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004462 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004463 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004464 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004465 parser.add_option('--all', action='store_true',
4466 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004467 parser.add_option('--files',
4468 nargs=1,
4469 help='Semicolon-separated list of files to be marked as '
4470 'modified when executing presubmit or post-upload hooks. '
4471 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004472 parser.add_option('--parallel', action='store_true',
4473 help='Run all tests specified by input_api.RunTests in all '
4474 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004475 parser.add_option('--resultdb', action='store_true',
4476 help='Run presubmit checks in the ResultSink environment '
4477 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004478 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004479 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004480
sbc@chromium.org71437c02015-04-09 19:29:40 +00004481 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004482 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004483 return 1
4484
Edward Lemur934836a2019-09-09 20:16:54 +00004485 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004486 if args:
4487 base_branch = args[0]
4488 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004489 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004490 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004491
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004492 start = time.time()
4493 try:
4494 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4495 description = cl.FetchDescription()
4496 else:
4497 description = _create_description_from_log([base_branch])
4498 except Exception as e:
4499 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004500 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004501 elapsed = time.time() - start
4502 if elapsed > 5:
4503 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004504
Bruce Dawson13acea32022-05-03 22:13:08 +00004505 if not base_branch:
4506 if not options.force:
4507 print('use --force to check even when not on a branch.')
4508 return 1
4509 base_branch = 'HEAD'
4510
Josip Sokcevic017544d2022-03-31 23:47:53 +00004511 cl.RunHook(committing=not options.upload,
4512 may_prompt=False,
4513 verbose=options.verbose,
4514 parallel=options.parallel,
4515 upstream=base_branch,
4516 description=description,
4517 all_files=options.all,
4518 files=options.files,
4519 resultdb=options.resultdb,
4520 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004521 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004522
4523
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004524def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004525 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004526
4527 Works the same way as
4528 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4529 but can be called on demand on all platforms.
4530
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004531 The basic idea is to generate git hash of a state of the tree, original
4532 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004533 """
4534 lines = []
4535 tree_hash = RunGitSilent(['write-tree'])
4536 lines.append('tree %s' % tree_hash.strip())
4537 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4538 if code == 0:
4539 lines.append('parent %s' % parent.strip())
4540 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4541 lines.append('author %s' % author.strip())
4542 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4543 lines.append('committer %s' % committer.strip())
4544 lines.append('')
4545 # Note: Gerrit's commit-hook actually cleans message of some lines and
4546 # whitespace. This code is not doing this, but it clearly won't decrease
4547 # entropy.
4548 lines.append(message)
4549 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004550 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004551 return 'I%s' % change_hash.strip()
4552
4553
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004554def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004555 """Computes the remote branch ref to use for the CL.
4556
4557 Args:
4558 remote (str): The git remote for the CL.
4559 remote_branch (str): The git remote branch for the CL.
4560 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004561 """
4562 if not (remote and remote_branch):
4563 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004564
wittman@chromium.org455dc922015-01-26 20:15:50 +00004565 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004566 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004567 # refs, which are then translated into the remote full symbolic refs
4568 # below.
4569 if '/' not in target_branch:
4570 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4571 else:
4572 prefix_replacements = (
4573 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4574 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4575 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4576 )
4577 match = None
4578 for regex, replacement in prefix_replacements:
4579 match = re.search(regex, target_branch)
4580 if match:
4581 remote_branch = target_branch.replace(match.group(0), replacement)
4582 break
4583 if not match:
4584 # This is a branch path but not one we recognize; use as-is.
4585 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004586 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004587 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004588 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004589 # Handle the refs that need to land in different refs.
4590 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004591
wittman@chromium.org455dc922015-01-26 20:15:50 +00004592 # Create the true path to the remote branch.
4593 # Does the following translation:
4594 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004595 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004596 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4597 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4598 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4599 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4600 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4601 'refs/heads/')
4602 elif remote_branch.startswith('refs/remotes/branch-heads'):
4603 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004604
wittman@chromium.org455dc922015-01-26 20:15:50 +00004605 return remote_branch
4606
4607
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004608def cleanup_list(l):
4609 """Fixes a list so that comma separated items are put as individual items.
4610
4611 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4612 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4613 """
4614 items = sum((i.split(',') for i in l), [])
4615 stripped_items = (i.strip() for i in items)
4616 return sorted(filter(None, stripped_items))
4617
4618
Aaron Gable4db38df2017-11-03 14:59:07 -07004619@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004620@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004621def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004622 """Uploads the current changelist to codereview.
4623
4624 Can skip dependency patchset uploads for a branch by running:
4625 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004626 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004627 git config --unset branch.branch_name.skip-deps-uploads
4628 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004629
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004630 If the name of the checked out branch starts with "bug-" or "fix-" followed
4631 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004632 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004633
4634 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004635 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004636 [git-cl] add support for hashtags
4637 Foo bar: implement foo
4638 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004639 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004640 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4641 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004642 parser.add_option('--bypass-watchlists', action='store_true',
4643 dest='bypass_watchlists',
4644 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004645 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004646 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004647 parser.add_option('--message', '-m', dest='message',
4648 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004649 parser.add_option('-b', '--bug',
4650 help='pre-populate the bug number(s) for this issue. '
4651 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004652 parser.add_option('--message-file', dest='message_file',
4653 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004654 parser.add_option('--title', '-t', dest='title',
4655 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004656 parser.add_option('-T', '--skip-title', action='store_true',
4657 dest='skip_title',
4658 help='Use the most recent commit message as the title of '
4659 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004660 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004661 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004662 help='reviewer email addresses')
4663 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004664 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004665 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004666 parser.add_option('--hashtag', dest='hashtags',
4667 action='append', default=[],
4668 help=('Gerrit hashtag for new CL; '
4669 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004670 parser.add_option('-s',
4671 '--send-mail',
4672 '--send-email',
4673 dest='send_mail',
4674 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004675 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004676 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004677 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004678 metavar='TARGET',
4679 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004680 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004681 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004682 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004683 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004684 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004685 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004686 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004687 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4688 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004689 parser.add_option('-c',
4690 '--use-commit-queue',
4691 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004692 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004693 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004694 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004695 parser.add_option('-d', '--cq-dry-run',
4696 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004697 help='Send the patchset to do a CQ dry run right after '
4698 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004699 parser.add_option(
4700 '-q',
4701 '--cq-quick-run',
4702 action='store_true',
4703 default=False,
4704 help='Send the patchset to do a CQ quick run right after '
4705 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4706 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004707 parser.add_option('--set-bot-commit', action='store_true',
4708 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004709 parser.add_option('--preserve-tryjobs', action='store_true',
4710 help='instruct the CQ to let tryjobs running even after '
4711 'new patchsets are uploaded instead of canceling '
4712 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004713 parser.add_option('--dependencies', action='store_true',
4714 help='Uploads CLs of all the local branches that depend on '
4715 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004716 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4717 help='Sends your change to the CQ after an approval. Only '
4718 'works on repos that have the Auto-Submit label '
4719 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004720 parser.add_option('--parallel', action='store_true',
4721 help='Run all tests specified by input_api.RunTests in all '
4722 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004723 parser.add_option('--no-autocc', action='store_true',
4724 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004725 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004726 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004727 parser.add_option('-R', '--retry-failed', action='store_true',
4728 help='Retry failed tryjobs from old patchset immediately '
4729 'after uploading new patchset. Cannot be used with '
4730 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004731 parser.add_option('--fixed', '-x',
4732 help='List of bugs that will be commented on and marked '
4733 'fixed (pre-populates "Fixed:" tag). Same format as '
4734 '-b option / "Bug:" tag. If fixing several issues, '
4735 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004736 parser.add_option('--edit-description', action='store_true', default=False,
4737 help='Modify description before upload. Cannot be used '
4738 'with --force. It is a noop when --no-squash is set '
4739 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004740 parser.add_option('--git-completion-helper', action="store_true",
4741 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004742 parser.add_option('-o',
4743 '--push-options',
4744 action='append',
4745 default=[],
4746 help='Transmit the given string to the server when '
4747 'performing git push (pass-through). See git-push '
4748 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004749 parser.add_option('--no-add-changeid',
4750 action='store_true',
4751 dest='no_add_changeid',
4752 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004753 parser.add_option('--no-python2-post-upload-hooks',
4754 action='store_true',
4755 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004756 parser.add_option('--cherry-pick-stacked',
4757 '--cp',
4758 dest='cherry_pick_stacked',
4759 action='store_true',
4760 help='If parent branch has un-uploaded updates, '
4761 'automatically skip parent branches and just upload '
4762 'the current branch cherry-pick on its parent\'s last '
4763 'uploaded commit. Allows users to skip the potential '
4764 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004765 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004766
rmistry@google.com2dd99862015-06-22 12:22:18 +00004767 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004768 (options, args) = parser.parse_args(args)
4769
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004770 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004771 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4772 if opt.help != optparse.SUPPRESS_HELP))
4773 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004774
sbc@chromium.org71437c02015-04-09 19:29:40 +00004775 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004776 return 1
4777
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004778 options.reviewers = cleanup_list(options.reviewers)
4779 options.cc = cleanup_list(options.cc)
4780
Josipe827b0f2020-01-30 00:07:20 +00004781 if options.edit_description and options.force:
4782 parser.error('Only one of --force and --edit-description allowed')
4783
tandriib80458a2016-06-23 12:20:07 -07004784 if options.message_file:
4785 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004786 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004787 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004788
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004789 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004790 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004791 options.use_commit_queue,
4792 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004793 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4794 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004795
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004796 if options.skip_title and options.title:
4797 parser.error('Only one of --title and --skip-title allowed.')
4798
Aaron Gableedbc4132017-09-11 13:22:28 -07004799 if options.use_commit_queue:
4800 options.send_mail = True
4801
Edward Lesmes0dd54822020-03-26 18:24:25 +00004802 if options.squash is None:
4803 # Load default for user, repo, squash=true, in this order.
4804 options.squash = settings.GetSquashGerritUploads()
4805
Joanna Wang5051ffe2023-03-01 22:24:07 +00004806 cl = Changelist(branchref=options.target_branch)
4807
4808 # Warm change details cache now to avoid RPCs later, reducing latency for
4809 # developers.
4810 if cl.GetIssue():
4811 cl._GetChangeDetail(
4812 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4813
4814 if options.retry_failed and not cl.GetIssue():
4815 print('No previous patchsets, so --retry-failed has no effect.')
4816 options.retry_failed = False
4817
4818 remote = cl.GetRemoteUrl()
Joanna Wang892f2ce2023-03-14 21:39:47 +00004819 dogfood_stacked_changes = (os.environ.get(DOGFOOD_STACKED_CHANGES_VAR)
Joanna Wang5051ffe2023-03-01 22:24:07 +00004820 not in ['1', '0']
4821 and any(repo in remote
4822 for repo in DOGFOOD_STACKED_CHANGES_REPOS))
4823
4824 if dogfood_stacked_changes:
4825 print('This repo has been enrolled in the stacked changes dogfood. '
4826 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4827 'File bugs at https://bit.ly/3Y6opoI')
4828
4829 if options.squash and (dogfood_stacked_changes
Joanna Wang892f2ce2023-03-14 21:39:47 +00004830 or os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'):
Joanna Wangdd12deb2023-01-26 20:43:28 +00004831 if options.dependencies:
4832 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004833
Joanna Wangd75fc882023-03-01 21:53:34 +00004834 if options.cherry_pick_stacked:
4835 try:
4836 orig_args.remove('--cherry-pick-stacked')
4837 except ValueError:
4838 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004839 UploadAllSquashed(options, orig_args)
4840 return 0
4841
Joanna Wangd75fc882023-03-01 21:53:34 +00004842 if options.cherry_pick_stacked:
4843 parser.error('--cherry-pick-stacked is not available for this workflow.')
4844
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004845 # cl.GetMostRecentPatchset uses cached information, and can return the last
4846 # patchset before upload. Calling it here makes it clear that it's the
4847 # last patchset before upload. Note that GetMostRecentPatchset will fail
4848 # if no CL has been uploaded yet.
4849 if options.retry_failed:
4850 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004851
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004852 ret = cl.CMDUpload(options, args, orig_args)
4853
4854 if options.retry_failed:
4855 if ret != 0:
4856 print('Upload failed, so --retry-failed has no effect.')
4857 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004858 builds, _ = _fetch_latest_builds(cl,
4859 DEFAULT_BUILDBUCKET_HOST,
4860 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004861 jobs = _filter_failed_for_retry(builds)
4862 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004863 print('No failed tryjobs, so --retry-failed has no effect.')
4864 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004865 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004866
4867 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004868
4869
Joanna Wang18de1f62023-01-21 01:24:24 +00004870def UploadAllSquashed(options, orig_args):
4871 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4872 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004873 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004874
Joanna Wangc710e2d2023-01-25 14:53:22 +00004875 # Create commits.
4876 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4877 if cherry_pick_current:
4878 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4879 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4880 uploads_by_cl.append((cls[0], new_upload))
4881 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004882 ordered_cls = list(reversed(cls))
4883
Joanna Wang6215dd02023-02-07 15:58:03 +00004884 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004885 # We can only support external changes when we're only uploading one
4886 # branch.
4887 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004888 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004889 if parent is None:
4890 origin = '.'
4891 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004892
Joanna Wang7603f042023-03-01 22:17:36 +00004893 while origin == '.':
4894 # Search for cl's closest ancestor with a gerrit hash.
4895 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4896 if origin == '.':
4897 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4898
4899 # Support the `git merge` and `git pull` workflow.
4900 if upstream_branch in ['master', 'main']:
4901 parent = cl.GetCommonAncestorWithUpstream()
4902 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004903 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4904 upstream_branch,
4905 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004906 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4907 upstream_branch,
4908 GERRIT_SQUASH_HASH_CONFIG_KEY)
4909 if parent:
4910 break
4911 branch = upstream_branch
4912 else:
4913 # Either the root of the tree is the cl's direct parent and the while
4914 # loop above only found empty branches between cl and the root of the
4915 # tree.
4916 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004917
Joanna Wang05b60342023-03-29 20:25:57 +00004918 if orig_parent is None:
4919 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004920 for i, cl in enumerate(ordered_cls):
4921 # If we're in the middle of the stack, set end_commit to downstream's
4922 # direct ancestor.
4923 if i + 1 < len(ordered_cls):
4924 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4925 else:
4926 child_base_commit = None
4927 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004928 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004929 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004930 end_commit=child_base_commit)
4931 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004932 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004933 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004934
4935 # Create refspec options
4936 cl, new_upload = uploads_by_cl[-1]
4937 refspec_opts = cl._GetRefSpecOptions(
4938 options,
4939 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004940 multi_change_upload=len(uploads_by_cl) > 1,
4941 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004942 refspec_suffix = ''
4943 if refspec_opts:
4944 refspec_suffix = '%' + ','.join(refspec_opts)
4945 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4946 refspec_suffix)
4947
4948 remote, remote_branch = cl.GetRemoteBranch()
4949 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4950 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4951 refspec_suffix)
4952
4953 # Git push
4954 git_push_metadata = {
4955 'gerrit_host':
4956 cl.GetGerritHost(),
4957 'title':
4958 options.title or '<untitled>',
4959 'change_id':
4960 git_footers.get_footer_change_id(new_upload.change_desc.description),
4961 'description':
4962 new_upload.change_desc.description,
4963 }
4964 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004965 git_push_metadata,
4966 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004967
4968 # Post push updates
4969 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4970 change_numbers = [
4971 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4972 ]
4973
4974 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4975 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4976
4977 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004978
4979
4980def _UploadAllPrecheck(options, orig_args):
4981 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4982 """Checks the state of the tree and gives the user uploading options
4983
4984 Returns: A tuple of the ordered list of changes that have new commits
4985 since their last upload and a boolean of whether the user wants to
4986 cherry-pick and upload the current branch instead of uploading all cls.
4987 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004988 cl = Changelist()
4989 if cl.GetBranch() is None:
4990 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4991
Joanna Wang18de1f62023-01-21 01:24:24 +00004992 branch_ref = None
4993 cls = []
4994 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004995 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004996
4997 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4998
4999 while True:
5000 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
5001 DieWithError(
5002 'More than %s branches in the stack have not been uploaded.\n'
5003 'Are your branches in a misconfigured state?\n'
5004 'If not, please upload some upstream changes first.' %
5005 (_MAX_STACKED_BRANCHES_UPLOAD))
5006
5007 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00005008
Joanna Wang6215dd02023-02-07 15:58:03 +00005009 # Only add CL if it has anything to commit.
5010 base_commit = cl.GetCommonAncestorWithUpstream()
5011 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
5012
5013 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
5014 if diff:
5015 cls.append(cl)
5016 if (not first_pass and
5017 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
5018 # We are mid-stack and the user must upload their upstream branches.
5019 must_upload_upstream = True
5020 elif first_pass: # The current branch has nothing to commit. Exit.
5021 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
5022 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
5023 first_pass = False
5024
5025 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005026 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005027 branch_ref = upstream_branch_ref # set branch for next run.
5028
Joanna Wang6215dd02023-02-07 15:58:03 +00005029 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5030 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5031 upstream_branch,
5032 LAST_UPLOAD_HASH_CONFIG_KEY)
5033
Joanna Wang18de1f62023-01-21 01:24:24 +00005034 # Case 1: We've reached the beginning of the tree.
5035 if origin != '.':
5036 break
5037
Joanna Wang18de1f62023-01-21 01:24:24 +00005038 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005039 # the user MUST upload them unless they are empty. Continue to
5040 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005041 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005042 continue
5043
Joanna Wang18de1f62023-01-21 01:24:24 +00005044 # Case 3: If upstream's last_upload == cl.base_commit we do
5045 # not need to upload any more upstreams from this point on.
5046 # (Even if there may be diverged branches higher up the tree)
5047 if base_commit == upstream_last_upload:
5048 break
5049
5050 # Case 4: If upstream's last_upload < cl.base_commit we are
5051 # uploading cl and upstream_cl.
5052 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005053 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005054 continue
5055
5056 # Case 5: If cl.base_commit < upstream's last_upload the user
5057 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005058 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005059 DieWithError(
5060 'At least one branch in the stack has diverged from its upstream '
5061 'branch and does not contain its upstream\'s last upload.\n'
5062 'Please rebase the stack with `git rebase-update` before uploading.')
5063
5064 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5065 # any relation to commits in the tree. Continue up the tree until we hit
5066 # the root.
5067
5068 # We assume all cls in the stack have the same auth requirements and only
5069 # check this once.
5070 cls[0].EnsureAuthenticated(force=options.force)
5071
5072 cherry_pick = False
5073 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005074 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005075 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005076 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005077 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005078 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005079 msg = ('At least one parent branch in `%s` has never been uploaded '
5080 'and must be uploaded before/with `%s`.\n' %
5081 (branches, cls[1].branch))
5082 if options.cherry_pick_stacked:
5083 DieWithError(msg)
5084 if not options.force:
5085 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005086 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005087 if options.cherry_pick_stacked:
5088 print('cherry-picking `%s` on %s\'s last upload' %
5089 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005090 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005091 elif not options.force:
5092 answer = gclient_utils.AskForData(
5093 '\n' + opt_message +
5094 'Press enter to update branches %s.\nOr type `n` to upload only '
5095 '`%s` cherry-picked on %s\'s last upload:' %
5096 (branches, cls[0].branch, cls[1].branch))
5097 if answer.lower() == 'n':
5098 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005099 return cls, cherry_pick
5100
5101
Francois Dorayd42c6812017-05-30 15:10:20 -04005102@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005103@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005104def CMDsplit(parser, args):
5105 """Splits a branch into smaller branches and uploads CLs.
5106
5107 Creates a branch and uploads a CL for each group of files modified in the
5108 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005109 comment, the string '$directory', is replaced with the directory containing
5110 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005111 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005112 parser.add_option('-d', '--description', dest='description_file',
5113 help='A text file containing a CL description in which '
5114 '$directory will be replaced by each CL\'s directory.')
5115 parser.add_option('-c', '--comment', dest='comment_file',
5116 help='A text file containing a CL comment.')
5117 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005118 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005119 help='List the files and reviewers for each CL that would '
5120 'be created, but don\'t create branches or CLs.')
5121 parser.add_option('--cq-dry-run', action='store_true',
5122 help='If set, will do a cq dry run for each uploaded CL. '
5123 'Please be careful when doing this; more than ~10 CLs '
5124 'has the potential to overload our build '
5125 'infrastructure. Try to upload these not during high '
5126 'load times (usually 11-3 Mountain View time). Email '
5127 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005128 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5129 default=True,
5130 help='Sends your change to the CQ after an approval. Only '
5131 'works on repos that have the Auto-Submit label '
5132 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005133 parser.add_option('--max-depth',
5134 type='int',
5135 default=0,
5136 help='The max depth to look for OWNERS files. Useful for '
5137 'controlling the granularity of the split CLs, e.g. '
5138 '--max-depth=1 will only split by top-level '
5139 'directory. Specifying a value less than 1 means no '
5140 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005141 options, _ = parser.parse_args(args)
5142
5143 if not options.description_file:
5144 parser.error('No --description flag specified.')
5145
5146 def WrappedCMDupload(args):
5147 return CMDupload(OptionParser(), args)
5148
Daniel Cheng403c44e2022-10-05 22:24:58 +00005149 return split_cl.SplitCl(options.description_file, options.comment_file,
5150 Changelist, WrappedCMDupload, options.dry_run,
5151 options.cq_dry_run, options.enable_auto_submit,
5152 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005153
5154
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005155@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005156@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005157def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005158 """DEPRECATED: Used to commit the current changelist via git-svn."""
5159 message = ('git-cl no longer supports committing to SVN repositories via '
5160 'git-svn. You probably want to use `git cl land` instead.')
5161 print(message)
5162 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005163
5164
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005165@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005166@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005167def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005168 """Commits the current changelist via git.
5169
5170 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5171 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005172 """
5173 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5174 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005175 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005176 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005177 parser.add_option('--parallel', action='store_true',
5178 help='Run all tests specified by input_api.RunTests in all '
5179 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005180 parser.add_option('--resultdb', action='store_true',
5181 help='Run presubmit checks in the ResultSink environment '
5182 'and send results to the ResultDB database.')
5183 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005184 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005185
Edward Lemur934836a2019-09-09 20:16:54 +00005186 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005187
Robert Iannucci2e73d432018-03-14 01:10:47 -07005188 if not cl.GetIssue():
5189 DieWithError('You must upload the change first to Gerrit.\n'
5190 ' If you would rather have `git cl land` upload '
5191 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005192 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5193 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005194
5195
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005196@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005197@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005198def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005199 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005200 parser.add_option('-b', dest='newbranch',
5201 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005202 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005203 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005204 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005205 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005206
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005207 group = optparse.OptionGroup(
5208 parser,
5209 'Options for continuing work on the current issue uploaded from a '
5210 'different clone (e.g. different machine). Must be used independently '
5211 'from the other options. No issue number should be specified, and the '
5212 'branch must have an issue number associated with it')
5213 group.add_option('--reapply', action='store_true', dest='reapply',
5214 help='Reset the branch and reapply the issue.\n'
5215 'CAUTION: This will undo any local changes in this '
5216 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005217
5218 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005219 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005220 parser.add_option_group(group)
5221
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005222 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005223
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005224 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005225 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005226 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005227 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005228 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005229
Edward Lemur934836a2019-09-09 20:16:54 +00005230 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005231 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005232 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005233
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005234 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005235 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005236 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005237
5238 RunGit(['reset', '--hard', upstream])
5239 if options.pull:
5240 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005241
Edward Lemur678a6842019-10-03 22:25:05 +00005242 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005243 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5244 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005245
5246 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005247 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005248
Edward Lemurf38bc172019-09-03 21:02:13 +00005249 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005250 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005251 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005252
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005253 # We don't want uncommitted changes mixed up with the patch.
5254 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005255 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005256
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005257 if options.newbranch:
5258 if options.force:
5259 RunGit(['branch', '-D', options.newbranch],
5260 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005261 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005262
Edward Lemur678a6842019-10-03 22:25:05 +00005263 cl = Changelist(
5264 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005265
Edward Lemur678a6842019-10-03 22:25:05 +00005266 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005267 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005268
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005269 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5270 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005271
5272
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005273def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005274 """Fetches the tree status and returns either 'open', 'closed',
5275 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005276 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005277 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005278 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005279 if status.find('closed') != -1 or status == '0':
5280 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005281
5282 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005283 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005284
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005285 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005286 return 'unset'
5287
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005288
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005289def GetTreeStatusReason():
5290 """Fetches the tree status from a json url and returns the message
5291 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005292 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005293 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005294 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005295 status = json.loads(connection.read())
5296 connection.close()
5297 return status['message']
5298
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005299
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005300@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005301def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005302 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005303 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005304 status = GetTreeStatus()
5305 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005306 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005307 return 2
5308
vapiera7fbd5a2016-06-16 09:17:49 -07005309 print('The tree is %s' % status)
5310 print()
5311 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005312 if status != 'open':
5313 return 1
5314 return 0
5315
5316
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005317@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005318def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005319 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5320 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005321 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005322 '-b', '--bot', action='append',
5323 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5324 'times to specify multiple builders. ex: '
5325 '"-b win_rel -b win_layout". See '
5326 'the try server waterfall for the builders name and the tests '
5327 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005328 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005329 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005330 help=('Buildbucket bucket to send the try requests. Format: '
5331 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005332 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005333 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005334 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005335 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005336 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005337 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005338 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005339 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005340 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005341 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005342 '-q',
5343 '--quick-run',
5344 action='store_true',
5345 default=False,
5346 help='trigger in quick run mode '
5347 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5348 'uick_run.md) (chromium only).')
5349 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005350 '--category', default='git_cl_try', help='Specify custom build category.')
5351 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005352 '--project',
5353 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005354 'in recipe to determine to which repository or directory to '
5355 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005356 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005357 '-p', '--property', dest='properties', action='append', default=[],
5358 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005359 'key2=value2 etc. The value will be treated as '
5360 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005361 'NOTE: using this may make your tryjob not usable for CQ, '
5362 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005363 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005364 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5365 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005366 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005367 parser.add_option(
5368 '-R', '--retry-failed', action='store_true', default=False,
5369 help='Retry failed jobs from the latest set of tryjobs. '
5370 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005371 parser.add_option(
5372 '-i', '--issue', type=int,
5373 help='Operate on this issue instead of the current branch\'s implicit '
5374 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005375 options, args = parser.parse_args(args)
5376
machenbach@chromium.org45453142015-09-15 08:45:22 +00005377 # Make sure that all properties are prop=value pairs.
5378 bad_params = [x for x in options.properties if '=' not in x]
5379 if bad_params:
5380 parser.error('Got properties with missing "=": %s' % bad_params)
5381
maruel@chromium.org15192402012-09-06 12:38:29 +00005382 if args:
5383 parser.error('Unknown arguments: %s' % args)
5384
Edward Lemur934836a2019-09-09 20:16:54 +00005385 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005386 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005387 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005388
Edward Lemurf38bc172019-09-03 21:02:13 +00005389 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005390 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005391
tandriie113dfd2016-10-11 10:20:12 -07005392 error_message = cl.CannotTriggerTryJobReason()
5393 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005394 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005395
Edward Lemur45768512020-03-02 19:03:14 +00005396 if options.bot:
5397 if options.retry_failed:
5398 parser.error('--bot is not compatible with --retry-failed.')
5399 if not options.bucket:
5400 parser.error('A bucket (e.g. "chromium/try") is required.')
5401
5402 triggered = [b for b in options.bot if 'triggered' in b]
5403 if triggered:
5404 parser.error(
5405 'Cannot schedule builds on triggered bots: %s.\n'
5406 'This type of bot requires an initial job from a parent (usually a '
5407 'builder). Schedule a job on the parent instead.\n' % triggered)
5408
5409 if options.bucket.startswith('.master'):
5410 parser.error('Buildbot masters are not supported.')
5411
5412 project, bucket = _parse_bucket(options.bucket)
5413 if project is None or bucket is None:
5414 parser.error('Invalid bucket: %s.' % options.bucket)
5415 jobs = sorted((project, bucket, bot) for bot in options.bot)
5416 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005417 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005418 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005419 if options.verbose:
5420 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005421 jobs = _filter_failed_for_retry(builds)
5422 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005423 print('There are no failed jobs in the latest set of jobs '
5424 '(patchset #%d), doing nothing.' % patchset)
5425 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005426 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005427 if num_builders > 10:
5428 confirm_or_exit('There are %d builders with failed builds.'
5429 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005430 elif options.quick_run:
5431 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5432 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005433 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005434 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005435 print('git cl try with no bots now defaults to CQ dry run.')
5436 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5437 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005438
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005439 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005440 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005441 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005442 except BuildbucketResponseException as ex:
5443 print('ERROR: %s' % ex)
5444 return 1
5445 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005446
5447
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005448@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005449def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005450 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005451 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005452 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005453 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005454 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005455 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005456 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005457 '--color', action='store_true', default=setup_color.IS_TTY,
5458 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005459 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005460 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5461 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005462 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005463 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005464 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005465 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005466 parser.add_option(
5467 '-i', '--issue', type=int,
5468 help='Operate on this issue instead of the current branch\'s implicit '
5469 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005470 options, args = parser.parse_args(args)
5471 if args:
5472 parser.error('Unrecognized args: %s' % ' '.join(args))
5473
Edward Lemur934836a2019-09-09 20:16:54 +00005474 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005475 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005476 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005477
tandrii221ab252016-10-06 08:12:04 -07005478 patchset = options.patchset
5479 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005480 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005481 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005482 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005483 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005484 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005485 cl.GetIssue())
5486
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005487 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005488 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005489 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005490 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005491 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005492 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005493 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005494 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005495 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005496 return 0
5497
5498
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005499@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005500@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005501def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005502 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005503 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005504 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005505 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005506
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005507 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005508 if args:
5509 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005510 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005511 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005512 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005513 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005514
5515 # Clear configured merge-base, if there is one.
5516 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005517 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005518 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005519 return 0
5520
5521
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005522@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005523def CMDweb(parser, args):
5524 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005525 parser.add_option('-p',
5526 '--print-only',
5527 action='store_true',
5528 dest='print_only',
5529 help='Only print the Gerrit URL, don\'t open it in the '
5530 'browser.')
5531 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005532 if args:
5533 parser.error('Unrecognized args: %s' % ' '.join(args))
5534
5535 issue_url = Changelist().GetIssueURL()
5536 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005537 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005538 return 1
5539
Orr Bernstein0b960582022-12-22 20:16:18 +00005540 if options.print_only:
5541 print(issue_url)
5542 return 0
5543
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005544 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005545 # allows us to hide the "Created new window in existing browser session."
5546 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005547 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005548 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005549 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005550 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005551 os.open(os.devnull, os.O_RDWR)
5552 try:
5553 webbrowser.open(issue_url)
5554 finally:
5555 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005556 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005557 return 0
5558
5559
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005560@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005561def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005562 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005563 parser.add_option('-d', '--dry-run', action='store_true',
5564 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005565 parser.add_option(
5566 '-q',
5567 '--quick-run',
5568 action='store_true',
5569 help='trigger in quick run mode '
5570 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5571 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005572 parser.add_option('-c', '--clear', action='store_true',
5573 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005574 parser.add_option(
5575 '-i', '--issue', type=int,
5576 help='Operate on this issue instead of the current branch\'s implicit '
5577 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005578 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005579 if args:
5580 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005581 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5582 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005583
Edward Lemur934836a2019-09-09 20:16:54 +00005584 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005585 if not cl.GetIssue():
5586 parser.error('Must upload the issue first.')
5587
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005588 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005589 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005590 elif options.quick_run:
5591 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005592 elif options.dry_run:
5593 state = _CQState.DRY_RUN
5594 else:
5595 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005596 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005597 return 0
5598
5599
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005600@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005601def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005602 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005603 parser.add_option(
5604 '-i', '--issue', type=int,
5605 help='Operate on this issue instead of the current branch\'s implicit '
5606 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005607 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005608 if args:
5609 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005610 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005611 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005612 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005613 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005614 cl.CloseIssue()
5615 return 0
5616
5617
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005618@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005619def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005620 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005621 parser.add_option(
5622 '--stat',
5623 action='store_true',
5624 dest='stat',
5625 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005626 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005627 if args:
5628 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005629
Edward Lemur934836a2019-09-09 20:16:54 +00005630 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005631 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005632 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005633 if not issue:
5634 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005635
Gavin Makbe2e9262022-11-08 23:41:55 +00005636 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005637 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005638 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005639 if not base:
5640 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5641 revision_info = detail['revisions'][detail['current_revision']]
5642 fetch_info = revision_info['fetch']['http']
5643 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5644 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005645
Aaron Gablea718c3e2017-08-28 17:47:28 -07005646 cmd = ['git', 'diff']
5647 if options.stat:
5648 cmd.append('--stat')
5649 cmd.append(base)
5650 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005651
5652 return 0
5653
5654
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005655@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005656def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005657 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005658 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005659 '--ignore-current',
5660 action='store_true',
5661 help='Ignore the CL\'s current reviewers and start from scratch.')
5662 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005663 '--ignore-self',
5664 action='store_true',
5665 help='Do not consider CL\'s author as an owners.')
5666 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005667 '--no-color',
5668 action='store_true',
5669 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005670 parser.add_option(
5671 '--batch',
5672 action='store_true',
5673 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005674 # TODO: Consider moving this to another command, since other
5675 # git-cl owners commands deal with owners for a given CL.
5676 parser.add_option(
5677 '--show-all',
5678 action='store_true',
5679 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005680 options, args = parser.parse_args(args)
5681
Edward Lemur934836a2019-09-09 20:16:54 +00005682 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005683 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005684
Yang Guo6e269a02019-06-26 11:17:02 +00005685 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005686 if len(args) == 0:
5687 print('No files specified for --show-all. Nothing to do.')
5688 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005689 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005690 for path in args:
5691 print('Owners for %s:' % path)
5692 print('\n'.join(
5693 ' - %s' % owner
5694 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005695 return 0
5696
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005697 if args:
5698 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005699 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005700 base_branch = args[0]
5701 else:
5702 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005703 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005704
Edward Lemur2c62b332020-03-12 22:12:33 +00005705 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005706
5707 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005708 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5709 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005710 return 0
5711
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005712 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005713 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005714 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005715 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005716 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005717 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005718 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005719
5720
Aiden Bennerc08566e2018-10-03 17:52:42 +00005721def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005722 """Generates a diff command."""
5723 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005724 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5725
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005726 if allow_prefix:
5727 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5728 # case that diff.noprefix is set in the user's git config.
5729 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5730 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005731 diff_cmd += ['--no-prefix']
5732
5733 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005734
5735 if args:
5736 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005737 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005738 diff_cmd.append(arg)
5739 else:
5740 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005741
5742 return diff_cmd
5743
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005744
Jamie Madill5e96ad12020-01-13 16:08:35 +00005745def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5746 """Runs clang-format-diff and sets a return value if necessary."""
5747
5748 if not clang_diff_files:
5749 return 0
5750
5751 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5752 # formatted. This is used to block during the presubmit.
5753 return_value = 0
5754
5755 # Locate the clang-format binary in the checkout
5756 try:
5757 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5758 except clang_format.NotFoundError as e:
5759 DieWithError(e)
5760
5761 if opts.full or settings.GetFormatFullByDefault():
5762 cmd = [clang_format_tool]
5763 if not opts.dry_run and not opts.diff:
5764 cmd.append('-i')
5765 if opts.dry_run:
5766 for diff_file in clang_diff_files:
5767 with open(diff_file, 'r') as myfile:
5768 code = myfile.read().replace('\r\n', '\n')
5769 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5770 stdout = stdout.replace('\r\n', '\n')
5771 if opts.diff:
5772 sys.stdout.write(stdout)
5773 if code != stdout:
5774 return_value = 2
5775 else:
5776 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5777 if opts.diff:
5778 sys.stdout.write(stdout)
5779 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005780 try:
5781 script = clang_format.FindClangFormatScriptInChromiumTree(
5782 'clang-format-diff.py')
5783 except clang_format.NotFoundError as e:
5784 DieWithError(e)
5785
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005786 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005787 if not opts.dry_run and not opts.diff:
5788 cmd.append('-i')
5789
5790 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005791 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005792
Edward Lesmes89624cd2020-04-06 17:51:56 +00005793 env = os.environ.copy()
5794 env['PATH'] = (
5795 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5796 stdout = RunCommand(
5797 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005798 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005799 if opts.diff:
5800 sys.stdout.write(stdout)
5801 if opts.dry_run and len(stdout) > 0:
5802 return_value = 2
5803
5804 return return_value
5805
5806
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005807def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5808 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5809 presubmit checks have failed (and returns 0 otherwise)."""
5810
5811 if not rust_diff_files:
5812 return 0
5813
5814 # Locate the rustfmt binary.
5815 try:
5816 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5817 except rustfmt.NotFoundError as e:
5818 DieWithError(e)
5819
5820 # TODO(crbug.com/1231317): Support formatting only the changed lines
5821 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5822 # https://github.com/emilio/rustfmt-format-diff
5823 cmd = [rustfmt_tool]
5824 if opts.dry_run:
5825 cmd.append('--check')
5826 cmd += rust_diff_files
5827 rustfmt_exitcode = subprocess2.call(cmd)
5828
5829 if opts.presubmit and rustfmt_exitcode != 0:
5830 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005831
5832 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005833
5834
Olivier Robin0a6b5442022-04-07 07:25:04 +00005835def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5836 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5837 that presubmit checks have failed (and returns 0 otherwise)."""
5838
5839 if not swift_diff_files:
5840 return 0
5841
5842 # Locate the swift-format binary.
5843 try:
5844 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5845 except swift_format.NotFoundError as e:
5846 DieWithError(e)
5847
5848 cmd = [swift_format_tool]
5849 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005850 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005851 else:
5852 cmd += ['format', '-i']
5853 cmd += swift_diff_files
5854 swift_format_exitcode = subprocess2.call(cmd)
5855
5856 if opts.presubmit and swift_format_exitcode != 0:
5857 return 2
5858
5859 return 0
5860
5861
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005862def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005863 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005864 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005865
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005866
enne@chromium.org555cfe42014-01-29 18:21:39 +00005867@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005868@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005869def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005870 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005871 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005872 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005873 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005874 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005875 parser.add_option('--full', action='store_true',
5876 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005877 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005878 parser.add_option('--dry-run', action='store_true',
5879 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005880 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005881 '--no-clang-format',
5882 dest='clang_format',
5883 action='store_false',
5884 default=True,
5885 help='Disables formatting of various file types using clang-format.')
5886 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005887 '--python',
5888 action='store_true',
5889 default=None,
5890 help='Enables python formatting on all python files.')
5891 parser.add_option(
5892 '--no-python',
5893 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005894 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005895 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005896 'If neither --python or --no-python are set, python files that have a '
5897 '.style.yapf file in an ancestor directory will be formatted. '
5898 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005899 parser.add_option(
5900 '--js',
5901 action='store_true',
5902 help='Format javascript code with clang-format. '
5903 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005904 parser.add_option('--diff', action='store_true',
5905 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005906 parser.add_option('--presubmit', action='store_true',
5907 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005908
5909 parser.add_option('--rust-fmt',
5910 dest='use_rust_fmt',
5911 action='store_true',
5912 default=rustfmt.IsRustfmtSupported(),
5913 help='Enables formatting of Rust file types using rustfmt.')
5914 parser.add_option(
5915 '--no-rust-fmt',
5916 dest='use_rust_fmt',
5917 action='store_false',
5918 help='Disables formatting of Rust file types using rustfmt.')
5919
Olivier Robin0a6b5442022-04-07 07:25:04 +00005920 parser.add_option(
5921 '--swift-format',
5922 dest='use_swift_format',
5923 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005924 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005925 help='Enables formatting of Swift file types using swift-format '
5926 '(macOS host only).')
5927 parser.add_option(
5928 '--no-swift-format',
5929 dest='use_swift_format',
5930 action='store_false',
5931 help='Disables formatting of Swift file types using swift-format.')
5932
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005933 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005934
Garrett Beaty91a6f332020-01-06 16:57:24 +00005935 if opts.python is not None and opts.no_python:
5936 raise parser.error('Cannot set both --python and --no-python')
5937 if opts.no_python:
5938 opts.python = False
5939
Daniel Chengc55eecf2016-12-30 03:11:02 -08005940 # Normalize any remaining args against the current path, so paths relative to
5941 # the current directory are still resolved as expected.
5942 args = [os.path.join(os.getcwd(), arg) for arg in args]
5943
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005944 # git diff generates paths against the root of the repository. Change
5945 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005946 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005947 if rel_base_path:
5948 os.chdir(rel_base_path)
5949
digit@chromium.org29e47272013-05-17 17:01:46 +00005950 # Grab the merge-base commit, i.e. the upstream commit of the current
5951 # branch when it was created or the last time it was rebased. This is
5952 # to cover the case where the user may have called "git fetch origin",
5953 # moving the origin branch to a newer commit, but hasn't rebased yet.
5954 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005955 upstream_branch = opts.upstream
5956 if not upstream_branch:
5957 cl = Changelist()
5958 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005959 if upstream_branch:
5960 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5961 upstream_commit = upstream_commit.strip()
5962
5963 if not upstream_commit:
5964 DieWithError('Could not find base commit for this branch. '
5965 'Are you in detached state?')
5966
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005967 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5968 diff_output = RunGit(changed_files_cmd)
5969 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005970 # Filter out files deleted by this CL
5971 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005972
Andreas Haas417d89c2020-02-06 10:24:27 +00005973 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005974 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005975
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005976 clang_diff_files = []
5977 if opts.clang_format:
5978 clang_diff_files = [
5979 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5980 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005981 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005982 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005983 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005984 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005985
Edward Lesmes50da7702020-03-30 19:23:43 +00005986 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005987
Jamie Madill5e96ad12020-01-13 16:08:35 +00005988 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5989 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005990
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005991 if opts.use_rust_fmt:
5992 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5993 upstream_commit)
5994 if rust_fmt_return_value == 2:
5995 return_value = 2
5996
Olivier Robin0a6b5442022-04-07 07:25:04 +00005997 if opts.use_swift_format:
5998 if sys.platform != 'darwin':
5999 DieWithError('swift-format is only supported on macOS.')
6000 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
6001 upstream_commit)
6002 if swift_format_return_value == 2:
6003 return_value = 2
6004
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006005 # Similar code to above, but using yapf on .py files rather than clang-format
6006 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006007 py_explicitly_disabled = opts.python is not None and not opts.python
6008 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00006009 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
6010 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006011
Aiden Bennerc08566e2018-10-03 17:52:42 +00006012 # Used for caching.
6013 yapf_configs = {}
6014 for f in python_diff_files:
6015 # Find the yapf style config for the current file, defaults to depot
6016 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006017 _FindYapfConfigFile(f, yapf_configs, top_dir)
6018
6019 # Turn on python formatting by default if a yapf config is specified.
6020 # This breaks in the case of this repo though since the specified
6021 # style file is also the global default.
6022 if opts.python is None:
6023 filtered_py_files = []
6024 for f in python_diff_files:
6025 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
6026 filtered_py_files.append(f)
6027 else:
6028 filtered_py_files = python_diff_files
6029
6030 # Note: yapf still seems to fix indentation of the entire file
6031 # even if line ranges are specified.
6032 # See https://github.com/google/yapf/issues/499
6033 if not opts.full and filtered_py_files:
6034 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6035
Brian Sheedyb4307d52019-12-02 19:18:17 +00006036 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6037 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6038 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006039
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006040 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006041 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6042 # Default to pep8 if not .style.yapf is found.
6043 if not yapf_style:
6044 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006045
Peter Wend9399922020-06-17 17:33:49 +00006046 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006047 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006048 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006049 else:
6050 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006051
6052 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006053
6054 has_formattable_lines = False
6055 if not opts.full:
6056 # Only run yapf over changed line ranges.
6057 for diff_start, diff_len in py_line_diffs[f]:
6058 diff_end = diff_start + diff_len - 1
6059 # Yapf errors out if diff_end < diff_start but this
6060 # is a valid line range diff for a removal.
6061 if diff_end >= diff_start:
6062 has_formattable_lines = True
6063 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6064 # If all line diffs were removals we have nothing to format.
6065 if not has_formattable_lines:
6066 continue
6067
6068 if opts.diff or opts.dry_run:
6069 cmd += ['--diff']
6070 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006071 stdout = RunCommand(cmd,
6072 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006073 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006074 cwd=top_dir,
6075 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006076 if opts.diff:
6077 sys.stdout.write(stdout)
6078 elif len(stdout) > 0:
6079 return_value = 2
6080 else:
6081 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006082 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006083
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006084 # Format GN build files. Always run on full build files for canonical form.
6085 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006086 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006087 if opts.dry_run or opts.diff:
6088 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006089 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006090 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006091 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006092 cwd=top_dir)
6093 if opts.dry_run and gn_ret == 2:
6094 return_value = 2 # Not formatted.
6095 elif opts.diff and gn_ret == 2:
6096 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006097 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006098 elif gn_ret != 0:
6099 # For non-dry run cases (and non-2 return values for dry-run), a
6100 # nonzero error code indicates a failure, probably because the file
6101 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006102 DieWithError('gn format failed on ' + gn_diff_file +
6103 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006104
Ilya Shermane081cbe2017-08-15 17:51:04 -07006105 # Skip the metrics formatting from the global presubmit hook. These files have
6106 # a separate presubmit hook that issues an error if the files need formatting,
6107 # whereas the top-level presubmit script merely issues a warning. Formatting
6108 # these files is somewhat slow, so it's important not to duplicate the work.
6109 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006110 for diff_xml in GetDiffXMLs(diff_files):
6111 xml_dir = GetMetricsDir(diff_xml)
6112 if not xml_dir:
6113 continue
6114
Ilya Shermane081cbe2017-08-15 17:51:04 -07006115 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006116 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006117 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006118
6119 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6120 # command as histograms/pretty_print.py now needs a relative path argument
6121 # after splitting the histograms into multiple directories.
6122 # For example, in tools/metrics/ukm, pretty-print could be run using:
6123 # $ python pretty_print.py
6124 # But in tools/metrics/histogrmas, pretty-print should be run with an
6125 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006126 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006127 # $ python pretty_print.py enums.xml
6128
Weilun Shib92c4b72020-08-27 17:45:11 +00006129 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006130 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006131 cmd.append(diff_xml)
6132
Ilya Shermane081cbe2017-08-15 17:51:04 -07006133 if opts.dry_run or opts.diff:
6134 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006135
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006136 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6137 # `shell` param and instead replace `'vpython'` with
6138 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006139 stdout = RunCommand(cmd,
6140 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006141 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006142 if opts.diff:
6143 sys.stdout.write(stdout)
6144 if opts.dry_run and stdout:
6145 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006146
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006147 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006148
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006149
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006150def GetDiffXMLs(diff_files):
6151 return [
6152 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6153 ]
6154
6155
6156def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006157 metrics_xml_dirs = [
6158 os.path.join('tools', 'metrics', 'actions'),
6159 os.path.join('tools', 'metrics', 'histograms'),
6160 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006161 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006162 os.path.join('tools', 'metrics', 'ukm'),
6163 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006164 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006165 if diff_xml.startswith(xml_dir):
6166 return xml_dir
6167 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006168
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006169
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006170@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006171@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006172def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006173 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006174 _, args = parser.parse_args(args)
6175
6176 if len(args) != 1:
6177 parser.print_help()
6178 return 1
6179
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006180 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006181 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006182 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006183
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006184 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006185
Edward Lemur52969c92020-02-06 18:15:28 +00006186 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006187 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006188 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006189
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006190 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006191 for key, issue in [x.split() for x in output.splitlines()]:
6192 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006193 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006194
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006195 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006196 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006197 return 1
6198 if len(branches) == 1:
6199 RunGit(['checkout', branches[0]])
6200 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006201 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006202 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006203 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006204 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006205 try:
6206 RunGit(['checkout', branches[int(which)]])
6207 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006208 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006209 return 1
6210
6211 return 0
6212
6213
maruel@chromium.org29404b52014-09-08 22:58:00 +00006214def CMDlol(parser, args):
6215 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006216 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006217 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6218 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6219 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006220 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006221 return 0
6222
6223
Josip Sokcevic0399e172022-03-21 23:11:51 +00006224def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006225 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006226 print(utils.depot_tools_version())
6227
6228
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006229class OptionParser(optparse.OptionParser):
6230 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006231
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006232 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006233 optparse.OptionParser.__init__(
6234 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006235 self.add_option(
6236 '-v', '--verbose', action='count', default=0,
6237 help='Use 2 times for more debugging info')
6238
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006239 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006240 try:
6241 return self._parse_args(args)
6242 finally:
6243 # Regardless of success or failure of args parsing, we want to report
6244 # metrics, but only after logging has been initialized (if parsing
6245 # succeeded).
6246 global settings
6247 settings = Settings()
6248
Edward Lesmes9c349062021-05-06 20:02:39 +00006249 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006250 try:
6251 # GetViewVCUrl ultimately calls logging method.
6252 project_url = settings.GetViewVCUrl().strip('/+')
6253 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6254 metrics.collector.add('project_urls', [project_url])
6255 except subprocess2.CalledProcessError:
6256 # Occurs when command is not executed in a git repository
6257 # We should not fail here. If the command needs to be executed
6258 # in a repo, it will be raised later.
6259 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006260
6261 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006262 # Create an optparse.Values object that will store only the actual passed
6263 # options, without the defaults.
6264 actual_options = optparse.Values()
6265 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6266 # Create an optparse.Values object with the default options.
6267 options = optparse.Values(self.get_default_values().__dict__)
6268 # Update it with the options passed by the user.
6269 options._update_careful(actual_options.__dict__)
6270 # Store the options passed by the user in an _actual_options attribute.
6271 # We store only the keys, and not the values, since the values can contain
6272 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006273 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006274
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006275 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006276 logging.basicConfig(
6277 level=levels[min(options.verbose, len(levels) - 1)],
6278 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6279 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006280
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006281 return options, args
6282
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006283
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006284def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006285 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006286 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006287 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006288 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006289
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006290 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006291 dispatcher = subcommand.CommandDispatcher(__name__)
6292 try:
6293 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006294 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006295 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006296 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006297 if e.code != 500:
6298 raise
6299 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006300 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006301 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006302 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006303
6304
6305if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006306 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6307 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006308 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006309 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006310 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006311 sys.exit(main(sys.argv[1:]))