blob: 5cb46e77585841adaf6503a9cd235f8853bc6593 [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 Wang5051ffe2023-03-01 22:24:07 +0000165# Repo prefixes that are enrolled in the stacked changes dogfood.
166DOGFOOD_STACKED_CHANGES_REPOS = [
167 'chromium.googlesource.com/infra/',
168 'chrome-internal.googlesource.com/infra/'
169]
170
171
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000172class GitPushError(Exception):
173 pass
174
175
Christopher Lamf732cd52017-01-24 12:40:11 +1100176def DieWithError(message, change_desc=None):
177 if change_desc:
178 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000179 print('\n ** Content of CL description **\n' +
180 '='*72 + '\n' +
181 change_desc.description + '\n' +
182 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100183
vapiera7fbd5a2016-06-16 09:17:49 -0700184 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000185 sys.exit(1)
186
187
Christopher Lamf732cd52017-01-24 12:40:11 +1100188def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000189 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000190 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000191 with open(backup_path, 'wb') as backup_file:
192 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100193
194
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000195def GetNoGitPagerEnv():
196 env = os.environ.copy()
197 # 'cat' is a magical git string that disables pagers on all platforms.
198 env['GIT_PAGER'] = 'cat'
199 return env
200
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000201
bsep@chromium.org627d9002016-04-29 00:00:52 +0000202def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000203 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000204 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
205 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000206 except subprocess2.CalledProcessError as e:
207 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000208 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000209 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
210 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000211 out = e.stdout.decode('utf-8', 'replace')
212 if e.stderr:
213 out += e.stderr.decode('utf-8', 'replace')
214 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000215
216
217def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000218 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000219 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000220
221
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000222def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000223 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700224 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000225 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700226 else:
227 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000228 try:
tandrii5d48c322016-08-18 16:19:37 -0700229 (out, _), code = subprocess2.communicate(['git'] + args,
230 env=GetNoGitPagerEnv(),
231 stdout=subprocess2.PIPE,
232 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000233 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700234 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900235 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000236 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000237
238
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000239def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000240 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000241 return RunGitWithCode(args, suppress_stderr=True)[1]
242
243
tandrii2a16b952016-10-19 07:09:44 -0700244def time_sleep(seconds):
245 # Use this so that it can be mocked in tests without interfering with python
246 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700247 return time.sleep(seconds)
248
249
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000250def time_time():
251 # Use this so that it can be mocked in tests without interfering with python
252 # system machinery.
253 return time.time()
254
255
Edward Lemur1b52d872019-05-09 21:12:12 +0000256def datetime_now():
257 # Use this so that it can be mocked in tests without interfering with python
258 # system machinery.
259 return datetime.datetime.now()
260
261
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100262def confirm_or_exit(prefix='', action='confirm'):
263 """Asks user to press enter to continue or press Ctrl+C to abort."""
264 if not prefix or prefix.endswith('\n'):
265 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100266 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100267 mid = ' Press'
268 elif prefix.endswith(' '):
269 mid = 'press'
270 else:
271 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000272 gclient_utils.AskForData(
273 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100274
275
276def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000277 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000278 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100279 while True:
280 if 'yes'.startswith(result):
281 return True
282 if 'no'.startswith(result):
283 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000284 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100285
286
machenbach@chromium.org45453142015-09-15 08:45:22 +0000287def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000288 prop_list = getattr(options, 'properties', [])
289 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000290 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000291 try:
292 properties[key] = json.loads(val)
293 except ValueError:
294 pass # If a value couldn't be evaluated, treat it as a string.
295 return properties
296
297
Edward Lemur4c707a22019-09-24 21:13:43 +0000298def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000299 """Calls a buildbucket v2 method and returns the parsed json response."""
300 headers = {
301 'Accept': 'application/json',
302 'Content-Type': 'application/json',
303 }
304 request = json.dumps(request)
305 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
306
307 logging.info('POST %s with %s' % (url, request))
308
309 attempts = 1
310 time_to_sleep = 1
311 while True:
312 response, content = http.request(url, 'POST', body=request, headers=headers)
313 if response.status == 200:
314 return json.loads(content[4:])
315 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
316 msg = '%s error when calling POST %s with %s: %s' % (
317 response.status, url, request, content)
318 raise BuildbucketResponseException(msg)
319 logging.debug(
320 '%s error when calling POST %s with %s. '
321 'Sleeping for %d seconds and retrying...' % (
322 response.status, url, request, time_to_sleep))
323 time.sleep(time_to_sleep)
324 time_to_sleep *= 2
325 attempts += 1
326
327 assert False, 'unreachable'
328
329
Edward Lemur6215c792019-10-03 21:59:05 +0000330def _parse_bucket(raw_bucket):
331 legacy = True
332 project = bucket = None
333 if '/' in raw_bucket:
334 legacy = False
335 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000336 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000337 elif raw_bucket.startswith('luci.'):
338 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000339 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000340 elif '.' in raw_bucket:
341 project = raw_bucket.split('.')[0]
342 bucket = raw_bucket
343 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000344 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000345 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
346 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000347
348
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000349def _canonical_git_googlesource_host(host):
350 """Normalizes Gerrit hosts (with '-review') to Git host."""
351 assert host.endswith(_GOOGLESOURCE)
352 # Prefix doesn't include '.' at the end.
353 prefix = host[:-(1 + len(_GOOGLESOURCE))]
354 if prefix.endswith('-review'):
355 prefix = prefix[:-len('-review')]
356 return prefix + '.' + _GOOGLESOURCE
357
358
359def _canonical_gerrit_googlesource_host(host):
360 git_host = _canonical_git_googlesource_host(host)
361 prefix = git_host.split('.', 1)[0]
362 return prefix + '-review.' + _GOOGLESOURCE
363
364
365def _get_counterpart_host(host):
366 assert host.endswith(_GOOGLESOURCE)
367 git = _canonical_git_googlesource_host(host)
368 gerrit = _canonical_gerrit_googlesource_host(git)
369 return git if gerrit == host else gerrit
370
371
Quinten Yearsley777660f2020-03-04 23:37:06 +0000372def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000373 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700374
375 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000376 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000377 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700378 options: Command-line options.
379 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000380 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000381 for project, bucket, builder in jobs:
382 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000383 print('To see results here, run: git cl try-results')
384 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700385
Quinten Yearsley777660f2020-03-04 23:37:06 +0000386 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000387 if not requests:
388 return
389
Edward Lemur5b929a42019-10-21 17:57:39 +0000390 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000391 http.force_exception_to_status_code = True
392
393 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000394 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
395 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000396
397 errors = [
398 ' ' + response['error']['message']
399 for response in batch_response.get('responses', [])
400 if 'error' in response
401 ]
402 if errors:
403 raise BuildbucketResponseException(
404 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
405
406
Quinten Yearsley777660f2020-03-04 23:37:06 +0000407def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000408 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000409 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000410 shared_properties = {
411 'category': options.ensure_value('category', 'git_cl_try')
412 }
413 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000414 shared_properties['clobber'] = True
415 shared_properties.update(_get_properties_from_options(options) or {})
416
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000417 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000418 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000419 shared_tags.append({'key': 'retry_failed',
420 'value': '1'})
421
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000422 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000423 for (project, bucket, builder) in jobs:
424 properties = shared_properties.copy()
425 if 'presubmit' in builder.lower():
426 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000427
Edward Lemur45768512020-03-02 19:03:14 +0000428 requests.append({
429 'scheduleBuild': {
430 'requestId': str(uuid.uuid4()),
431 'builder': {
432 'project': getattr(options, 'project', None) or project,
433 'bucket': bucket,
434 'builder': builder,
435 },
436 'gerritChanges': gerrit_changes,
437 'properties': properties,
438 'tags': [
439 {'key': 'builder', 'value': builder},
440 ] + shared_tags,
441 }
442 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000443
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000444 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000445 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000446 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000447 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000448 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000449 'id': options.revision,
450 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000451 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000452
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000453 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000454
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000455
Quinten Yearsley777660f2020-03-04 23:37:06 +0000456def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000457 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000458
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000459 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000460 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000461 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000462 request = {
463 'predicate': {
464 'gerritChanges': [changelist.GetGerritChange(patchset)],
465 },
466 'fields': ','.join('builds.*.' + field for field in fields),
467 }
tandrii221ab252016-10-06 08:12:04 -0700468
Edward Lemur5b929a42019-10-21 17:57:39 +0000469 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000470 if authenticator.has_cached_credentials():
471 http = authenticator.authorize(httplib2.Http())
472 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700473 print('Warning: Some results might be missing because %s' %
474 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000475 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000476 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000477 http.force_exception_to_status_code = True
478
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000479 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
480 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000481
Edward Lemur45768512020-03-02 19:03:14 +0000482
Edward Lemur5b929a42019-10-21 17:57:39 +0000483def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000484 """Fetches builds from the latest patchset that has builds (within
485 the last few patchsets).
486
487 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000488 changelist (Changelist): The CL to fetch builds for
489 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000490 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
491 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000492 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000493 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
494 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000495 """
496 assert buildbucket_host
497 assert changelist.GetIssue(), 'CL must be uploaded first'
498 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000499 if latest_patchset is None:
500 assert changelist.GetMostRecentPatchset()
501 ps = changelist.GetMostRecentPatchset()
502 else:
503 assert latest_patchset > 0, latest_patchset
504 ps = latest_patchset
505
Quinten Yearsley983111f2019-09-26 17:18:48 +0000506 min_ps = max(1, ps - 5)
507 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000508 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000509 if len(builds):
510 return builds, ps
511 ps -= 1
512 return [], 0
513
514
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000515def _filter_failed_for_retry(all_builds):
516 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000517
518 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000519 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000520 i.e. a list of buildbucket.v2.Builds which includes status and builder
521 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000522
523 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000524 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000525 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000526 """
Edward Lemur45768512020-03-02 19:03:14 +0000527 grouped = {}
528 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000529 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000530 key = (builder['project'], builder['bucket'], builder['builder'])
531 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000532
Edward Lemur45768512020-03-02 19:03:14 +0000533 jobs = []
534 for (project, bucket, builder), builds in grouped.items():
535 if 'triggered' in builder:
536 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
537 'from a parent. Please schedule a manual job for the parent '
538 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000539 continue
540 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
541 # Don't retry if any are running.
542 continue
Edward Lemur45768512020-03-02 19:03:14 +0000543 # If builder had several builds, retry only if the last one failed.
544 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
545 # build, but in case of retrying failed jobs retrying a flaky one makes
546 # sense.
547 builds = sorted(builds, key=lambda b: b['createTime'])
548 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
549 continue
550 # Don't retry experimental build previously triggered by CQ.
551 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
552 for t in builds[-1]['tags']):
553 continue
554 jobs.append((project, bucket, builder))
555
556 # Sort the jobs to make testing easier.
557 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000558
559
Quinten Yearsley777660f2020-03-04 23:37:06 +0000560def _print_tryjobs(options, builds):
561 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000563 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564 return
565
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000566 longest_builder = max(len(b['builder']['builder']) for b in builds)
567 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000569 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
570 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000571
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000572 builds_by_status = {}
573 for b in builds:
574 builds_by_status.setdefault(b['status'], []).append({
575 'id': b['id'],
576 'name': name_fmt.format(
577 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
578 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000580 sort_key = lambda b: (b['name'], b['id'])
581
582 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000583 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000584 if not builds:
585 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000586
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000587 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000588 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000589 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000590 else:
591 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
592
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 print(colorize(title))
594 for b in sorted(builds, key=sort_key):
595 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000596
597 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000598 print_builds(
599 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
600 print_builds(
601 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
602 color=Fore.MAGENTA)
603 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
604 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
605 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000606 print_builds('Started:', builds_by_status.pop('STARTED', []),
607 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000608 print_builds(
609 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000610 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000611 print_builds(
612 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000613 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000614
615
Aiden Bennerc08566e2018-10-03 17:52:42 +0000616def _ComputeDiffLineRanges(files, upstream_commit):
617 """Gets the changed line ranges for each file since upstream_commit.
618
619 Parses a git diff on provided files and returns a dict that maps a file name
620 to an ordered list of range tuples in the form (start_line, count).
621 Ranges are in the same format as a git diff.
622 """
623 # If files is empty then diff_output will be a full diff.
624 if len(files) == 0:
625 return {}
626
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000627 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000628 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000629 diff_output = RunGit(diff_cmd)
630
631 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
632 # 2 capture groups
633 # 0 == fname of diff file
634 # 1 == 'diff_start,diff_count' or 'diff_start'
635 # will match each of
636 # diff --git a/foo.foo b/foo.py
637 # @@ -12,2 +14,3 @@
638 # @@ -12,2 +17 @@
639 # running re.findall on the above string with pattern will give
640 # [('foo.py', ''), ('', '14,3'), ('', '17')]
641
642 curr_file = None
643 line_diffs = {}
644 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
645 if match[0] != '':
646 # Will match the second filename in diff --git a/a.py b/b.py.
647 curr_file = match[0]
648 line_diffs[curr_file] = []
649 else:
650 # Matches +14,3
651 if ',' in match[1]:
652 diff_start, diff_count = match[1].split(',')
653 else:
654 # Single line changes are of the form +12 instead of +12,1.
655 diff_start = match[1]
656 diff_count = 1
657
658 diff_start = int(diff_start)
659 diff_count = int(diff_count)
660
661 # If diff_count == 0 this is a removal we can ignore.
662 line_diffs[curr_file].append((diff_start, diff_count))
663
664 return line_diffs
665
666
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000667def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000668 """Checks if a yapf file is in any parent directory of fpath until top_dir.
669
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000670 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000671 is found returns None. Uses yapf_config_cache as a cache for previously found
672 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000673 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000674 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000675 # Return result if we've already computed it.
676 if fpath in yapf_config_cache:
677 return yapf_config_cache[fpath]
678
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000679 parent_dir = os.path.dirname(fpath)
680 if os.path.isfile(fpath):
681 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000682 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000683 # Otherwise fpath is a directory
684 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
685 if os.path.isfile(yapf_file):
686 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000687 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000688 # If we're at the top level directory, or if we're at root
689 # there is no provided style.
690 ret = None
691 else:
692 # Otherwise recurse on the current directory.
693 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000694 yapf_config_cache[fpath] = ret
695 return ret
696
697
Brian Sheedyb4307d52019-12-02 19:18:17 +0000698def _GetYapfIgnorePatterns(top_dir):
699 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000700
701 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
702 but this functionality appears to break when explicitly passing files to
703 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000704 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000705 the .yapfignore file should be in the directory that yapf is invoked from,
706 which we assume to be the top level directory in this case.
707
708 Args:
709 top_dir: The top level directory for the repository being formatted.
710
711 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000712 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000713 """
714 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000715 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000716 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000717 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000718
Anthony Politoc64e3902021-04-30 21:55:25 +0000719 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
720 stripped_line = line.strip()
721 # Comments and blank lines should be ignored.
722 if stripped_line.startswith('#') or stripped_line == '':
723 continue
724 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000725 return ignore_patterns
726
727
728def _FilterYapfIgnoredFiles(filepaths, patterns):
729 """Filters out any filepaths that match any of the given patterns.
730
731 Args:
732 filepaths: An iterable of strings containing filepaths to filter.
733 patterns: An iterable of strings containing fnmatch patterns to filter on.
734
735 Returns:
736 A list of strings containing all the elements of |filepaths| that did not
737 match any of the patterns in |patterns|.
738 """
739 # Not inlined so that tests can use the same implementation.
740 return [f for f in filepaths
741 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000742
743
Aaron Gable13101a62018-02-09 13:20:41 -0800744def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000745 """Prints statistics about the change to the user."""
746 # --no-ext-diff is broken in some versions of Git, so try to work around
747 # this by overriding the environment (but there is still a problem if the
748 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000749 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000750 if 'GIT_EXTERNAL_DIFF' in env:
751 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000752
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000753 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800754 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000755 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000756
757
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000758class BuildbucketResponseException(Exception):
759 pass
760
761
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000762class Settings(object):
763 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000765 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000766 self.tree_status_url = None
767 self.viewvc_url = None
768 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000769 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000770 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000771 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000772 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000773 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000774 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775
Edward Lemur26964072020-02-19 19:18:51 +0000776 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000778 if self.updated:
779 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000780
Edward Lemur26964072020-02-19 19:18:51 +0000781 # The only value that actually changes the behavior is
782 # autoupdate = "false". Everything else means "true".
783 autoupdate = (
784 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
785
786 cr_settings_file = FindCodereviewSettingsFile()
787 if autoupdate != 'false' and cr_settings_file:
788 LoadCodereviewSettingsFromFile(cr_settings_file)
789 cr_settings_file.close()
790
791 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000792
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000793 @staticmethod
794 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000795 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000798 if self.root is None:
799 self.root = os.path.abspath(self.GetRelativeRoot())
800 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000801
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 def GetTreeStatusUrl(self, error_ok=False):
803 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000804 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
805 if self.tree_status_url is None and not error_ok:
806 DieWithError(
807 'You must configure your tree status URL by running '
808 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809 return self.tree_status_url
810
811 def GetViewVCUrl(self):
812 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000813 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814 return self.viewvc_url
815
rmistry@google.com90752582014-01-14 21:04:50 +0000816 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000817 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000818
rmistry@google.com5626a922015-02-26 14:03:30 +0000819 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000820 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000821 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000822 return run_post_upload_hook == "True"
823
Joanna Wangc8f23e22023-01-19 21:18:10 +0000824 def GetDefaultCCList(self):
825 return self._GetConfig('rietveld.cc')
826
Dirk Pranke6f0df682021-06-25 00:42:33 +0000827 def GetUsePython3(self):
828 return self._GetConfig('rietveld.use-python3')
829
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000830 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000831 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000832 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000833 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
834 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000835 # Default is squash now (http://crbug.com/611892#c23).
836 self.squash_gerrit_uploads = self._GetConfig(
837 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000838 return self.squash_gerrit_uploads
839
Edward Lesmes4de54132020-05-05 19:41:33 +0000840 def GetSquashGerritUploadsOverride(self):
841 """Return True or False if codereview.settings should be overridden.
842
843 Returns None if no override has been defined.
844 """
845 # See also http://crbug.com/611892#c23
846 result = self._GetConfig('gerrit.override-squash-uploads').lower()
847 if result == 'true':
848 return True
849 if result == 'false':
850 return False
851 return None
852
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000853 def GetIsGerrit(self):
854 """Return True if gerrit.host is set."""
855 if self.is_gerrit is None:
856 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
857 return self.is_gerrit
858
tandrii@chromium.org28253532016-04-14 13:46:56 +0000859 def GetGerritSkipEnsureAuthenticated(self):
860 """Return True if EnsureAuthenticated should not be done for Gerrit
861 uploads."""
862 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000863 self.gerrit_skip_ensure_authenticated = self._GetConfig(
864 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000865 return self.gerrit_skip_ensure_authenticated
866
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000867 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000868 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000869 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000870 # Git requires single quotes for paths with spaces. We need to replace
871 # them with double quotes for Windows to treat such paths as a single
872 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000873 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000874 return self.git_editor or None
875
thestig@chromium.org44202a22014-03-11 19:22:18 +0000876 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000877 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000878
879 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000880 return self._GetConfig(
881 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000882
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000883 def GetFormatFullByDefault(self):
884 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000885 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000886 result = (
887 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
888 error_ok=True).strip())
889 self.format_full_by_default = (result == 'true')
890 return self.format_full_by_default
891
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000892 def IsStatusCommitOrderByDate(self):
893 if self.is_status_commit_order_by_date is None:
894 result = (RunGit(['config', '--bool', 'cl.date-order'],
895 error_ok=True).strip())
896 self.is_status_commit_order_by_date = (result == 'true')
897 return self.is_status_commit_order_by_date
898
Edward Lemur26964072020-02-19 19:18:51 +0000899 def _GetConfig(self, key, default=''):
900 self._LazyUpdateIfNeeded()
901 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000902
903
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000904class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000905 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000906 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000907 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000908 DRY_RUN = 'dry_run'
909 COMMIT = 'commit'
910
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000911 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000912
913
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000914class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000915 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000916 self.issue = issue
917 self.patchset = patchset
918 self.hostname = hostname
919
920 @property
921 def valid(self):
922 return self.issue is not None
923
924
Edward Lemurf38bc172019-09-03 21:02:13 +0000925def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000926 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
927 fail_result = _ParsedIssueNumberArgument()
928
Edward Lemur678a6842019-10-03 22:25:05 +0000929 if isinstance(arg, int):
930 return _ParsedIssueNumberArgument(issue=arg)
931 if not isinstance(arg, basestring):
932 return fail_result
933
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000934 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000935 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700936
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000937 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000938 if not url.startswith('http'):
939 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000940 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
941 if url.startswith(short_url):
942 url = gerrit_url + url[len(short_url):]
943 break
944
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000945 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000946 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000947 except ValueError:
948 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200949
Alex Turner30ae6372022-01-04 02:32:52 +0000950 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
951 # URL.
952 if not arg.startswith('http') and '.' not in parsed_url.netloc:
953 return fail_result
954
Edward Lemur678a6842019-10-03 22:25:05 +0000955 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
956 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
957 # Short urls like https://domain/<issue_number> can be used, but don't allow
958 # specifying the patchset (you'd 404), but we allow that here.
959 if parsed_url.path == '/':
960 part = parsed_url.fragment
961 else:
962 part = parsed_url.path
963
964 match = re.match(
965 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
966 if not match:
967 return fail_result
968
969 issue = int(match.group('issue'))
970 patchset = match.group('patchset')
971 return _ParsedIssueNumberArgument(
972 issue=issue,
973 patchset=int(patchset) if patchset else None,
974 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000975
976
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000977def _create_description_from_log(args):
978 """Pulls out the commit log to use as a base for the CL description."""
979 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000980 if len(args) == 1 and args[0] == None:
981 # Handle the case where None is passed as the branch.
982 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000983 if len(args) == 1 and not args[0].endswith('.'):
984 log_args = [args[0] + '..']
985 elif len(args) == 1 and args[0].endswith('...'):
986 log_args = [args[0][:-1]]
987 elif len(args) == 2:
988 log_args = [args[0] + '..' + args[1]]
989 else:
990 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000991 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000992
993
Aaron Gablea45ee112016-11-22 15:14:38 -0800994class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700995 def __init__(self, issue, url):
996 self.issue = issue
997 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800998 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700999
1000 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001001 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001002 self.issue, self.url)
1003
1004
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001005_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001006 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001007 # TODO(tandrii): these two aren't known in Gerrit.
1008 'approval', 'disapproval'])
1009
1010
Joanna Wang6215dd02023-02-07 15:58:03 +00001011# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001012_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001013 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001014 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001015])
1016
1017
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """Changelist works with one changelist in local branch.
1020
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001021 Notes:
1022 * Not safe for concurrent multi-{thread,process} use.
1023 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001024 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001025 """
1026
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001027 def __init__(self,
1028 branchref=None,
1029 issue=None,
1030 codereview_host=None,
1031 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001032 """Create a new ChangeList instance.
1033
Edward Lemurf38bc172019-09-03 21:02:13 +00001034 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001035 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001037 global settings
1038 if not settings:
1039 # Happens when git_cl.py is used as a utility library.
1040 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001041
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001042 self.branchref = branchref
1043 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001044 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001045 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001046 else:
1047 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001048 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001049 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001050 self.lookedup_issue = False
1051 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001052 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001053 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001054 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001055 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001056 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001057 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001058 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001059
Edward Lemur125d60a2019-09-13 18:25:41 +00001060 # Lazily cached values.
1061 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1062 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001063 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001064 # Map from change number (issue) to its detail cache.
1065 self._detail_cache = {}
1066
1067 if codereview_host is not None:
1068 assert not codereview_host.startswith('https://'), codereview_host
1069 self._gerrit_host = codereview_host
1070 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001071
Edward Lesmese1576912021-02-16 21:53:34 +00001072 @property
1073 def owners_client(self):
1074 if self._owners_client is None:
1075 remote, remote_branch = self.GetRemoteBranch()
1076 branch = GetTargetRef(remote, remote_branch, None)
1077 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001078 host=self.GetGerritHost(),
1079 project=self.GetGerritProject(),
1080 branch=branch)
1081 return self._owners_client
1082
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001083 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001084 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001085
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001086 The return value is a string suitable for passing to git cl with the --cc
1087 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001088 """
1089 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001090 base_cc = settings.GetDefaultCCList()
1091 more_cc = ','.join(self.more_cc)
1092 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001093 return self.cc
1094
Daniel Cheng7227d212017-11-17 08:12:37 -08001095 def ExtendCC(self, more_cc):
1096 """Extends the list of users to cc on this CL based on the changed files."""
1097 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001099 def GetCommitDate(self):
1100 """Returns the commit date as provided in the constructor"""
1101 return self.commit_date
1102
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001104 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001106 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001107 if not branchref:
1108 return None
1109 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001110 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111 return self.branch
1112
1113 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001114 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001115 self.GetBranch() # Poke the lazy loader.
1116 return self.branchref
1117
Edward Lemur85153282020-02-14 22:06:29 +00001118 def _GitGetBranchConfigValue(self, key, default=None):
1119 return scm.GIT.GetBranchConfig(
1120 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001121
Edward Lemur85153282020-02-14 22:06:29 +00001122 def _GitSetBranchConfigValue(self, key, value):
1123 action = 'set %s to %r' % (key, value)
1124 if not value:
1125 action = 'unset %s' % key
1126 assert self.GetBranch(), 'a branch is needed to ' + action
1127 return scm.GIT.SetBranchConfig(
1128 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001129
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001130 @staticmethod
1131 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001132 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001133 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001134 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001135 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1136 settings.GetRoot(), branch)
1137 if not remote or not upstream_branch:
1138 DieWithError(
1139 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001140 'Verify this branch is set up to track another \n'
1141 '(via the --track argument to "git checkout -b ..."). \n'
1142 'or pass complete "git diff"-style arguments if supported, like\n'
1143 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144
1145 return remote, upstream_branch
1146
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001147 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001148 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001149 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001150 DieWithError('The upstream for the current branch (%s) does not exist '
1151 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001152 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001153 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001154
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001155 def GetUpstreamBranch(self):
1156 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001157 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001158 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001159 upstream_branch = upstream_branch.replace('refs/heads/',
1160 'refs/remotes/%s/' % remote)
1161 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1162 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001163 self.upstream_branch = upstream_branch
1164 return self.upstream_branch
1165
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001166 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001167 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001168 remote, branch = None, self.GetBranch()
1169 seen_branches = set()
1170 while branch not in seen_branches:
1171 seen_branches.add(branch)
1172 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001173 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 if remote != '.' or branch.startswith('refs/remotes'):
1175 break
1176 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001177 remotes = RunGit(['remote'], error_ok=True).split()
1178 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001180 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001181 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001182 logging.warning('Could not determine which remote this change is '
1183 'associated with, so defaulting to "%s".' %
1184 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001185 else:
Gavin Make6a62332020-12-04 21:57:10 +00001186 logging.warning('Could not determine which remote this change is '
1187 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001188 branch = 'HEAD'
1189 if branch.startswith('refs/remotes'):
1190 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001191 elif branch.startswith('refs/branch-heads/'):
1192 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 else:
1194 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001195 return self._remote
1196
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001197 def GetRemoteUrl(self):
1198 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1199
1200 Returns None if there is no remote.
1201 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001202 is_cached, value = self._cached_remote_url
1203 if is_cached:
1204 return value
1205
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001206 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001207 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001208
Edward Lemur298f2cf2019-02-22 21:40:39 +00001209 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001210 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001211 if host:
1212 self._cached_remote_url = (True, url)
1213 return url
1214
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001215 # If it cannot be parsed as an url, assume it is a local directory,
1216 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001217 logging.warning('"%s" doesn\'t appear to point to a git host. '
1218 'Interpreting it as a local directory.', url)
1219 if not os.path.isdir(url):
1220 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001221 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1222 'but it doesn\'t exist.',
1223 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001224 return None
1225
1226 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001227 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001228
Edward Lemur79d4f992019-11-11 23:49:02 +00001229 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001230 if not host:
1231 logging.error(
1232 'Remote "%(remote)s" for branch "%(branch)s" points to '
1233 '"%(cache_path)s", but it is misconfigured.\n'
1234 '"%(cache_path)s" must be a git repo and must have a remote named '
1235 '"%(remote)s" pointing to the git host.', {
1236 'remote': remote,
1237 'cache_path': cache_path,
1238 'branch': self.GetBranch()})
1239 return None
1240
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001241 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001242 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001243
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001244 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001245 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001246 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001247 if self.GetBranch():
1248 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001249 if self.issue is not None:
1250 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001251 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001252 return self.issue
1253
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001254 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001256 issue = self.GetIssue()
1257 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001258 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001259 server = self.GetCodereviewServer()
1260 if short:
1261 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1262 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001263
Dirk Pranke6f0df682021-06-25 00:42:33 +00001264 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001265 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001266
Edward Lemur6c6827c2020-02-06 21:15:18 +00001267 def FetchDescription(self, pretty=False):
1268 assert self.GetIssue(), 'issue is required to query Gerrit'
1269
Edward Lemur9aa1a962020-02-25 00:58:38 +00001270 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001271 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1272 current_rev = data['current_revision']
1273 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001274
1275 if not pretty:
1276 return self.description
1277
1278 # Set width to 72 columns + 2 space indent.
1279 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1280 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1281 lines = self.description.splitlines()
1282 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283
1284 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001285 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001286 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001287 if self.GetBranch():
1288 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001289 if self.patchset is not None:
1290 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001291 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292 return self.patchset
1293
Edward Lemur9aa1a962020-02-25 00:58:38 +00001294 def GetAuthor(self):
1295 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1296
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001298 """Set this branch's patchset. If patchset=0, clears the patchset."""
1299 assert self.GetBranch()
1300 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001301 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001302 else:
1303 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001304 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001305
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001306 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001307 """Set this branch's issue. If issue isn't given, clears the issue."""
1308 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001310 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001311 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001312 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001313 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001314 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001315 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001316 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001317 else:
tandrii5d48c322016-08-18 16:19:37 -07001318 # Reset all of these just to be clean.
1319 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001320 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001321 ISSUE_CONFIG_KEY,
1322 PATCHSET_CONFIG_KEY,
1323 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001324 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001325 ]
tandrii5d48c322016-08-18 16:19:37 -07001326 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001327 try:
1328 self._GitSetBranchConfigValue(prop, None)
1329 except subprocess2.CalledProcessError:
1330 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001331 msg = RunGit(['log', '-1', '--format=%B']).strip()
1332 if msg and git_footers.get_footer_change_id(msg):
1333 print('WARNING: The change patched into this branch has a Change-Id. '
1334 'Removing it.')
1335 RunGit(['commit', '--amend', '-m',
1336 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001337 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001338 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001339 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001340
Joanna Wangb46232e2023-01-21 01:58:46 +00001341 def GetAffectedFiles(self, upstream, end_commit=None):
1342 # type: (str, Optional[str]) -> Sequence[str]
1343 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001344 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001345 return [
1346 f for _, f in scm.GIT.CaptureStatus(
1347 settings.GetRoot(), upstream, end_commit=end_commit)
1348 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001349 except subprocess2.CalledProcessError:
1350 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001351 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001352 'This branch probably doesn\'t exist anymore. To reset the\n'
1353 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001354 ' git branch --set-upstream-to origin/main %s\n'
1355 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001356 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001357
dsansomee2d6fd92016-09-08 00:10:47 -07001358 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001359 assert self.GetIssue(), 'issue is required to update description'
1360
1361 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001362 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001363 if not force:
1364 confirm_or_exit(
1365 'The description cannot be modified while the issue has a pending '
1366 'unpublished edit. Either publish the edit in the Gerrit web UI '
1367 'or delete it.\n\n', action='delete the unpublished edit')
1368
1369 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001370 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001371 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001372 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001373 description, notify='NONE')
1374
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001375 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001376
Edward Lemur75526302020-02-27 22:31:05 +00001377 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001378 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001379 '--root', settings.GetRoot(),
1380 '--upstream', upstream,
1381 ]
1382
1383 args.extend(['--verbose'] * verbose)
1384
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001385 remote, remote_branch = self.GetRemoteBranch()
1386 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001387 if settings.GetIsGerrit():
1388 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1389 args.extend(['--gerrit_project', self.GetGerritProject()])
1390 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001391
Edward Lemur99df04e2020-03-05 19:39:43 +00001392 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001393 issue = self.GetIssue()
1394 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001395 if author:
1396 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001397 if issue:
1398 args.extend(['--issue', str(issue)])
1399 if patchset:
1400 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001401
Edward Lemur75526302020-02-27 22:31:05 +00001402 return args
1403
Josip Sokcevic017544d2022-03-31 23:47:53 +00001404 def RunHook(self,
1405 committing,
1406 may_prompt,
1407 verbose,
1408 parallel,
1409 upstream,
1410 description,
1411 all_files,
1412 files=None,
1413 resultdb=False,
1414 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001415 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1416 args = self._GetCommonPresubmitArgs(verbose, upstream)
1417 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001418 if may_prompt:
1419 args.append('--may_prompt')
1420 if parallel:
1421 args.append('--parallel')
1422 if all_files:
1423 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001424 if files:
1425 args.extend(files.split(';'))
1426 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001427 if files or all_files:
1428 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001429
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001430 if resultdb and not realm:
1431 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1432 # it is not required to pass the realm flag
1433 print('Note: ResultDB reporting will NOT be performed because --realm'
1434 ' was not specified. To enable ResultDB, please run the command'
1435 ' again with the --realm argument to specify the LUCI realm.')
1436
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001437 py3_results = self._RunPresubmit(args,
1438 description,
1439 use_python3=True,
1440 resultdb=resultdb,
1441 realm=realm)
1442 if py3_results.get('skipped_presubmits', 1) == 0:
1443 print('No more presubmits to run - skipping Python 2 presubmits.')
1444 return py3_results
1445
1446 py2_results = self._RunPresubmit(args,
1447 description,
1448 use_python3=False,
1449 resultdb=resultdb,
1450 realm=realm)
1451 return self._MergePresubmitResults(py2_results, py3_results)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001452
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001453 def _RunPresubmit(self,
1454 args,
1455 description,
1456 use_python3,
1457 resultdb=None,
1458 realm=None):
1459 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1460 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001461 args = args[:]
1462 vpython = 'vpython3' if use_python3 else 'vpython'
1463
Edward Lemur227d5102020-02-25 23:45:35 +00001464 with gclient_utils.temporary_file() as description_file:
1465 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001466 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001467 args.extend(['--json_output', json_output])
1468 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001469 if self.GetUsePython3():
1470 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001471 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001472 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001473 if resultdb and realm:
1474 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001475
1476 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001477 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001478
Edward Lemur227d5102020-02-25 23:45:35 +00001479 metrics.collector.add_repeated('sub_commands', {
1480 'command': 'presubmit',
1481 'execution_time': time_time() - start,
1482 'exit_code': exit_code,
1483 })
1484
1485 if exit_code:
1486 sys.exit(exit_code)
1487
1488 json_results = gclient_utils.FileRead(json_output)
1489 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001490
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001491 def _MergePresubmitResults(self, py2_results, py3_results):
1492 return {
1493 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1494 py3_results.get('more_cc', []))),
1495 'errors': (
1496 py2_results.get('errors', []) + py3_results.get('errors', [])),
1497 'notifications': (
1498 py2_results.get('notifications', []) +
1499 py3_results.get('notifications', [])),
1500 'warnings': (
1501 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1502 }
1503
Brian Sheedy7326ca22022-11-02 18:36:17 +00001504 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001505 args = self._GetCommonPresubmitArgs(verbose, upstream)
1506 args.append('--post_upload')
1507
1508 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001509 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001510 args.extend(['--description_file', description_file])
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001511 if not py3_only:
1512 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1513 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1514 ['--use-python3'])
1515 if not py3_only:
1516 p_py2.wait()
1517 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001518
Edward Lemur5a644f82020-03-18 16:44:57 +00001519 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001520 # type: (optparse.Values, Sequence[str], Sequence[str]
1521 # ) -> ChangeDescription
1522 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001523 if self.GetIssue():
1524 description = self.FetchDescription()
1525 elif options.message:
1526 description = options.message
1527 else:
1528 description = _create_description_from_log(git_diff_args)
1529 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001530 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001531
Edward Lemur5a644f82020-03-18 16:44:57 +00001532 bug = options.bug
1533 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001534 if not self.GetIssue():
1535 # Extract bug number from branch name, but only if issue is being created.
1536 # It must start with bug or fix, followed by _ or - and number.
1537 # Optionally, it may contain _ or - after number with arbitrary text.
1538 # Examples:
1539 # bug-123
1540 # bug_123
1541 # fix-123
1542 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001543 branch = self.GetBranch()
1544 if branch is not None:
1545 match = re.match(
1546 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1547 if not bug and not fixed and match:
1548 if match.group('type') == 'bug':
1549 bug = match.group('bugnum')
1550 else:
1551 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001552
1553 change_description = ChangeDescription(description, bug, fixed)
1554
Joanna Wang39811b12023-01-20 23:09:48 +00001555 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001556 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001557 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001558 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001559 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001560 missing_files = [
1561 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001562 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001563 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001564 owners = self.owners_client.SuggestOwners(
1565 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001566 assert isinstance(options.reviewers, list), options.reviewers
1567 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001568
Edward Lemur5a644f82020-03-18 16:44:57 +00001569 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001570 if options.reviewers:
1571 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001572
1573 return change_description
1574
Joanna Wanga1abbed2023-01-24 01:41:05 +00001575 def _GetTitleForUpload(self, options, multi_change_upload=False):
1576 # type: (optparse.Values, Optional[bool]) -> str
1577
1578 # Getting titles for multipl commits is not supported so we return the
1579 # default.
1580 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001581 return options.title
1582
1583 # On first upload, patchset title is always this string, while options.title
1584 # gets converted to first line of message.
1585 if not self.GetIssue():
1586 return 'Initial upload'
1587
1588 # When uploading subsequent patchsets, options.message is taken as the title
1589 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001590 if options.message:
1591 return options.message.strip()
1592
1593 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001594 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001595 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001596 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001597 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001598
1599 # Use the default title if the user confirms the default with a 'y'.
1600 if user_title.lower() == 'y':
1601 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001602 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001603
Joanna Wang562481d2023-01-26 21:57:14 +00001604 def _GetRefSpecOptions(self,
1605 options,
1606 change_desc,
1607 multi_change_upload=False,
1608 dogfood_path=False):
1609 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1610 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001611
1612 # Extra options that can be specified at push time. Doc:
1613 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1614 refspec_opts = []
1615
1616 # By default, new changes are started in WIP mode, and subsequent patchsets
1617 # don't send email. At any time, passing --send-mail or --send-email will
1618 # mark the change ready and send email for that particular patch.
1619 if options.send_mail:
1620 refspec_opts.append('ready')
1621 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001622 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001623 refspec_opts.append('wip')
1624 else:
1625 refspec_opts.append('notify=NONE')
1626
1627 # TODO(tandrii): options.message should be posted as a comment if
1628 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1629 # to do it.
1630
1631 # Set options.title in case user was prompted in _GetTitleForUpload and
1632 # _CMDUploadChange needs to be called again.
1633 options.title = self._GetTitleForUpload(
1634 options, multi_change_upload=multi_change_upload)
1635
1636 if options.title:
1637 # Punctuation and whitespace in |title| must be percent-encoded.
1638 refspec_opts.append('m=' +
1639 gerrit_util.PercentEncodeForGitRef(options.title))
1640
1641 if options.private:
1642 refspec_opts.append('private')
1643
1644 if options.topic:
1645 # Documentation on Gerrit topics is here:
1646 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1647 refspec_opts.append('topic=%s' % options.topic)
1648
1649 if options.enable_auto_submit:
1650 refspec_opts.append('l=Auto-Submit+1')
1651 if options.set_bot_commit:
1652 refspec_opts.append('l=Bot-Commit+1')
1653 if options.use_commit_queue:
1654 refspec_opts.append('l=Commit-Queue+2')
1655 elif options.cq_dry_run:
1656 refspec_opts.append('l=Commit-Queue+1')
1657 elif options.cq_quick_run:
1658 refspec_opts.append('l=Commit-Queue+1')
1659 refspec_opts.append('l=Quick-Run+1')
1660
1661 if change_desc.get_reviewers(tbr_only=True):
1662 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1663 self.GetGerritProject())
1664 refspec_opts.append('l=Code-Review+%s' % score)
1665
Joanna Wang40497912023-01-24 21:18:16 +00001666 # Gerrit sorts hashtags, so order is not important.
1667 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1668 # We check GetIssue because we only add hashtags from the
1669 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001670 # TODO(b/265929888): When we fully launch the new path:
1671 # 1) remove fetching hashtags from description alltogether
1672 # 2) Or use descrtiption hashtags for:
1673 # `not (self.GetIssue() and multi_change_upload)`
1674 # 3) Or enabled change description tags for multi and single changes
1675 # by adding them post `git push`.
1676 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001677 hashtags.update(change_desc.get_hash_tags())
1678 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001679
1680 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001681 # branch/change.
1682 return refspec_opts
1683
Joanna Wang6215dd02023-02-07 15:58:03 +00001684 def PrepareSquashedCommit(self, options, parent, end_commit=None):
1685 # type: (optparse.Values, str, Optional[str]) -> _NewUpload()
Joanna Wangb88a4342023-01-24 01:28:22 +00001686 """Create a squashed commit to upload."""
Joanna Wangb88a4342023-01-24 01:28:22 +00001687
1688 if end_commit is None:
1689 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1690
1691 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1692 end_commit)
1693 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1694 with gclient_utils.temporary_file() as desc_tempfile:
1695 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1696 commit_to_push = RunGit(
1697 ['commit-tree', latest_tree, '-p', parent, '-F',
1698 desc_tempfile]).strip()
1699
Joanna Wang7603f042023-03-01 22:17:36 +00001700 # Gerrit may or may not update fast enough to return the correct patchset
1701 # number after we push. Get the pre-upload patchset and increment later.
1702 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001703 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001704 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001705
Joanna Wang6215dd02023-02-07 15:58:03 +00001706 def PrepareCherryPickSquashedCommit(self, options, parent):
1707 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001708 """Create a commit cherry-picked on parent to push."""
1709
Joanna Wang6215dd02023-02-07 15:58:03 +00001710 # The `parent` is what we will cherry-pick on top of.
1711 # The `cherry_pick_base` is the beginning range of what
1712 # we are cherry-picking.
1713 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1714 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001715 self.branchref)
1716
1717 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1718 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1719 with gclient_utils.temporary_file() as desc_tempfile:
1720 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001721 commit_to_cp = RunGit([
1722 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1723 desc_tempfile
1724 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001725
Joanna Wang6215dd02023-02-07 15:58:03 +00001726 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001727 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1728 if ret:
1729 RunGit(['cherry-pick', '--abort'])
1730 RunGit(['checkout', '-q', self.branch])
1731 DieWithError('Could not cleanly cherry-pick')
1732
Joanna Wang6215dd02023-02-07 15:58:03 +00001733 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001734 RunGit(['checkout', '-q', self.branch])
1735
Joanna Wang7603f042023-03-01 22:17:36 +00001736 # Gerrit may or may not update fast enough to return the correct patchset
1737 # number after we push. Get the pre-upload patchset and increment later.
1738 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001739 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001740 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001741
Joanna Wangb46232e2023-01-21 01:58:46 +00001742 def _PrepareChange(self, options, parent, end_commit):
1743 # type: (optparse.Values, str, str) ->
1744 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1745 """Prepares the change to be uploaded."""
1746 self.EnsureCanUploadPatchset(options.force)
1747
1748 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1749 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1750 files)
1751
1752 watchlist = watchlists.Watchlists(settings.GetRoot())
1753 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1754 if not options.bypass_hooks:
1755 hook_results = self.RunHook(committing=False,
1756 may_prompt=not options.force,
1757 verbose=options.verbose,
1758 parallel=options.parallel,
1759 upstream=parent,
1760 description=change_desc.description,
1761 all_files=False)
1762 self.ExtendCC(hook_results['more_cc'])
1763
1764 # Update the change description and ensure we have a Change Id.
1765 if self.GetIssue():
1766 if options.edit_description:
1767 change_desc.prompt()
1768 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1769 change_id = change_detail['change_id']
1770 change_desc.ensure_change_id(change_id)
1771
Joanna Wangb46232e2023-01-21 01:58:46 +00001772 else: # No change issue. First time uploading
1773 if not options.force and not options.message_file:
1774 change_desc.prompt()
1775
1776 # Check if user added a change_id in the descripiton.
1777 change_ids = git_footers.get_footer_change_id(change_desc.description)
1778 if len(change_ids) == 1:
1779 change_id = change_ids[0]
1780 else:
1781 change_id = GenerateGerritChangeId(change_desc.description)
1782 change_desc.ensure_change_id(change_id)
1783
1784 if options.preserve_tryjobs:
1785 change_desc.set_preserve_tryjobs()
1786
1787 SaveDescriptionBackup(change_desc)
1788
1789 # Add ccs
1790 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001791 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001792 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001793 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001794 ccs = self.GetCCList().split(',')
1795 if len(ccs) > 100:
1796 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1797 'process/lsc/lsc_workflow.md')
1798 print('WARNING: This will auto-CC %s users.' % len(ccs))
1799 print('LSC may be more appropriate: %s' % lsc)
1800 print('You can also use the --no-autocc flag to disable auto-CC.')
1801 confirm_or_exit(action='continue')
1802
1803 # Add ccs from the --cc flag.
1804 if options.cc:
1805 ccs.extend(options.cc)
1806
1807 ccs = [email.strip() for email in ccs if email.strip()]
1808 if change_desc.get_cced():
1809 ccs.extend(change_desc.get_cced())
1810
1811 return change_desc.get_reviewers(), ccs, change_desc
1812
Joanna Wang40497912023-01-24 21:18:16 +00001813 def PostUploadUpdates(self, options, new_upload, change_number):
1814 # type: (optparse.Values, _NewUpload, change_number) -> None
1815 """Makes necessary post upload changes to the local and remote cl."""
1816 if not self.GetIssue():
1817 self.SetIssue(change_number)
1818
Joanna Wang7603f042023-03-01 22:17:36 +00001819 self.SetPatchset(new_upload.prev_patchset + 1)
1820
Joanna Wang40497912023-01-24 21:18:16 +00001821 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1822 new_upload.commit_to_push)
1823 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1824 new_upload.new_last_uploaded_commit)
1825
1826 if settings.GetRunPostUploadHook():
1827 self.RunPostUploadHook(options.verbose, new_upload.parent,
1828 new_upload.change_desc.description,
1829 options.no_python2_post_upload_hooks)
1830
1831 if new_upload.reviewers or new_upload.ccs:
1832 gerrit_util.AddReviewers(self.GetGerritHost(),
1833 self._GerritChangeIdentifier(),
1834 reviewers=new_upload.reviewers,
1835 ccs=new_upload.ccs,
1836 notify=bool(options.send_mail))
1837
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001838 def CMDUpload(self, options, git_diff_args, orig_args):
1839 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001840 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001841 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001842 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001843 else:
1844 if self.GetBranch() is None:
1845 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1846
1847 # Default to diffing against common ancestor of upstream branch
1848 base_branch = self.GetCommonAncestorWithUpstream()
1849 git_diff_args = [base_branch, 'HEAD']
1850
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001851 # Fast best-effort checks to abort before running potentially expensive
1852 # hooks if uploading is likely to fail anyway. Passing these checks does
1853 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001854 self.EnsureAuthenticated(force=options.force)
1855 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001856
1857 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001858 watchlist = watchlists.Watchlists(settings.GetRoot())
1859 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001860 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001861 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001862
Edward Lemur5a644f82020-03-18 16:44:57 +00001863 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001864 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001865 hook_results = self.RunHook(committing=False,
1866 may_prompt=not options.force,
1867 verbose=options.verbose,
1868 parallel=options.parallel,
1869 upstream=base_branch,
1870 description=change_desc.description,
1871 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001872 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001873
Aaron Gable13101a62018-02-09 13:20:41 -08001874 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001875 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001876 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001877 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001878 if self.GetBranch() is not None:
1879 self._GitSetBranchConfigValue(
1880 LAST_UPLOAD_HASH_CONFIG_KEY,
1881 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001882 # Run post upload hooks, if specified.
1883 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001884 self.RunPostUploadHook(options.verbose, base_branch,
1885 change_desc.description,
1886 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001887
1888 # Upload all dependencies if specified.
1889 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001890 print()
1891 print('--dependencies has been specified.')
1892 print('All dependent local branches will be re-uploaded.')
1893 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001894 # Remove the dependencies flag from args so that we do not end up in a
1895 # loop.
1896 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001897 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001898 return ret
1899
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001900 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001901 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001902
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001903 Issue must have been already uploaded and known. Optionally allows for
1904 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001905 """
1906 assert new_state in _CQState.ALL_STATES
1907 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001908 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001909 vote_map = {
1910 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001911 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001912 _CQState.DRY_RUN: 1,
1913 _CQState.COMMIT: 2,
1914 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001915 if new_state == _CQState.QUICK_RUN:
1916 labels = {
1917 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1918 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1919 }
1920 else:
1921 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001922 notify = False if new_state == _CQState.DRY_RUN else None
1923 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001924 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001925 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001926 return 0
1927 except KeyboardInterrupt:
1928 raise
1929 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001930 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001931 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001932 ' * Your project has no CQ,\n'
1933 ' * You don\'t have permission to change the CQ state,\n'
1934 ' * There\'s a bug in this code (see stack trace below).\n'
1935 'Consider specifying which bots to trigger manually or asking your '
1936 'project owners for permissions or contacting Chrome Infra at:\n'
1937 'https://www.chromium.org/infra\n\n' %
1938 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001939 # Still raise exception so that stack trace is printed.
1940 raise
1941
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001942 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001943 # Lazy load of configs.
1944 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001945 if self._gerrit_host and '.' not in self._gerrit_host:
1946 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1947 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001948 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001949 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001950 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001951 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001952 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1953 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001954 return self._gerrit_host
1955
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001956 def _GetGitHost(self):
1957 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001958 remote_url = self.GetRemoteUrl()
1959 if not remote_url:
1960 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001961 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001962
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001963 def GetCodereviewServer(self):
1964 if not self._gerrit_server:
1965 # If we're on a branch then get the server potentially associated
1966 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001967 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001968 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001969 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001970 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001971 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001972 if not self._gerrit_server:
1973 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1974 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001975 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001976 parts[0] = parts[0] + '-review'
1977 self._gerrit_host = '.'.join(parts)
1978 self._gerrit_server = 'https://%s' % self._gerrit_host
1979 return self._gerrit_server
1980
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001981 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001982 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001983 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001984 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001985 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001986 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001987 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001988 if project.endswith('.git'):
1989 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001990 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1991 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1992 # gitiles/git-over-https protocol. E.g.,
1993 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1994 # as
1995 # https://chromium.googlesource.com/v8/v8
1996 if project.startswith('a/'):
1997 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001998 return project
1999
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002000 def _GerritChangeIdentifier(self):
2001 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2002
2003 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002004 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002005 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002006 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002007 if project:
2008 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2009 # Fall back on still unique, but less efficient change number.
2010 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002011
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002012 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002013 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002014 if settings.GetGerritSkipEnsureAuthenticated():
2015 # For projects with unusual authentication schemes.
2016 # See http://crbug.com/603378.
2017 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002018
2019 # Check presence of cookies only if using cookies-based auth method.
2020 cookie_auth = gerrit_util.Authenticator.get()
2021 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002022 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002023
Florian Mayerae510e82020-01-30 21:04:48 +00002024 remote_url = self.GetRemoteUrl()
2025 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002026 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002027 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002028 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2029 logging.warning(
2030 'Ignoring branch %(branch)s with non-https/sso remote '
2031 '%(remote)s', {
2032 'branch': self.branch,
2033 'remote': self.GetRemoteUrl()
2034 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002035 return
2036
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002037 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002038 self.GetCodereviewServer()
2039 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002040 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002041
2042 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2043 git_auth = cookie_auth.get_auth_header(git_host)
2044 if gerrit_auth and git_auth:
2045 if gerrit_auth == git_auth:
2046 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002047 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002048 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002049 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002050 ' %s\n'
2051 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002052 ' Consider running the following command:\n'
2053 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002054 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002055 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002056 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002057 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002058 cookie_auth.get_new_password_message(git_host)))
2059 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002060 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002061 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002062
2063 missing = (
2064 ([] if gerrit_auth else [self._gerrit_host]) +
2065 ([] if git_auth else [git_host]))
2066 DieWithError('Credentials for the following hosts are required:\n'
2067 ' %s\n'
2068 'These are read from %s (or legacy %s)\n'
2069 '%s' % (
2070 '\n '.join(missing),
2071 cookie_auth.get_gitcookies_path(),
2072 cookie_auth.get_netrc_path(),
2073 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002074
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002075 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002076 if not self.GetIssue():
2077 return
2078
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002079 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002080 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002081 DieWithError(
2082 'Change %s has been abandoned, new uploads are not allowed' %
2083 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002084 if status == 'MERGED':
2085 answer = gclient_utils.AskForData(
2086 'Change %s has been submitted, new uploads are not allowed. '
2087 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2088 ).lower()
2089 if answer not in ('y', ''):
2090 DieWithError('New uploads are not allowed.')
2091 self.SetIssue()
2092 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002093
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002094 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2095 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2096 # Apparently this check is not very important? Otherwise get_auth_email
2097 # could have been added to other implementations of Authenticator.
2098 cookies_auth = gerrit_util.Authenticator.get()
2099 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002100 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002101
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002102 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002103 if self.GetIssueOwner() == cookies_user:
2104 return
2105 logging.debug('change %s owner is %s, cookies user is %s',
2106 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002107 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002108 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002109 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002110 if details['email'] == self.GetIssueOwner():
2111 return
2112 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002113 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002114 'as %s.\n'
2115 'Uploading may fail due to lack of permissions.' %
2116 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2117 confirm_or_exit(action='upload')
2118
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002119 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002120 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002121 or CQ status, assuming adherence to a common workflow.
2122
2123 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002124 * 'error' - error from review tool (including deleted issues)
2125 * 'unsent' - no reviewers added
2126 * 'waiting' - waiting for review
2127 * 'reply' - waiting for uploader to reply to review
2128 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002129 * 'dry-run' - dry-running in the CQ
2130 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002131 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002132 """
2133 if not self.GetIssue():
2134 return None
2135
2136 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002137 data = self._GetChangeDetail([
2138 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002139 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002140 return 'error'
2141
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002142 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002143 return 'closed'
2144
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002145 cq_label = data['labels'].get('Commit-Queue', {})
2146 max_cq_vote = 0
2147 for vote in cq_label.get('all', []):
2148 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2149 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002150 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002151 if max_cq_vote == 1:
2152 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002153
Aaron Gable9ab38c62017-04-06 14:36:33 -07002154 if data['labels'].get('Code-Review', {}).get('approved'):
2155 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002156
2157 if not data.get('reviewers', {}).get('REVIEWER', []):
2158 return 'unsent'
2159
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002160 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002161 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002162 while messages:
2163 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002164 if (m.get('tag', '').startswith('autogenerated:cq') or
2165 m.get('tag', '').startswith('autogenerated:cv')):
2166 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002167 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002168 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002169 # Most recent message was by owner.
2170 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002171
2172 # Some reply from non-owner.
2173 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002174
2175 # Somehow there are no messages even though there are reviewers.
2176 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002177
Gavin Mak4e5e3992022-11-14 22:40:12 +00002178 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002179 if not self.GetIssue():
2180 return None
2181
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002182 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002183 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002184 if update:
2185 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002186 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002187
Gavin Makf35a9eb2022-11-17 18:34:36 +00002188 def _IsPatchsetRangeSignificant(self, lower, upper):
2189 """Returns True if the inclusive range of patchsets contains any reworks or
2190 rebases."""
2191 if not self.GetIssue():
2192 return False
2193
2194 data = self._GetChangeDetail(['ALL_REVISIONS'])
2195 ps_kind = {}
2196 for rev_info in data.get('revisions', {}).values():
2197 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2198
2199 for ps in range(lower, upper + 1):
2200 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2201 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2202 return True
2203 return False
2204
Gavin Make61ccc52020-11-13 00:12:57 +00002205 def GetMostRecentDryRunPatchset(self):
2206 """Get patchsets equivalent to the most recent patchset and return
2207 the patchset with the latest dry run. If none have been dry run, return
2208 the latest patchset."""
2209 if not self.GetIssue():
2210 return None
2211
2212 data = self._GetChangeDetail(['ALL_REVISIONS'])
2213 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002214 dry_run = {int(m['_revision_number'])
2215 for m in data.get('messages', [])
2216 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002217
2218 for revision_info in sorted(data.get('revisions', {}).values(),
2219 key=lambda c: c['_number'], reverse=True):
2220 if revision_info['_number'] in dry_run:
2221 patchset = revision_info['_number']
2222 break
2223 if revision_info.get('kind', '') not in \
2224 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2225 break
2226 self.SetPatchset(patchset)
2227 return patchset
2228
Aaron Gable636b13f2017-07-14 10:42:48 -07002229 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002230 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002231 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002232 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002233
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002234 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002235 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002236 # CURRENT_REVISION is included to get the latest patchset so that
2237 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002238 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002239 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2240 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002241 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002242 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002243 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002244 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002245
2246 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002247 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002248 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002249 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002250 line_comments = file_comments.setdefault(path, [])
2251 line_comments.extend(
2252 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002253
2254 # Build dictionary of file comments for easy access and sorting later.
2255 # {author+date: {path: {patchset: {line: url+message}}}}
2256 comments = collections.defaultdict(
2257 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002258
2259 server = self.GetCodereviewServer()
2260 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2261 # /c/ is automatically added by short URL server.
2262 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2263 self.GetIssue())
2264 else:
2265 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2266
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002267 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002268 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002269 tag = comment.get('tag', '')
2270 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002271 continue
2272 key = (comment['author']['email'], comment['updated'])
2273 if comment.get('side', 'REVISION') == 'PARENT':
2274 patchset = 'Base'
2275 else:
2276 patchset = 'PS%d' % comment['patch_set']
2277 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002278 url = ('%s/%s/%s#%s%s' %
2279 (url_prefix, comment['patch_set'], path,
2280 'b' if comment.get('side') == 'PARENT' else '',
2281 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002282 comments[key][path][patchset][line] = (url, comment['message'])
2283
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002284 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002285 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002286 summary = self._BuildCommentSummary(msg, comments, readable)
2287 if summary:
2288 summaries.append(summary)
2289 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002290
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002291 @staticmethod
2292 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002293 if 'email' not in msg['author']:
2294 # Some bot accounts may not have an email associated.
2295 return None
2296
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002297 key = (msg['author']['email'], msg['date'])
2298 # Don't bother showing autogenerated messages that don't have associated
2299 # file or line comments. this will filter out most autogenerated
2300 # messages, but will keep robot comments like those from Tricium.
2301 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2302 if is_autogenerated and not comments.get(key):
2303 return None
2304 message = msg['message']
2305 # Gerrit spits out nanoseconds.
2306 assert len(msg['date'].split('.')[-1]) == 9
2307 date = datetime.datetime.strptime(msg['date'][:-3],
2308 '%Y-%m-%d %H:%M:%S.%f')
2309 if key in comments:
2310 message += '\n'
2311 for path, patchsets in sorted(comments.get(key, {}).items()):
2312 if readable:
2313 message += '\n%s' % path
2314 for patchset, lines in sorted(patchsets.items()):
2315 for line, (url, content) in sorted(lines.items()):
2316 if line:
2317 line_str = 'Line %d' % line
2318 path_str = '%s:%d:' % (path, line)
2319 else:
2320 line_str = 'File comment'
2321 path_str = '%s:0:' % path
2322 if readable:
2323 message += '\n %s, %s: %s' % (patchset, line_str, url)
2324 message += '\n %s\n' % content
2325 else:
2326 message += '\n%s ' % path_str
2327 message += '\n%s\n' % content
2328
2329 return _CommentSummary(
2330 date=date,
2331 message=message,
2332 sender=msg['author']['email'],
2333 autogenerated=is_autogenerated,
2334 # These could be inferred from the text messages and correlated with
2335 # Code-Review label maximum, however this is not reliable.
2336 # Leaving as is until the need arises.
2337 approval=False,
2338 disapproval=False,
2339 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002340
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002341 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002342 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002343 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002344
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002345 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002346 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002347 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002348
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002349 def _GetChangeDetail(self, options=None):
2350 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002351 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002352 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002353
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002354 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002355 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002356 options.append('CURRENT_COMMIT')
2357
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002358 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002359 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002360 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002361
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002362 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2363 # Assumption: data fetched before with extra options is suitable
2364 # for return for a smaller set of options.
2365 # For example, if we cached data for
2366 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2367 # and request is for options=[CURRENT_REVISION],
2368 # THEN we can return prior cached data.
2369 if options_set.issubset(cached_options_set):
2370 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002371
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002372 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002373 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002374 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002375 except gerrit_util.GerritError as e:
2376 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002377 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002378 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002379
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002380 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002381 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002382
Gavin Mak4e5e3992022-11-14 22:40:12 +00002383 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002384 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002385 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002386 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2387 self._GerritChangeIdentifier(),
2388 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002389 except gerrit_util.GerritError as e:
2390 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002391 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002392 raise
agable32978d92016-11-01 12:55:02 -07002393 return data
2394
Karen Qian40c19422019-03-13 21:28:29 +00002395 def _IsCqConfigured(self):
2396 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002397 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002398
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002399 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002400 if git_common.is_dirty_git_tree('land'):
2401 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002402
tandriid60367b2016-06-22 05:25:12 -07002403 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002404 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002405 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002406 'which can test and land changes for you. '
2407 'Are you sure you wish to bypass it?\n',
2408 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002409 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002410 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002411 # Note: git diff outputs nothing if there is no diff.
2412 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002413 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002414 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002415 if detail['current_revision'] == last_upload:
2416 differs = False
2417 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002418 print('WARNING: Local branch contents differ from latest uploaded '
2419 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002420 if differs:
2421 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002422 confirm_or_exit(
2423 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2424 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002425 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002426 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002427 upstream = self.GetCommonAncestorWithUpstream()
2428 if self.GetIssue():
2429 description = self.FetchDescription()
2430 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002431 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002432 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002433 committing=True,
2434 may_prompt=not force,
2435 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002436 parallel=parallel,
2437 upstream=upstream,
2438 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002439 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002440 resultdb=resultdb,
2441 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002442
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002443 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002444 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002445 links = self._GetChangeCommit().get('web_links', [])
2446 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002447 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002448 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002449 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002450 return 0
2451
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002452 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2453 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002454 assert parsed_issue_arg.valid
2455
Edward Lemur125d60a2019-09-13 18:25:41 +00002456 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002457
2458 if parsed_issue_arg.hostname:
2459 self._gerrit_host = parsed_issue_arg.hostname
2460 self._gerrit_server = 'https://%s' % self._gerrit_host
2461
tandriic2405f52016-10-10 08:13:15 -07002462 try:
2463 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002464 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002465 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002466
2467 if not parsed_issue_arg.patchset:
2468 # Use current revision by default.
2469 revision_info = detail['revisions'][detail['current_revision']]
2470 patchset = int(revision_info['_number'])
2471 else:
2472 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002473 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002474 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2475 break
2476 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002477 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002478 (parsed_issue_arg.patchset, self.GetIssue()))
2479
Edward Lemur125d60a2019-09-13 18:25:41 +00002480 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002481 if remote_url.endswith('.git'):
2482 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002483 remote_url = remote_url.rstrip('/')
2484
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002485 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002486 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002487
2488 if remote_url != fetch_info['url']:
2489 DieWithError('Trying to patch a change from %s but this repo appears '
2490 'to be %s.' % (fetch_info['url'], remote_url))
2491
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002492 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002493
Joanna Wangc023a632023-01-26 17:59:25 +00002494 # Set issue immediately in case the cherry-pick fails, which happens
2495 # when resolving conflicts.
2496 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002497 self.SetIssue(parsed_issue_arg.issue)
2498
Aaron Gable62619a32017-06-16 08:22:09 -07002499 if force:
2500 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2501 print('Checked out commit for change %i patchset %i locally' %
2502 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002503 elif nocommit:
2504 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2505 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002506 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002507 RunGit(['cherry-pick', 'FETCH_HEAD'])
2508 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002509 (parsed_issue_arg.issue, patchset))
2510 print('Note: this created a local commit which does not have '
2511 'the same hash as the one uploaded for review. This will make '
2512 'uploading changes based on top of this branch difficult.\n'
2513 'If you want to do that, use "git cl patch --force" instead.')
2514
Stefan Zagerd08043c2017-10-12 12:07:02 -07002515 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002516 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002517 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002518 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2519 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002520 else:
2521 print('WARNING: You are in detached HEAD state.\n'
2522 'The patch has been applied to your checkout, but you will not be '
2523 'able to upload a new patch set to the gerrit issue.\n'
2524 'Try using the \'-b\' option if you would like to work on a '
2525 'branch and/or upload a new patch set.')
2526
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002527 return 0
2528
Joanna Wang18de1f62023-01-21 01:24:24 +00002529 @staticmethod
2530 def _GerritCommitMsgHookCheck(offer_removal):
2531 # type: (bool) -> None
2532 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002533 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2534 if not os.path.exists(hook):
2535 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002536 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2537 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002538 data = gclient_utils.FileRead(hook)
2539 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2540 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002541 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002542 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002543 'and may interfere with it in subtle ways.\n'
2544 'We recommend you remove the commit-msg hook.')
2545 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002546 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002547 gclient_utils.rm_file_or_tree(hook)
2548 print('Gerrit commit-msg hook removed.')
2549 else:
2550 print('OK, will keep Gerrit commit-msg hook in place.')
2551
Edward Lemur1b52d872019-05-09 21:12:12 +00002552 def _CleanUpOldTraces(self):
2553 """Keep only the last |MAX_TRACES| traces."""
2554 try:
2555 traces = sorted([
2556 os.path.join(TRACES_DIR, f)
2557 for f in os.listdir(TRACES_DIR)
2558 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2559 and not f.startswith('tmp'))
2560 ])
2561 traces_to_delete = traces[:-MAX_TRACES]
2562 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002563 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002564 except OSError:
2565 print('WARNING: Failed to remove old git traces from\n'
2566 ' %s'
2567 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002568
Edward Lemur5737f022019-05-17 01:24:00 +00002569 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002570 """Zip and write the git push traces stored in traces_dir."""
2571 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002572 traces_zip = trace_name + '-traces'
2573 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002574 # Create a temporary dir to store git config and gitcookies in. It will be
2575 # compressed and stored next to the traces.
2576 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002577 git_info_zip = trace_name + '-git-info'
2578
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002579 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002580
Edward Lemur1b52d872019-05-09 21:12:12 +00002581 git_push_metadata['trace_name'] = trace_name
2582 gclient_utils.FileWrite(
2583 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2584
2585 # Keep only the first 6 characters of the git hashes on the packet
2586 # trace. This greatly decreases size after compression.
2587 packet_traces = os.path.join(traces_dir, 'trace-packet')
2588 if os.path.isfile(packet_traces):
2589 contents = gclient_utils.FileRead(packet_traces)
2590 gclient_utils.FileWrite(
2591 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2592 shutil.make_archive(traces_zip, 'zip', traces_dir)
2593
2594 # Collect and compress the git config and gitcookies.
2595 git_config = RunGit(['config', '-l'])
2596 gclient_utils.FileWrite(
2597 os.path.join(git_info_dir, 'git-config'),
2598 git_config)
2599
2600 cookie_auth = gerrit_util.Authenticator.get()
2601 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2602 gitcookies_path = cookie_auth.get_gitcookies_path()
2603 if os.path.isfile(gitcookies_path):
2604 gitcookies = gclient_utils.FileRead(gitcookies_path)
2605 gclient_utils.FileWrite(
2606 os.path.join(git_info_dir, 'gitcookies'),
2607 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2608 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2609
Edward Lemur1b52d872019-05-09 21:12:12 +00002610 gclient_utils.rmtree(git_info_dir)
2611
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002612 def _RunGitPushWithTraces(self,
2613 refspec,
2614 refspec_opts,
2615 git_push_metadata,
2616 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002617 """Run git push and collect the traces resulting from the execution."""
2618 # Create a temporary directory to store traces in. Traces will be compressed
2619 # and stored in a 'traces' dir inside depot_tools.
2620 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002621 trace_name = os.path.join(
2622 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002623
2624 env = os.environ.copy()
2625 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2626 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002627 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002628 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2629 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2630 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2631
2632 try:
2633 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002634 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002635 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002636 push_cmd = ['git', 'push', remote_url, refspec]
2637 if git_push_options:
2638 for opt in git_push_options:
2639 push_cmd.extend(['-o', opt])
2640
Edward Lemur0f58ae42019-04-30 17:24:12 +00002641 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002642 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002643 env=env,
2644 print_stdout=True,
2645 # Flush after every line: useful for seeing progress when running as
2646 # recipe.
2647 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002648 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002649 except subprocess2.CalledProcessError as e:
2650 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002651 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002652 raise GitPushError(
2653 'Failed to create a change, very likely due to blocked keyword. '
2654 'Please examine output above for the reason of the failure.\n'
2655 'If this is a false positive, you can try to bypass blocked '
2656 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002657 '-o banned-words~skip, e.g.:\n'
2658 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002659 'If git-cl is not working correctly, file a bug under the '
2660 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002661 if 'git push -o nokeycheck' in str(e.stdout):
2662 raise GitPushError(
2663 'Failed to create a change, very likely due to a private key being '
2664 'detected. Please examine output above for the reason of the '
2665 'failure.\n'
2666 'If this is a false positive, you can try to bypass private key '
2667 'detection by using push option '
2668 '-o nokeycheck, e.g.:\n'
2669 'git cl upload -o nokeycheck\n\n'
2670 'If git-cl is not working correctly, file a bug under the '
2671 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002672
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002673 raise GitPushError(
2674 'Failed to create a change. Please examine output above for the '
2675 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002676 'For emergencies, Googlers can escalate to '
2677 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002678 'Hint: run command below to diagnose common Git/Gerrit '
2679 'credential problems:\n'
2680 ' git cl creds-check\n'
2681 '\n'
2682 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2683 'component including the files below.\n'
2684 'Review the files before upload, since they might contain sensitive '
2685 'information.\n'
2686 'Set the Restrict-View-Google label so that they are not publicly '
2687 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002688 finally:
2689 execution_time = time_time() - before_push
2690 metrics.collector.add_repeated('sub_commands', {
2691 'command': 'git push',
2692 'execution_time': execution_time,
2693 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002694 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002695 })
2696
Edward Lemur1b52d872019-05-09 21:12:12 +00002697 git_push_metadata['execution_time'] = execution_time
2698 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002699 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002700
Edward Lemur1b52d872019-05-09 21:12:12 +00002701 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002702 gclient_utils.rmtree(traces_dir)
2703
2704 return push_stdout
2705
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002706 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2707 change_desc):
2708 """Upload the current branch to Gerrit, retry if new remote HEAD is
2709 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002710 remote, remote_branch = self.GetRemoteBranch()
2711 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2712
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002713 try:
2714 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002715 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002716 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002717 # Repository might be in the middle of transition to main branch as
2718 # default, and uploads to old default might be blocked.
2719 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002720 DieWithError(str(e), change_desc)
2721
Josip Sokcevicb631a882021-01-06 18:18:10 +00002722 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2723 self.GetGerritProject())
2724 if project_head == branch:
2725 DieWithError(str(e), change_desc)
2726 branch = project_head
2727
2728 print("WARNING: Fetching remote state and retrying upload to default "
2729 "branch...")
2730 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002731 options.edit_description = False
2732 options.force = True
2733 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002734 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2735 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002736 except GitPushError as e:
2737 DieWithError(str(e), change_desc)
2738
2739 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002740 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002741 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002742 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002743 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002744 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002745 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002746 # User requested to change description
2747 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002748 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002749 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2750 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002751 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002752
2753 # Check if changes outside of this workspace have been uploaded.
2754 current_rev = change_detail['current_revision']
2755 last_uploaded_rev = self._GitGetBranchConfigValue(
2756 GERRIT_SQUASH_HASH_CONFIG_KEY)
2757 if last_uploaded_rev and current_rev != last_uploaded_rev:
2758 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002759 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002760 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002761 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002762 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002763 if len(change_ids) == 1:
2764 change_id = change_ids[0]
2765 else:
2766 change_id = GenerateGerritChangeId(change_desc.description)
2767 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002768
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002769 if options.preserve_tryjobs:
2770 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002771
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002772 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002773 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002774 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002775 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002776 with gclient_utils.temporary_file() as desc_tempfile:
2777 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2778 ref_to_push = RunGit(
2779 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002780 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002781 if options.no_add_changeid:
2782 pass
2783 else: # adding Change-Ids is okay.
2784 if not git_footers.get_footer_change_id(change_desc.description):
2785 DownloadGerritHook(False)
2786 change_desc.set_description(
2787 self._AddChangeIdToCommitMessage(change_desc.description,
2788 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002789 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002790 # For no-squash mode, we assume the remote called "origin" is the one we
2791 # want. It is not worthwhile to support different workflows for
2792 # no-squash mode.
2793 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002794 # attempt to extract the changeid from the current description
2795 # fail informatively if not possible.
2796 change_id_candidates = git_footers.get_footer_change_id(
2797 change_desc.description)
2798 if not change_id_candidates:
2799 DieWithError("Unable to extract change-id from message.")
2800 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002801
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002802 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002803 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2804 ref_to_push)]).splitlines()
2805 if len(commits) > 1:
2806 print('WARNING: This will upload %d commits. Run the following command '
2807 'to see which commits will be uploaded: ' % len(commits))
2808 print('git log %s..%s' % (parent, ref_to_push))
2809 print('You can also use `git squash-branch` to squash these into a '
2810 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002811 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002812
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002813 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002814 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002815 # Add default, watchlist, presubmit ccs if this is the initial upload
2816 # and CL is not private and auto-ccing has not been disabled.
2817 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002818 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002819 if len(cc) > 100:
2820 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2821 'process/lsc/lsc_workflow.md')
2822 print('WARNING: This will auto-CC %s users.' % len(cc))
2823 print('LSC may be more appropriate: %s' % lsc)
2824 print('You can also use the --no-autocc flag to disable auto-CC.')
2825 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002826 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002827 if options.cc:
2828 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002829 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002830 if change_desc.get_cced():
2831 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002832 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002833 valid_accounts = set(reviewers + cc)
2834 # TODO(crbug/877717): relax this for all hosts.
2835 else:
2836 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002837 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002838 logging.info('accounts %s are recognized, %s invalid',
2839 sorted(valid_accounts),
2840 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002841
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002842 # Extra options that can be specified at push time. Doc:
2843 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002844 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002845
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002846 for r in sorted(reviewers):
2847 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002848 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002849 reviewers.remove(r)
2850 else:
2851 # TODO(tandrii): this should probably be a hard failure.
2852 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2853 % r)
2854 for c in sorted(cc):
2855 # refspec option will be rejected if cc doesn't correspond to an
2856 # account, even though REST call to add such arbitrary cc may succeed.
2857 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002858 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002859 cc.remove(c)
2860
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002861 refspec_suffix = ''
2862 if refspec_opts:
2863 refspec_suffix = '%' + ','.join(refspec_opts)
2864 assert ' ' not in refspec_suffix, (
2865 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2866 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002867
Edward Lemur1b52d872019-05-09 21:12:12 +00002868 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002869 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002870 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002871 'change_id': change_id,
2872 'description': change_desc.description,
2873 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002874
Gavin Mak4e5e3992022-11-14 22:40:12 +00002875 # Gerrit may or may not update fast enough to return the correct patchset
2876 # number after we push. Get the pre-upload patchset and increment later.
2877 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2878
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002879 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002880 git_push_metadata,
2881 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002882
2883 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002884 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002885 change_numbers = [m.group(1)
2886 for m in map(regex.match, push_stdout.splitlines())
2887 if m]
2888 if len(change_numbers) != 1:
2889 DieWithError(
2890 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002891 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002892 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002893 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002894 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002895
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002896 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002897 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002898 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002899 gerrit_util.AddReviewers(self.GetGerritHost(),
2900 self._GerritChangeIdentifier(),
2901 reviewers,
2902 cc,
2903 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002904
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002905 return 0
2906
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002907 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2908 change_desc):
2909 """Computes parent of the generated commit to be uploaded to Gerrit.
2910
2911 Returns revision or a ref name.
2912 """
2913 if custom_cl_base:
2914 # Try to avoid creating additional unintended CLs when uploading, unless
2915 # user wants to take this risk.
2916 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2917 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2918 local_ref_of_target_remote])
2919 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002920 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002921 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2922 'If you proceed with upload, more than 1 CL may be created by '
2923 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2924 'If you are certain that specified base `%s` has already been '
2925 'uploaded to Gerrit as another CL, you may proceed.\n' %
2926 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2927 if not force:
2928 confirm_or_exit(
2929 'Do you take responsibility for cleaning up potential mess '
2930 'resulting from proceeding with upload?',
2931 action='upload')
2932 return custom_cl_base
2933
Aaron Gablef97e33d2017-03-30 15:44:27 -07002934 if remote != '.':
2935 return self.GetCommonAncestorWithUpstream()
2936
2937 # If our upstream branch is local, we base our squashed commit on its
2938 # squashed version.
2939 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2940
Aaron Gablef97e33d2017-03-30 15:44:27 -07002941 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002942 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002943 if upstream_branch_name == 'main':
2944 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002945
2946 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002947 # TODO(tandrii): consider checking parent change in Gerrit and using its
2948 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2949 # the tree hash of the parent branch. The upside is less likely bogus
2950 # requests to reupload parent change just because it's uploadhash is
2951 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002952 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2953 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002954 # Verify that the upstream branch has been uploaded too, otherwise
2955 # Gerrit will create additional CLs when uploading.
2956 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2957 RunGitSilent(['rev-parse', parent + ':'])):
2958 DieWithError(
2959 '\nUpload upstream branch %s first.\n'
2960 'It is likely that this branch has been rebased since its last '
2961 'upload, so you just need to upload it again.\n'
2962 '(If you uploaded it with --no-squash, then branch dependencies '
2963 'are not supported, and you should reupload with --squash.)'
2964 % upstream_branch_name,
2965 change_desc)
2966 return parent
2967
Gavin Mak4e5e3992022-11-14 22:40:12 +00002968 def _UpdateWithExternalChanges(self):
2969 """Updates workspace with external changes.
2970
2971 Returns the commit hash that should be used as the merge base on upload.
2972 """
2973 local_ps = self.GetPatchset()
2974 if local_ps is None:
2975 return
2976
2977 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002978 if external_ps is None or local_ps == external_ps or \
2979 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002980 return
2981
2982 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002983 if num_changes > 1:
2984 change_words = 'changes were'
2985 else:
2986 change_words = 'change was'
2987 print('\n%d external %s published to %s:\n' %
2988 (num_changes, change_words, self.GetIssueURL(short=True)))
2989
2990 # Print an overview of external changes.
2991 ps_to_commit = {}
2992 ps_to_info = {}
2993 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2994 for commit_id, revision_info in revisions.get('revisions', {}).items():
2995 ps_num = revision_info['_number']
2996 ps_to_commit[ps_num] = commit_id
2997 ps_to_info[ps_num] = revision_info
2998
2999 for ps in range(external_ps, local_ps, -1):
3000 commit = ps_to_commit[ps][:8]
3001 desc = ps_to_info[ps].get('description', '')
3002 print('Patchset %d [%s] %s' % (ps, commit, desc))
3003
3004 if not ask_for_explicit_yes('\nUploading as-is will override them. '
3005 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003006 return
3007
3008 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3009 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3010 external_base = external_parent['commit']
3011
3012 branch = git_common.current_branch()
3013 local_base = self.GetCommonAncestorWithUpstream()
3014 if local_base != external_base:
3015 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3016 (local_base, external_base))
3017 if git_common.upstream(branch):
3018 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3019 'to make these the same.')
3020 print('No upstream branch set. Consider setting it and using '
3021 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3022
3023 # Fetch Gerrit's CL base if it doesn't exist locally.
3024 remote, _ = self.GetRemoteBranch()
3025 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3026 RunGitSilent(['fetch', remote, external_base])
3027
3028 # Get the diff between local_ps and external_ps.
3029 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003030 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003031 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3032 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3033 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3034 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3035 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3036
3037 # Diff can be empty in the case of trivial rebases.
3038 if not diff:
3039 return external_base
3040
3041 # Apply the diff.
3042 with gclient_utils.temporary_file() as diff_tempfile:
3043 gclient_utils.FileWrite(diff_tempfile, diff)
3044 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3045 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3046 if not clean_patch:
3047 # Normally patchset is set after upload. But because we exit, that never
3048 # happens. Updating here makes sure that subsequent uploads don't need
3049 # to fetch/apply the same diff again.
3050 self.SetPatchset(external_ps)
3051 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3052 'conflicts and reupload.')
3053
3054 message = 'Incorporate external changes from '
3055 if num_changes == 1:
3056 message += 'patchset %d' % external_ps
3057 else:
3058 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3059 RunGitSilent(['commit', '-am', message])
3060 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3061 # patchset title instead of this 'Incorporate' message.
3062 return external_base
3063
Edward Lemura12175c2020-03-09 16:58:26 +00003064 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003065 """Re-commits using the current message, assumes the commit hook is in
3066 place.
3067 """
Edward Lemura12175c2020-03-09 16:58:26 +00003068 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003069 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003070 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003071 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003072 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003073
3074 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003075
tandriie113dfd2016-10-11 10:20:12 -07003076 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003077 try:
3078 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003079 except GerritChangeNotExists:
3080 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003081
3082 if data['status'] in ('ABANDONED', 'MERGED'):
3083 return 'CL %s is closed' % self.GetIssue()
3084
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003085 def GetGerritChange(self, patchset=None):
3086 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003087 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003088 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003089 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003090 data = self._GetChangeDetail(['ALL_REVISIONS'])
3091
3092 assert host and issue and patchset, 'CL must be uploaded first'
3093
3094 has_patchset = any(
3095 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003096 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003097 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003098 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003099 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003100
tandrii8c5a3532016-11-04 07:52:02 -07003101 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003102 'host': host,
3103 'change': issue,
3104 'project': data['project'],
3105 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003106 }
tandriie113dfd2016-10-11 10:20:12 -07003107
tandriide281ae2016-10-12 06:02:30 -07003108 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003109 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003110
Edward Lemur707d70b2018-02-07 00:50:14 +01003111 def GetReviewers(self):
3112 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003113 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003114
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003115
Lei Zhang8a0efc12020-08-05 19:58:45 +00003116def _get_bug_line_values(default_project_prefix, bugs):
3117 """Given default_project_prefix and comma separated list of bugs, yields bug
3118 line values.
tandriif9aefb72016-07-01 09:06:51 -07003119
3120 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003121 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003122 * string, which is left as is.
3123
3124 This function may produce more than one line, because bugdroid expects one
3125 project per line.
3126
Lei Zhang8a0efc12020-08-05 19:58:45 +00003127 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003128 ['v8:123', 'chromium:789']
3129 """
3130 default_bugs = []
3131 others = []
3132 for bug in bugs.split(','):
3133 bug = bug.strip()
3134 if bug:
3135 try:
3136 default_bugs.append(int(bug))
3137 except ValueError:
3138 others.append(bug)
3139
3140 if default_bugs:
3141 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003142 if default_project_prefix:
3143 if not default_project_prefix.endswith(':'):
3144 default_project_prefix += ':'
3145 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003146 else:
3147 yield default_bugs
3148 for other in sorted(others):
3149 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3150 yield other
3151
3152
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003153class ChangeDescription(object):
3154 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003155 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003156 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003157 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003158 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003159 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003160 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3161 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003162 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003163 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003164
Dan Beamd8b04ca2019-10-10 21:23:26 +00003165 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003166 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003167 if bug:
3168 regexp = re.compile(self.BUG_LINE)
3169 prefix = settings.GetBugPrefix()
3170 if not any((regexp.match(line) for line in self._description_lines)):
3171 values = list(_get_bug_line_values(prefix, bug))
3172 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003173 if fixed:
3174 regexp = re.compile(self.FIXED_LINE)
3175 prefix = settings.GetBugPrefix()
3176 if not any((regexp.match(line) for line in self._description_lines)):
3177 values = list(_get_bug_line_values(prefix, fixed))
3178 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003179
agable@chromium.org42c20792013-09-12 17:34:49 +00003180 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003181 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003182 return '\n'.join(self._description_lines)
3183
3184 def set_description(self, desc):
3185 if isinstance(desc, basestring):
3186 lines = desc.splitlines()
3187 else:
3188 lines = [line.rstrip() for line in desc]
3189 while lines and not lines[0]:
3190 lines.pop(0)
3191 while lines and not lines[-1]:
3192 lines.pop(-1)
3193 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003194
Edward Lemur5a644f82020-03-18 16:44:57 +00003195 def ensure_change_id(self, change_id):
3196 description = self.description
3197 footer_change_ids = git_footers.get_footer_change_id(description)
3198 # Make sure that the Change-Id in the description matches the given one.
3199 if footer_change_ids != [change_id]:
3200 if footer_change_ids:
3201 # Remove any existing Change-Id footers since they don't match the
3202 # expected change_id footer.
3203 description = git_footers.remove_footer(description, 'Change-Id')
3204 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3205 'if you want to set a new one.')
3206 # Add the expected Change-Id footer.
3207 description = git_footers.add_footer_change_id(description, change_id)
3208 self.set_description(description)
3209
Joanna Wang39811b12023-01-20 23:09:48 +00003210 def update_reviewers(self, reviewers):
3211 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003212
3213 Args:
3214 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003215 """
Joanna Wang39811b12023-01-20 23:09:48 +00003216 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003217 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003218
3219 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003220
Joanna Wang39811b12023-01-20 23:09:48 +00003221 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003222 regexp = re.compile(self.R_LINE)
3223 matches = [regexp.match(line) for line in self._description_lines]
3224 new_desc = [l for i, l in enumerate(self._description_lines)
3225 if not matches[i]]
3226 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003227
Joanna Wang39811b12023-01-20 23:09:48 +00003228 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003229
Joanna Wang39811b12023-01-20 23:09:48 +00003230 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003231 for match in matches:
3232 if not match:
3233 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003234 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003235
Joanna Wang39811b12023-01-20 23:09:48 +00003236 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003237
3238 # Put the new lines in the description where the old first R= line was.
3239 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3240 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003241 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003242 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003243 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003244
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003245 def set_preserve_tryjobs(self):
3246 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3247 footers = git_footers.parse_footers(self.description)
3248 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3249 if v.lower() == 'true':
3250 return
3251 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3252
Anthony Polito8b955342019-09-24 19:01:36 +00003253 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003254 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003255 self.set_description([
3256 '# Enter a description of the change.',
3257 '# This will be displayed on the codereview site.',
3258 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003259 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003260 '--------------------',
3261 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003262 bug_regexp = re.compile(self.BUG_LINE)
3263 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003264 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003265 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003266
Dan Beamd8b04ca2019-10-10 21:23:26 +00003267 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003268 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003269
Bruce Dawsonfc487042020-10-27 19:11:37 +00003270 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003271 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003272 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003273 if not content:
3274 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003275 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003276
Bruce Dawson2377b012018-01-11 16:46:49 -08003277 # Strip off comments and default inserted "Bug:" line.
3278 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003279 (line.startswith('#') or
3280 line.rstrip() == "Bug:" or
3281 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003282 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003283 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003284 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003285
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003286 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003287 """Adds a footer line to the description.
3288
3289 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3290 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3291 that Gerrit footers are always at the end.
3292 """
3293 parsed_footer_line = git_footers.parse_footer(line)
3294 if parsed_footer_line:
3295 # Line is a gerrit footer in the form: Footer-Key: any value.
3296 # Thus, must be appended observing Gerrit footer rules.
3297 self.set_description(
3298 git_footers.add_footer(self.description,
3299 key=parsed_footer_line[0],
3300 value=parsed_footer_line[1]))
3301 return
3302
3303 if not self._description_lines:
3304 self._description_lines.append(line)
3305 return
3306
3307 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3308 if gerrit_footers:
3309 # git_footers.split_footers ensures that there is an empty line before
3310 # actual (gerrit) footers, if any. We have to keep it that way.
3311 assert top_lines and top_lines[-1] == ''
3312 top_lines, separator = top_lines[:-1], top_lines[-1:]
3313 else:
3314 separator = [] # No need for separator if there are no gerrit_footers.
3315
3316 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003317 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3318 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003319 top_lines.append('')
3320 top_lines.append(line)
3321 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003322
tandrii99a72f22016-08-17 14:33:24 -07003323 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003324 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003325 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003326 reviewers = [match.group(2).strip()
3327 for match in matches
3328 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003329 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003330
bradnelsond975b302016-10-23 12:20:23 -07003331 def get_cced(self):
3332 """Retrieves the list of reviewers."""
3333 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3334 cced = [match.group(2).strip() for match in matches if match]
3335 return cleanup_list(cced)
3336
Nodir Turakulov23b82142017-11-16 11:04:25 -08003337 def get_hash_tags(self):
3338 """Extracts and sanitizes a list of Gerrit hashtags."""
3339 subject = (self._description_lines or ('',))[0]
3340 subject = re.sub(
3341 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3342
3343 tags = []
3344 start = 0
3345 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3346 while True:
3347 m = bracket_exp.match(subject, start)
3348 if not m:
3349 break
3350 tags.append(self.sanitize_hash_tag(m.group(1)))
3351 start = m.end()
3352
3353 if not tags:
3354 # Try "Tag: " prefix.
3355 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3356 if m:
3357 tags.append(self.sanitize_hash_tag(m.group(1)))
3358 return tags
3359
3360 @classmethod
3361 def sanitize_hash_tag(cls, tag):
3362 """Returns a sanitized Gerrit hash tag.
3363
3364 A sanitized hashtag can be used as a git push refspec parameter value.
3365 """
3366 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3367
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003368
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003369def FindCodereviewSettingsFile(filename='codereview.settings'):
3370 """Finds the given file starting in the cwd and going up.
3371
3372 Only looks up to the top of the repository unless an
3373 'inherit-review-settings-ok' file exists in the root of the repository.
3374 """
3375 inherit_ok_file = 'inherit-review-settings-ok'
3376 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003377 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003378 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003379 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003380 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003381 if os.path.isfile(os.path.join(cwd, filename)):
3382 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003383 if cwd == root:
3384 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003385 parent_dir = os.path.dirname(cwd)
3386 if parent_dir == cwd:
3387 # We hit the system root directory.
3388 break
3389 cwd = parent_dir
3390 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003391
3392
3393def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003394 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003395 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003396
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003397 def SetProperty(name, setting, unset_error_ok=False):
3398 fullname = 'rietveld.' + name
3399 if setting in keyvals:
3400 RunGit(['config', fullname, keyvals[setting]])
3401 else:
3402 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3403
tandrii48df5812016-10-17 03:55:37 -07003404 if not keyvals.get('GERRIT_HOST', False):
3405 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003406 # Only server setting is required. Other settings can be absent.
3407 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003408 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003409 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3410 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003411 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003412 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3413 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003414 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3415 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003416 SetProperty(
3417 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003418 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003419
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003420 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003421 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003422
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003423 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003424 RunGit(['config', 'gerrit.squash-uploads',
3425 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003426
tandrii@chromium.org28253532016-04-14 13:46:56 +00003427 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003428 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003429 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3430
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003431 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003432 # should be of the form
3433 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3434 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003435 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3436 keyvals['ORIGIN_URL_CONFIG']])
3437
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003438
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003439def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003440 """Downloads a network object to a local file, like urllib.urlretrieve.
3441
3442 This is necessary because urllib is broken for SSL connections via a proxy.
3443 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003444 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003445 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003446
3447
ukai@chromium.org712d6102013-11-27 00:52:58 +00003448def hasSheBang(fname):
3449 """Checks fname is a #! script."""
3450 with open(fname) as f:
3451 return f.read(2).startswith('#!')
3452
3453
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003454def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003455 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003456
3457 Args:
3458 force: True to update hooks. False to install hooks if not present.
3459 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003460 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003461 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3462 if not os.access(dst, os.X_OK):
3463 if os.path.exists(dst):
3464 if not force:
3465 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003466 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003467 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003468 if not hasSheBang(dst):
3469 DieWithError('Not a script: %s\n'
3470 'You need to download from\n%s\n'
3471 'into .git/hooks/commit-msg and '
3472 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003473 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3474 except Exception:
3475 if os.path.exists(dst):
3476 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003477 DieWithError('\nFailed to download hooks.\n'
3478 'You need to download from\n%s\n'
3479 'into .git/hooks/commit-msg and '
3480 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003481
3482
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003483class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003484 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003485
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003486 def __init__(self):
3487 # Cached list of [host, identity, source], where source is either
3488 # .gitcookies or .netrc.
3489 self._all_hosts = None
3490
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003491 def ensure_configured_gitcookies(self):
3492 """Runs checks and suggests fixes to make git use .gitcookies from default
3493 path."""
3494 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3495 configured_path = RunGitSilent(
3496 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003497 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003498 if configured_path:
3499 self._ensure_default_gitcookies_path(configured_path, default)
3500 else:
3501 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003502
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003503 @staticmethod
3504 def _ensure_default_gitcookies_path(configured_path, default_path):
3505 assert configured_path
3506 if configured_path == default_path:
3507 print('git is already configured to use your .gitcookies from %s' %
3508 configured_path)
3509 return
3510
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003511 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003512 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3513 (configured_path, default_path))
3514
3515 if not os.path.exists(configured_path):
3516 print('However, your configured .gitcookies file is missing.')
3517 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3518 action='reconfigure')
3519 RunGit(['config', '--global', 'http.cookiefile', default_path])
3520 return
3521
3522 if os.path.exists(default_path):
3523 print('WARNING: default .gitcookies file already exists %s' %
3524 default_path)
3525 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3526 default_path)
3527
3528 confirm_or_exit('Move existing .gitcookies to default location?',
3529 action='move')
3530 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003531 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003532 print('Moved and reconfigured git to use .gitcookies from %s' %
3533 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003534
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003535 @staticmethod
3536 def _configure_gitcookies_path(default_path):
3537 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3538 if os.path.exists(netrc_path):
3539 print('You seem to be using outdated .netrc for git credentials: %s' %
3540 netrc_path)
3541 print('This tool will guide you through setting up recommended '
3542 '.gitcookies store for git credentials.\n'
3543 '\n'
3544 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3545 ' git config --global --unset http.cookiefile\n'
3546 ' mv %s %s.backup\n\n' % (default_path, default_path))
3547 confirm_or_exit(action='setup .gitcookies')
3548 RunGit(['config', '--global', 'http.cookiefile', default_path])
3549 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003550
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003551 def get_hosts_with_creds(self, include_netrc=False):
3552 if self._all_hosts is None:
3553 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003554 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3555 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3556 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3557 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003558
3559 if include_netrc:
3560 return self._all_hosts
3561 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3562
3563 def print_current_creds(self, include_netrc=False):
3564 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3565 if not hosts:
3566 print('No Git/Gerrit credentials found')
3567 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003568 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003569 header = [('Host', 'User', 'Which file'),
3570 ['=' * l for l in lengths]]
3571 for row in (header + hosts):
3572 print('\t'.join((('%%+%ds' % l) % s)
3573 for l, s in zip(lengths, row)))
3574
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003575 @staticmethod
3576 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003577 """Parses identity "git-<username>.domain" into <username> and domain."""
3578 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003579 # distinguishable from sub-domains. But we do know typical domains:
3580 if identity.endswith('.chromium.org'):
3581 domain = 'chromium.org'
3582 username = identity[:-len('.chromium.org')]
3583 else:
3584 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003585 if username.startswith('git-'):
3586 username = username[len('git-'):]
3587 return username, domain
3588
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003589 def has_generic_host(self):
3590 """Returns whether generic .googlesource.com has been configured.
3591
3592 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3593 """
3594 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003595 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003596 return True
3597 return False
3598
3599 def _get_git_gerrit_identity_pairs(self):
3600 """Returns map from canonic host to pair of identities (Git, Gerrit).
3601
3602 One of identities might be None, meaning not configured.
3603 """
3604 host_to_identity_pairs = {}
3605 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003606 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003607 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3608 idx = 0 if canonical == host else 1
3609 pair[idx] = identity
3610 return host_to_identity_pairs
3611
3612 def get_partially_configured_hosts(self):
3613 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003614 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003615 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003616 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003617
3618 def get_conflicting_hosts(self):
3619 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003620 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003621 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003622 if None not in (i1, i2) and i1 != i2)
3623
3624 def get_duplicated_hosts(self):
3625 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003626 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003627
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003628
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003629 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003630 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003631 hosts = sorted(hosts)
3632 assert hosts
3633 if extra_column_func is None:
3634 extras = [''] * len(hosts)
3635 else:
3636 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003637 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3638 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003639 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003640 lines.append(tmpl % he)
3641 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003642
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003643 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003644 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003645 yield ('.googlesource.com wildcard record detected',
3646 ['Chrome Infrastructure team recommends to list full host names '
3647 'explicitly.'],
3648 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003649
3650 dups = self.get_duplicated_hosts()
3651 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003652 yield ('The following hosts were defined twice',
3653 self._format_hosts(dups),
3654 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003655
3656 partial = self.get_partially_configured_hosts()
3657 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003658 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3659 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003660 self._format_hosts(
3661 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3662 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003663
3664 conflicting = self.get_conflicting_hosts()
3665 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003666 yield ('The following Git hosts have differing credentials from their '
3667 'Gerrit counterparts',
3668 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3669 tuple(self._get_git_gerrit_identity_pairs()[host])),
3670 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003671
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003672 def find_and_report_problems(self):
3673 """Returns True if there was at least one problem, else False."""
3674 found = False
3675 bad_hosts = set()
3676 for title, sublines, hosts in self._find_problems():
3677 if not found:
3678 found = True
3679 print('\n\n.gitcookies problem report:\n')
3680 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003681 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003682 if sublines:
3683 print()
3684 print(' %s' % '\n '.join(sublines))
3685 print()
3686
3687 if bad_hosts:
3688 assert found
3689 print(' You can manually remove corresponding lines in your %s file and '
3690 'visit the following URLs with correct account to generate '
3691 'correct credential lines:\n' %
3692 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003693 print(' %s' % '\n '.join(
3694 sorted(
3695 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3696 _canonical_git_googlesource_host(host))
3697 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003698 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003699
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003700
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003701@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003702def CMDcreds_check(parser, args):
3703 """Checks credentials and suggests changes."""
3704 _, _ = parser.parse_args(args)
3705
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003706 # Code below checks .gitcookies. Abort if using something else.
3707 authn = gerrit_util.Authenticator.get()
3708 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003709 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003710 'This command is not designed for bot environment. It checks '
3711 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003712 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3713 if isinstance(authn, gerrit_util.GceAuthenticator):
3714 message += (
3715 '\n'
3716 'If you need to run this on GCE or a cloudtop instance, '
3717 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3718 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003719
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003720 checker = _GitCookiesChecker()
3721 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003722
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003723 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003724 checker.print_current_creds(include_netrc=True)
3725
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003726 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003727 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003728 return 0
3729 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003730
3731
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003732@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003733def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003734 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003735 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003736 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003737 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003738 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003739 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003740 return RunGit(['config', 'branch.%s.base-url' % branch],
3741 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003742
3743 print('Setting base-url to %s' % args[0])
3744 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3745 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003746
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003747
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003748def color_for_status(status):
3749 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003750 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003751 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003752 'unsent': BOLD + Fore.YELLOW,
3753 'waiting': BOLD + Fore.RED,
3754 'reply': BOLD + Fore.YELLOW,
3755 'not lgtm': BOLD + Fore.RED,
3756 'lgtm': BOLD + Fore.GREEN,
3757 'commit': BOLD + Fore.MAGENTA,
3758 'closed': BOLD + Fore.CYAN,
3759 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003760 }.get(status, Fore.WHITE)
3761
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003762
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003763def get_cl_statuses(changes, fine_grained, max_processes=None):
3764 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003765
3766 If fine_grained is true, this will fetch CL statuses from the server.
3767 Otherwise, simply indicate if there's a matching url for the given branches.
3768
3769 If max_processes is specified, it is used as the maximum number of processes
3770 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3771 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003772
3773 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003774 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003775 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003776 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003777
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003778 if not fine_grained:
3779 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003780 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003781 for cl in changes:
3782 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003783 return
3784
3785 # First, sort out authentication issues.
3786 logging.debug('ensuring credentials exist')
3787 for cl in changes:
3788 cl.EnsureAuthenticated(force=False, refresh=True)
3789
3790 def fetch(cl):
3791 try:
3792 return (cl, cl.GetStatus())
3793 except:
3794 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003795 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003796 raise
3797
3798 threads_count = len(changes)
3799 if max_processes:
3800 threads_count = max(1, min(threads_count, max_processes))
3801 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3802
Edward Lemur61bf4172020-02-24 23:22:37 +00003803 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003804 fetched_cls = set()
3805 try:
3806 it = pool.imap_unordered(fetch, changes).__iter__()
3807 while True:
3808 try:
3809 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003810 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003811 break
3812 fetched_cls.add(cl)
3813 yield cl, status
3814 finally:
3815 pool.close()
3816
3817 # Add any branches that failed to fetch.
3818 for cl in set(changes) - fetched_cls:
3819 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003820
rmistry@google.com2dd99862015-06-22 12:22:18 +00003821
Jose Lopes3863fc52020-04-07 17:00:25 +00003822def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003823 """Uploads CLs of local branches that are dependents of the current branch.
3824
3825 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003826
3827 test1 -> test2.1 -> test3.1
3828 -> test3.2
3829 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003830
3831 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3832 run on the dependent branches in this order:
3833 test2.1, test3.1, test3.2, test2.2, test3.3
3834
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003835 Note: This function does not rebase your local dependent branches. Use it
3836 when you make a change to the parent branch that will not conflict
3837 with its dependent branches, and you would like their dependencies
3838 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003839 """
3840 if git_common.is_dirty_git_tree('upload-branch-deps'):
3841 return 1
3842
3843 root_branch = cl.GetBranch()
3844 if root_branch is None:
3845 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3846 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003847 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003848 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3849 'patchset dependencies without an uploaded CL.')
3850
3851 branches = RunGit(['for-each-ref',
3852 '--format=%(refname:short) %(upstream:short)',
3853 'refs/heads'])
3854 if not branches:
3855 print('No local branches found.')
3856 return 0
3857
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003858 # Create a dictionary of all local branches to the branches that are
3859 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003860 tracked_to_dependents = collections.defaultdict(list)
3861 for b in branches.splitlines():
3862 tokens = b.split()
3863 if len(tokens) == 2:
3864 branch_name, tracked = tokens
3865 tracked_to_dependents[tracked].append(branch_name)
3866
vapiera7fbd5a2016-06-16 09:17:49 -07003867 print()
3868 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003869 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003870
rmistry@google.com2dd99862015-06-22 12:22:18 +00003871 def traverse_dependents_preorder(branch, padding=''):
3872 dependents_to_process = tracked_to_dependents.get(branch, [])
3873 padding += ' '
3874 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003875 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003876 dependents.append(dependent)
3877 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003878
rmistry@google.com2dd99862015-06-22 12:22:18 +00003879 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003880 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003881
3882 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003883 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003884 return 0
3885
rmistry@google.com2dd99862015-06-22 12:22:18 +00003886 # Record all dependents that failed to upload.
3887 failures = {}
3888 # Go through all dependents, checkout the branch and upload.
3889 try:
3890 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003891 print()
3892 print('--------------------------------------')
3893 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003894 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003895 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003896 try:
3897 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003898 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003899 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003900 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003901 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003902 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003903 finally:
3904 # Swap back to the original root branch.
3905 RunGit(['checkout', '-q', root_branch])
3906
vapiera7fbd5a2016-06-16 09:17:49 -07003907 print()
3908 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003909 for dependent_branch in dependents:
3910 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003911 print(' %s : %s' % (dependent_branch, upload_status))
3912 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003913
3914 return 0
3915
3916
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003917def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003918 """Given a proposed tag name, returns a tag name that is guaranteed to be
3919 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3920 or 'foo-3', and so on."""
3921
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003922 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003923 for suffix_num in itertools.count(1):
3924 if suffix_num == 1:
3925 to_check = proposed_tag
3926 else:
3927 to_check = '%s-%d' % (proposed_tag, suffix_num)
3928
3929 if to_check not in existing_tags:
3930 return to_check
3931
3932
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003933@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003934def CMDarchive(parser, args):
3935 """Archives and deletes branches associated with closed changelists."""
3936 parser.add_option(
3937 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003938 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003939 parser.add_option(
3940 '-f', '--force', action='store_true',
3941 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003942 parser.add_option(
3943 '-d', '--dry-run', action='store_true',
3944 help='Skip the branch tagging and removal steps.')
3945 parser.add_option(
3946 '-t', '--notags', action='store_true',
3947 help='Do not tag archived branches. '
3948 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003949 parser.add_option(
3950 '-p',
3951 '--pattern',
3952 default='git-cl-archived-{issue}-{branch}',
3953 help='Format string for archive tags. '
3954 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003955
kmarshall3bff56b2016-06-06 18:31:47 -07003956 options, args = parser.parse_args(args)
3957 if args:
3958 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003959
3960 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3961 if not branches:
3962 return 0
3963
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003964 tags = RunGit(['for-each-ref', '--format=%(refname)',
3965 'refs/tags']).splitlines() or []
3966 tags = [t.split('/')[-1] for t in tags]
3967
vapiera7fbd5a2016-06-16 09:17:49 -07003968 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003969 changes = [Changelist(branchref=b)
3970 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003971 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3972 statuses = get_cl_statuses(changes,
3973 fine_grained=True,
3974 max_processes=options.maxjobs)
3975 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003976 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3977 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003978 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003979 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003980 proposal.sort()
3981
3982 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003983 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003984 return 0
3985
Edward Lemur85153282020-02-14 22:06:29 +00003986 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003987
vapiera7fbd5a2016-06-16 09:17:49 -07003988 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003989 if options.notags:
3990 for next_item in proposal:
3991 print(' ' + next_item[0])
3992 else:
3993 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3994 for next_item in proposal:
3995 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003996
kmarshall9249e012016-08-23 12:02:16 -07003997 # Quit now on precondition failure or if instructed by the user, either
3998 # via an interactive prompt or by command line flags.
3999 if options.dry_run:
4000 print('\nNo changes were made (dry run).\n')
4001 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004002
4003 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004004 print('You are currently on a branch \'%s\' which is associated with a '
4005 'closed codereview issue, so archive cannot proceed. Please '
4006 'checkout another branch and run this command again.' %
4007 current_branch)
4008 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004009
4010 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004011 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004012 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004013 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004014 return 1
4015
4016 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004017 if not options.notags:
4018 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004019
4020 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4021 # Clean up the tag if we failed to delete the branch.
4022 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004023
vapiera7fbd5a2016-06-16 09:17:49 -07004024 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004025
4026 return 0
4027
4028
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004029@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004030def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004031 """Show status of changelists.
4032
4033 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004034 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004035 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004036 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004037 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004038 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004039 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004040 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004041
4042 Also see 'git cl comments'.
4043 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004044 parser.add_option(
4045 '--no-branch-color',
4046 action='store_true',
4047 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004048 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004049 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004050 parser.add_option('-f', '--fast', action='store_true',
4051 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004052 parser.add_option(
4053 '-j', '--maxjobs', action='store', type=int,
4054 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004055 parser.add_option(
4056 '-i', '--issue', type=int,
4057 help='Operate on this issue instead of the current branch\'s implicit '
4058 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004059 parser.add_option('-d',
4060 '--date-order',
4061 action='store_true',
4062 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004063 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004064 if args:
4065 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004066
iannuccie53c9352016-08-17 14:40:40 -07004067 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004068 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004069
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004070 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004071 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004072 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004073 if cl.GetIssue():
4074 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004075 elif options.field == 'id':
4076 issueid = cl.GetIssue()
4077 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004078 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004079 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004080 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004081 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004082 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004083 elif options.field == 'status':
4084 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004085 elif options.field == 'url':
4086 url = cl.GetIssueURL()
4087 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004088 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004089 return 0
4090
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004091 branches = RunGit([
4092 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4093 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004094 if not branches:
4095 print('No local branch found.')
4096 return 0
4097
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004098 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004099 Changelist(branchref=b, commit_date=ct)
4100 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4101 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004102 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004103 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004104 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004105 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004106
Edward Lemur85153282020-02-14 22:06:29 +00004107 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004108
4109 def FormatBranchName(branch, colorize=False):
4110 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4111 an asterisk when it is the current branch."""
4112
4113 asterisk = ""
4114 color = Fore.RESET
4115 if branch == current_branch:
4116 asterisk = "* "
4117 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004118 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004119
4120 if colorize:
4121 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004122 return asterisk + branch_name
4123
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004124 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004125
4126 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004127
4128 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004129 sorted_changes = sorted(changes,
4130 key=lambda c: c.GetCommitDate(),
4131 reverse=True)
4132 else:
4133 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4134 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004135 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004136 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004137 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004138 branch_statuses[c.GetBranch()] = status
4139 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004140 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004141 if url and (not status or status == 'error'):
4142 # The issue probably doesn't exist anymore.
4143 url += ' (broken)'
4144
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004145 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004146 # Turn off bold as well as colors.
4147 END = '\033[0m'
4148 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004149 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004150 color = ''
4151 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004152 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004153
Alan Cuttera3be9a52019-03-04 18:50:33 +00004154 branch_display = FormatBranchName(branch)
4155 padding = ' ' * (alignment - len(branch_display))
4156 if not options.no_branch_color:
4157 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004158
Alan Cuttera3be9a52019-03-04 18:50:33 +00004159 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4160 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004161
vapiera7fbd5a2016-06-16 09:17:49 -07004162 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004163 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004164 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004165 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004166 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004167 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004168 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004169 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004170 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004171 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004172 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004173 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004174 return 0
4175
4176
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004177def colorize_CMDstatus_doc():
4178 """To be called once in main() to add colors to git cl status help."""
4179 colors = [i for i in dir(Fore) if i[0].isupper()]
4180
4181 def colorize_line(line):
4182 for color in colors:
4183 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004184 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004185 indent = len(line) - len(line.lstrip(' ')) + 1
4186 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4187 return line
4188
4189 lines = CMDstatus.__doc__.splitlines()
4190 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4191
4192
phajdan.jre328cf92016-08-22 04:12:17 -07004193def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004194 if path == '-':
4195 json.dump(contents, sys.stdout)
4196 else:
4197 with open(path, 'w') as f:
4198 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004199
4200
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004201@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004202@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004203def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004204 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004205
4206 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004207 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004208 parser.add_option('-r', '--reverse', action='store_true',
4209 help='Lookup the branch(es) for the specified issues. If '
4210 'no issues are specified, all branches with mapped '
4211 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004212 parser.add_option('--json',
4213 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004214 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004215
dnj@chromium.org406c4402015-03-03 17:22:28 +00004216 if options.reverse:
4217 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004218 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004219 # Reverse issue lookup.
4220 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004221
4222 git_config = {}
4223 for config in RunGit(['config', '--get-regexp',
4224 r'branch\..*issue']).splitlines():
4225 name, _space, val = config.partition(' ')
4226 git_config[name] = val
4227
dnj@chromium.org406c4402015-03-03 17:22:28 +00004228 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004229 issue = git_config.get(
4230 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004231 if issue:
4232 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004233 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004234 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004235 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004236 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004237 try:
4238 issue_num = int(issue)
4239 except ValueError:
4240 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004241 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004242 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004243 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004244 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004245 if options.json:
4246 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004247 return 0
4248
4249 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004250 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004251 if not issue.valid:
4252 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4253 'or no argument to list it.\n'
4254 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004255 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004256 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004257 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004258 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004259 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4260 if options.json:
4261 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004262 'gerrit_host': cl.GetGerritHost(),
4263 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004264 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004265 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004266 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004267 return 0
4268
4269
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004270@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004271def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004272 """Shows or posts review comments for any changelist."""
4273 parser.add_option('-a', '--add-comment', dest='comment',
4274 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004275 parser.add_option('-p', '--publish', action='store_true',
4276 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004277 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004278 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004279 parser.add_option('-m', '--machine-readable', dest='readable',
4280 action='store_false', default=True,
4281 help='output comments in a format compatible with '
4282 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004283 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004284 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004285 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004286
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004287 issue = None
4288 if options.issue:
4289 try:
4290 issue = int(options.issue)
4291 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004292 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004293
Edward Lemur934836a2019-09-09 20:16:54 +00004294 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004295
4296 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004297 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004298 return 0
4299
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004300 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4301 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004302 for comment in summary:
4303 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004304 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004305 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004306 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004307 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004308 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004309 elif comment.autogenerated:
4310 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004311 else:
4312 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004313 print('\n%s%s %s%s\n%s' % (
4314 color,
4315 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4316 comment.sender,
4317 Fore.RESET,
4318 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4319
smut@google.comc85ac942015-09-15 16:34:43 +00004320 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004321 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004322 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004323 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4324 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004325 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004326 return 0
4327
4328
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004329@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004330@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004331def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004332 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004333 parser.add_option('-d', '--display', action='store_true',
4334 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004335 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004336 help='New description to set for this issue (- for stdin, '
4337 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004338 parser.add_option('-f', '--force', action='store_true',
4339 help='Delete any unpublished Gerrit edits for this issue '
4340 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004341
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004342 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004343
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004344 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004345 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004346 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004347 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004348 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004349
Edward Lemur934836a2019-09-09 20:16:54 +00004350 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004351 if target_issue_arg:
4352 kwargs['issue'] = target_issue_arg.issue
4353 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004354
4355 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004356 if not cl.GetIssue():
4357 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004358
Edward Lemur678a6842019-10-03 22:25:05 +00004359 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004360 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004361
Edward Lemur6c6827c2020-02-06 21:15:18 +00004362 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004363
smut@google.com34fb6b12015-07-13 20:03:26 +00004364 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004365 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004366 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004367
4368 if options.new_description:
4369 text = options.new_description
4370 if text == '-':
4371 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004372 elif text == '+':
4373 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004374 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004375
4376 description.set_description(text)
4377 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004378 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004379 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004380 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004381 return 0
4382
4383
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004384@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004385def CMDlint(parser, args):
4386 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004387 parser.add_option('--filter', action='append', metavar='-x,+y',
4388 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004389 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004390
4391 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004392 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004393 try:
4394 import cpplint
4395 import cpplint_chromium
4396 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004397 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004398 return 1
4399
4400 # Change the current working directory before calling lint so that it
4401 # shows the correct base.
4402 previous_cwd = os.getcwd()
4403 os.chdir(settings.GetRoot())
4404 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004405 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004406 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004407 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004408 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004409 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004410
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004411 # Process cpplint arguments, if any.
4412 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4413 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004414 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004415
Lei Zhang379d1ad2020-07-15 19:40:06 +00004416 include_regex = re.compile(settings.GetLintRegex())
4417 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004418 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4419 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004420 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004421 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004422 continue
4423
4424 if ignore_regex.match(filename):
4425 print('Ignoring file %s' % filename)
4426 continue
4427
4428 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4429 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004430 finally:
4431 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004432 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004433 if cpplint._cpplint_state.error_count != 0:
4434 return 1
4435 return 0
4436
4437
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004438@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004439def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004440 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004441 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004442 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004443 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004444 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004445 parser.add_option('--all', action='store_true',
4446 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004447 parser.add_option('--files',
4448 nargs=1,
4449 help='Semicolon-separated list of files to be marked as '
4450 'modified when executing presubmit or post-upload hooks. '
4451 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004452 parser.add_option('--parallel', action='store_true',
4453 help='Run all tests specified by input_api.RunTests in all '
4454 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004455 parser.add_option('--resultdb', action='store_true',
4456 help='Run presubmit checks in the ResultSink environment '
4457 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004458 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004459 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004460
sbc@chromium.org71437c02015-04-09 19:29:40 +00004461 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004462 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004463 return 1
4464
Edward Lemur934836a2019-09-09 20:16:54 +00004465 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004466 if args:
4467 base_branch = args[0]
4468 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004469 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004470 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004471
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004472 start = time.time()
4473 try:
4474 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4475 description = cl.FetchDescription()
4476 else:
4477 description = _create_description_from_log([base_branch])
4478 except Exception as e:
4479 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004480 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004481 elapsed = time.time() - start
4482 if elapsed > 5:
4483 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004484
Bruce Dawson13acea32022-05-03 22:13:08 +00004485 if not base_branch:
4486 if not options.force:
4487 print('use --force to check even when not on a branch.')
4488 return 1
4489 base_branch = 'HEAD'
4490
Josip Sokcevic017544d2022-03-31 23:47:53 +00004491 cl.RunHook(committing=not options.upload,
4492 may_prompt=False,
4493 verbose=options.verbose,
4494 parallel=options.parallel,
4495 upstream=base_branch,
4496 description=description,
4497 all_files=options.all,
4498 files=options.files,
4499 resultdb=options.resultdb,
4500 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004501 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004502
4503
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004504def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004505 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004506
4507 Works the same way as
4508 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4509 but can be called on demand on all platforms.
4510
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004511 The basic idea is to generate git hash of a state of the tree, original
4512 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004513 """
4514 lines = []
4515 tree_hash = RunGitSilent(['write-tree'])
4516 lines.append('tree %s' % tree_hash.strip())
4517 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4518 if code == 0:
4519 lines.append('parent %s' % parent.strip())
4520 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4521 lines.append('author %s' % author.strip())
4522 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4523 lines.append('committer %s' % committer.strip())
4524 lines.append('')
4525 # Note: Gerrit's commit-hook actually cleans message of some lines and
4526 # whitespace. This code is not doing this, but it clearly won't decrease
4527 # entropy.
4528 lines.append(message)
4529 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004530 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004531 return 'I%s' % change_hash.strip()
4532
4533
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004534def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004535 """Computes the remote branch ref to use for the CL.
4536
4537 Args:
4538 remote (str): The git remote for the CL.
4539 remote_branch (str): The git remote branch for the CL.
4540 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004541 """
4542 if not (remote and remote_branch):
4543 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004544
wittman@chromium.org455dc922015-01-26 20:15:50 +00004545 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004546 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004547 # refs, which are then translated into the remote full symbolic refs
4548 # below.
4549 if '/' not in target_branch:
4550 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4551 else:
4552 prefix_replacements = (
4553 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4554 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4555 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4556 )
4557 match = None
4558 for regex, replacement in prefix_replacements:
4559 match = re.search(regex, target_branch)
4560 if match:
4561 remote_branch = target_branch.replace(match.group(0), replacement)
4562 break
4563 if not match:
4564 # This is a branch path but not one we recognize; use as-is.
4565 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004566 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004567 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004568 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004569 # Handle the refs that need to land in different refs.
4570 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004571
wittman@chromium.org455dc922015-01-26 20:15:50 +00004572 # Create the true path to the remote branch.
4573 # Does the following translation:
4574 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004575 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004576 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4577 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4578 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4579 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4580 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4581 'refs/heads/')
4582 elif remote_branch.startswith('refs/remotes/branch-heads'):
4583 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004584
wittman@chromium.org455dc922015-01-26 20:15:50 +00004585 return remote_branch
4586
4587
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004588def cleanup_list(l):
4589 """Fixes a list so that comma separated items are put as individual items.
4590
4591 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4592 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4593 """
4594 items = sum((i.split(',') for i in l), [])
4595 stripped_items = (i.strip() for i in items)
4596 return sorted(filter(None, stripped_items))
4597
4598
Aaron Gable4db38df2017-11-03 14:59:07 -07004599@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004600@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004601def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004602 """Uploads the current changelist to codereview.
4603
4604 Can skip dependency patchset uploads for a branch by running:
4605 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004606 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004607 git config --unset branch.branch_name.skip-deps-uploads
4608 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004609
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004610 If the name of the checked out branch starts with "bug-" or "fix-" followed
4611 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004612 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004613
4614 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004615 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004616 [git-cl] add support for hashtags
4617 Foo bar: implement foo
4618 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004619 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004620 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4621 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004622 parser.add_option('--bypass-watchlists', action='store_true',
4623 dest='bypass_watchlists',
4624 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004625 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004626 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004627 parser.add_option('--message', '-m', dest='message',
4628 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004629 parser.add_option('-b', '--bug',
4630 help='pre-populate the bug number(s) for this issue. '
4631 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004632 parser.add_option('--message-file', dest='message_file',
4633 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004634 parser.add_option('--title', '-t', dest='title',
4635 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004636 parser.add_option('-T', '--skip-title', action='store_true',
4637 dest='skip_title',
4638 help='Use the most recent commit message as the title of '
4639 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004640 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004641 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004642 help='reviewer email addresses')
4643 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004644 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004645 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004646 parser.add_option('--hashtag', dest='hashtags',
4647 action='append', default=[],
4648 help=('Gerrit hashtag for new CL; '
4649 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004650 parser.add_option('-s',
4651 '--send-mail',
4652 '--send-email',
4653 dest='send_mail',
4654 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004655 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004656 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004657 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004658 metavar='TARGET',
4659 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004660 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004661 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004662 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004663 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004664 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004665 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004666 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004667 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4668 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004669 parser.add_option('-c',
4670 '--use-commit-queue',
4671 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004672 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004673 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004674 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004675 parser.add_option('-d', '--cq-dry-run',
4676 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004677 help='Send the patchset to do a CQ dry run right after '
4678 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004679 parser.add_option(
4680 '-q',
4681 '--cq-quick-run',
4682 action='store_true',
4683 default=False,
4684 help='Send the patchset to do a CQ quick run right after '
4685 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4686 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004687 parser.add_option('--set-bot-commit', action='store_true',
4688 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004689 parser.add_option('--preserve-tryjobs', action='store_true',
4690 help='instruct the CQ to let tryjobs running even after '
4691 'new patchsets are uploaded instead of canceling '
4692 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004693 parser.add_option('--dependencies', action='store_true',
4694 help='Uploads CLs of all the local branches that depend on '
4695 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004696 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4697 help='Sends your change to the CQ after an approval. Only '
4698 'works on repos that have the Auto-Submit label '
4699 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004700 parser.add_option('--parallel', action='store_true',
4701 help='Run all tests specified by input_api.RunTests in all '
4702 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004703 parser.add_option('--no-autocc', action='store_true',
4704 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004705 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004706 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004707 parser.add_option('-R', '--retry-failed', action='store_true',
4708 help='Retry failed tryjobs from old patchset immediately '
4709 'after uploading new patchset. Cannot be used with '
4710 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004711 parser.add_option('--fixed', '-x',
4712 help='List of bugs that will be commented on and marked '
4713 'fixed (pre-populates "Fixed:" tag). Same format as '
4714 '-b option / "Bug:" tag. If fixing several issues, '
4715 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004716 parser.add_option('--edit-description', action='store_true', default=False,
4717 help='Modify description before upload. Cannot be used '
4718 'with --force. It is a noop when --no-squash is set '
4719 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004720 parser.add_option('--git-completion-helper', action="store_true",
4721 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004722 parser.add_option('-o',
4723 '--push-options',
4724 action='append',
4725 default=[],
4726 help='Transmit the given string to the server when '
4727 'performing git push (pass-through). See git-push '
4728 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004729 parser.add_option('--no-add-changeid',
4730 action='store_true',
4731 dest='no_add_changeid',
4732 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004733 parser.add_option('--no-python2-post-upload-hooks',
4734 action='store_true',
4735 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004736 parser.add_option('--cherry-pick-stacked',
4737 '--cp',
4738 dest='cherry_pick_stacked',
4739 action='store_true',
4740 help='If parent branch has un-uploaded updates, '
4741 'automatically skip parent branches and just upload '
4742 'the current branch cherry-pick on its parent\'s last '
4743 'uploaded commit. Allows users to skip the potential '
4744 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004745 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004746
rmistry@google.com2dd99862015-06-22 12:22:18 +00004747 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004748 (options, args) = parser.parse_args(args)
4749
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004750 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004751 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4752 if opt.help != optparse.SUPPRESS_HELP))
4753 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004754
sbc@chromium.org71437c02015-04-09 19:29:40 +00004755 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004756 return 1
4757
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004758 options.reviewers = cleanup_list(options.reviewers)
4759 options.cc = cleanup_list(options.cc)
4760
Josipe827b0f2020-01-30 00:07:20 +00004761 if options.edit_description and options.force:
4762 parser.error('Only one of --force and --edit-description allowed')
4763
tandriib80458a2016-06-23 12:20:07 -07004764 if options.message_file:
4765 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004766 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004767 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004768
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004769 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004770 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004771 options.use_commit_queue,
4772 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004773 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4774 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004775
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004776 if options.skip_title and options.title:
4777 parser.error('Only one of --title and --skip-title allowed.')
4778
Aaron Gableedbc4132017-09-11 13:22:28 -07004779 if options.use_commit_queue:
4780 options.send_mail = True
4781
Edward Lesmes0dd54822020-03-26 18:24:25 +00004782 if options.squash is None:
4783 # Load default for user, repo, squash=true, in this order.
4784 options.squash = settings.GetSquashGerritUploads()
4785
Joanna Wang5051ffe2023-03-01 22:24:07 +00004786 cl = Changelist(branchref=options.target_branch)
4787
4788 # Warm change details cache now to avoid RPCs later, reducing latency for
4789 # developers.
4790 if cl.GetIssue():
4791 cl._GetChangeDetail(
4792 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4793
4794 if options.retry_failed and not cl.GetIssue():
4795 print('No previous patchsets, so --retry-failed has no effect.')
4796 options.retry_failed = False
4797
4798 remote = cl.GetRemoteUrl()
4799 dogfood_stacked_changes = (os.environ.get('DOGFOOD_STACKED_CHANGES')
4800 not in ['1', '0']
4801 and any(repo in remote
4802 for repo in DOGFOOD_STACKED_CHANGES_REPOS))
4803
4804 if dogfood_stacked_changes:
4805 print('This repo has been enrolled in the stacked changes dogfood. '
4806 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4807 'File bugs at https://bit.ly/3Y6opoI')
4808
4809 if options.squash and (dogfood_stacked_changes
4810 or os.environ.get('DOGFOOD_STACKED_CHANGES') == '1'):
Joanna Wangdd12deb2023-01-26 20:43:28 +00004811 if options.dependencies:
4812 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004813
Joanna Wangd75fc882023-03-01 21:53:34 +00004814 if options.cherry_pick_stacked:
4815 try:
4816 orig_args.remove('--cherry-pick-stacked')
4817 except ValueError:
4818 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004819 UploadAllSquashed(options, orig_args)
4820 return 0
4821
Joanna Wangd75fc882023-03-01 21:53:34 +00004822 if options.cherry_pick_stacked:
4823 parser.error('--cherry-pick-stacked is not available for this workflow.')
4824
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004825 # cl.GetMostRecentPatchset uses cached information, and can return the last
4826 # patchset before upload. Calling it here makes it clear that it's the
4827 # last patchset before upload. Note that GetMostRecentPatchset will fail
4828 # if no CL has been uploaded yet.
4829 if options.retry_failed:
4830 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004831
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004832 ret = cl.CMDUpload(options, args, orig_args)
4833
4834 if options.retry_failed:
4835 if ret != 0:
4836 print('Upload failed, so --retry-failed has no effect.')
4837 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004838 builds, _ = _fetch_latest_builds(cl,
4839 DEFAULT_BUILDBUCKET_HOST,
4840 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004841 jobs = _filter_failed_for_retry(builds)
4842 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004843 print('No failed tryjobs, so --retry-failed has no effect.')
4844 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004845 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004846
4847 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004848
4849
Joanna Wang18de1f62023-01-21 01:24:24 +00004850def UploadAllSquashed(options, orig_args):
4851 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4852 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004853 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004854
Joanna Wangc710e2d2023-01-25 14:53:22 +00004855 # Create commits.
4856 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4857 if cherry_pick_current:
4858 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4859 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4860 uploads_by_cl.append((cls[0], new_upload))
4861 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004862 ordered_cls = list(reversed(cls))
4863
Joanna Wang6215dd02023-02-07 15:58:03 +00004864 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004865 # We can only support external changes when we're only uploading one
4866 # branch.
4867 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
4868 if parent is None:
4869 origin = '.'
4870 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004871
Joanna Wang7603f042023-03-01 22:17:36 +00004872 while origin == '.':
4873 # Search for cl's closest ancestor with a gerrit hash.
4874 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4875 if origin == '.':
4876 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4877
4878 # Support the `git merge` and `git pull` workflow.
4879 if upstream_branch in ['master', 'main']:
4880 parent = cl.GetCommonAncestorWithUpstream()
4881 else:
4882 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4883 upstream_branch,
4884 GERRIT_SQUASH_HASH_CONFIG_KEY)
4885 if parent:
4886 break
4887 branch = upstream_branch
4888 else:
4889 # Either the root of the tree is the cl's direct parent and the while
4890 # loop above only found empty branches between cl and the root of the
4891 # tree.
4892 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004893
Joanna Wangc710e2d2023-01-25 14:53:22 +00004894 for i, cl in enumerate(ordered_cls):
4895 # If we're in the middle of the stack, set end_commit to downstream's
4896 # direct ancestor.
4897 if i + 1 < len(ordered_cls):
4898 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4899 else:
4900 child_base_commit = None
4901 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004902 parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004903 end_commit=child_base_commit)
4904 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004905 parent = new_upload.commit_to_push
4906
4907 # Create refspec options
4908 cl, new_upload = uploads_by_cl[-1]
4909 refspec_opts = cl._GetRefSpecOptions(
4910 options,
4911 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004912 multi_change_upload=len(uploads_by_cl) > 1,
4913 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004914 refspec_suffix = ''
4915 if refspec_opts:
4916 refspec_suffix = '%' + ','.join(refspec_opts)
4917 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4918 refspec_suffix)
4919
4920 remote, remote_branch = cl.GetRemoteBranch()
4921 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4922 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4923 refspec_suffix)
4924
4925 # Git push
4926 git_push_metadata = {
4927 'gerrit_host':
4928 cl.GetGerritHost(),
4929 'title':
4930 options.title or '<untitled>',
4931 'change_id':
4932 git_footers.get_footer_change_id(new_upload.change_desc.description),
4933 'description':
4934 new_upload.change_desc.description,
4935 }
4936 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
4937 git_push_metadata)
4938
4939 # Post push updates
4940 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4941 change_numbers = [
4942 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4943 ]
4944
4945 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4946 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4947
4948 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004949
4950
4951def _UploadAllPrecheck(options, orig_args):
4952 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4953 """Checks the state of the tree and gives the user uploading options
4954
4955 Returns: A tuple of the ordered list of changes that have new commits
4956 since their last upload and a boolean of whether the user wants to
4957 cherry-pick and upload the current branch instead of uploading all cls.
4958 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004959 cl = Changelist()
4960 if cl.GetBranch() is None:
4961 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4962
Joanna Wang18de1f62023-01-21 01:24:24 +00004963 branch_ref = None
4964 cls = []
4965 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004966 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004967
4968 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4969
4970 while True:
4971 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4972 DieWithError(
4973 'More than %s branches in the stack have not been uploaded.\n'
4974 'Are your branches in a misconfigured state?\n'
4975 'If not, please upload some upstream changes first.' %
4976 (_MAX_STACKED_BRANCHES_UPLOAD))
4977
4978 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004979
Joanna Wang6215dd02023-02-07 15:58:03 +00004980 # Only add CL if it has anything to commit.
4981 base_commit = cl.GetCommonAncestorWithUpstream()
4982 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4983
4984 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4985 if diff:
4986 cls.append(cl)
4987 if (not first_pass and
4988 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4989 # We are mid-stack and the user must upload their upstream branches.
4990 must_upload_upstream = True
4991 elif first_pass: # The current branch has nothing to commit. Exit.
4992 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4993 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
4994 first_pass = False
4995
4996 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00004997 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00004998 branch_ref = upstream_branch_ref # set branch for next run.
4999
Joanna Wang6215dd02023-02-07 15:58:03 +00005000 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5001 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5002 upstream_branch,
5003 LAST_UPLOAD_HASH_CONFIG_KEY)
5004
Joanna Wang18de1f62023-01-21 01:24:24 +00005005 # Case 1: We've reached the beginning of the tree.
5006 if origin != '.':
5007 break
5008
Joanna Wang18de1f62023-01-21 01:24:24 +00005009 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005010 # the user MUST upload them unless they are empty. Continue to
5011 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005012 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005013 continue
5014
Joanna Wang18de1f62023-01-21 01:24:24 +00005015 # Case 3: If upstream's last_upload == cl.base_commit we do
5016 # not need to upload any more upstreams from this point on.
5017 # (Even if there may be diverged branches higher up the tree)
5018 if base_commit == upstream_last_upload:
5019 break
5020
5021 # Case 4: If upstream's last_upload < cl.base_commit we are
5022 # uploading cl and upstream_cl.
5023 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005024 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005025 continue
5026
5027 # Case 5: If cl.base_commit < upstream's last_upload the user
5028 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005029 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005030 DieWithError(
5031 'At least one branch in the stack has diverged from its upstream '
5032 'branch and does not contain its upstream\'s last upload.\n'
5033 'Please rebase the stack with `git rebase-update` before uploading.')
5034
5035 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5036 # any relation to commits in the tree. Continue up the tree until we hit
5037 # the root.
5038
5039 # We assume all cls in the stack have the same auth requirements and only
5040 # check this once.
5041 cls[0].EnsureAuthenticated(force=options.force)
5042
5043 cherry_pick = False
5044 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005045 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005046 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005047 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005048 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005049 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005050 msg = ('At least one parent branch in `%s` has never been uploaded '
5051 'and must be uploaded before/with `%s`.\n' %
5052 (branches, cls[1].branch))
5053 if options.cherry_pick_stacked:
5054 DieWithError(msg)
5055 if not options.force:
5056 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005057 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005058 if options.cherry_pick_stacked:
5059 print('cherry-picking `%s` on %s\'s last upload' %
5060 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005061 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005062 elif not options.force:
5063 answer = gclient_utils.AskForData(
5064 '\n' + opt_message +
5065 'Press enter to update branches %s.\nOr type `n` to upload only '
5066 '`%s` cherry-picked on %s\'s last upload:' %
5067 (branches, cls[0].branch, cls[1].branch))
5068 if answer.lower() == 'n':
5069 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005070 return cls, cherry_pick
5071
5072
Francois Dorayd42c6812017-05-30 15:10:20 -04005073@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005074@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005075def CMDsplit(parser, args):
5076 """Splits a branch into smaller branches and uploads CLs.
5077
5078 Creates a branch and uploads a CL for each group of files modified in the
5079 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005080 comment, the string '$directory', is replaced with the directory containing
5081 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005082 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005083 parser.add_option('-d', '--description', dest='description_file',
5084 help='A text file containing a CL description in which '
5085 '$directory will be replaced by each CL\'s directory.')
5086 parser.add_option('-c', '--comment', dest='comment_file',
5087 help='A text file containing a CL comment.')
5088 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005089 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005090 help='List the files and reviewers for each CL that would '
5091 'be created, but don\'t create branches or CLs.')
5092 parser.add_option('--cq-dry-run', action='store_true',
5093 help='If set, will do a cq dry run for each uploaded CL. '
5094 'Please be careful when doing this; more than ~10 CLs '
5095 'has the potential to overload our build '
5096 'infrastructure. Try to upload these not during high '
5097 'load times (usually 11-3 Mountain View time). Email '
5098 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005099 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5100 default=True,
5101 help='Sends your change to the CQ after an approval. Only '
5102 'works on repos that have the Auto-Submit label '
5103 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005104 parser.add_option('--max-depth',
5105 type='int',
5106 default=0,
5107 help='The max depth to look for OWNERS files. Useful for '
5108 'controlling the granularity of the split CLs, e.g. '
5109 '--max-depth=1 will only split by top-level '
5110 'directory. Specifying a value less than 1 means no '
5111 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005112 options, _ = parser.parse_args(args)
5113
5114 if not options.description_file:
5115 parser.error('No --description flag specified.')
5116
5117 def WrappedCMDupload(args):
5118 return CMDupload(OptionParser(), args)
5119
Daniel Cheng403c44e2022-10-05 22:24:58 +00005120 return split_cl.SplitCl(options.description_file, options.comment_file,
5121 Changelist, WrappedCMDupload, options.dry_run,
5122 options.cq_dry_run, options.enable_auto_submit,
5123 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005124
5125
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005126@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005127@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005128def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005129 """DEPRECATED: Used to commit the current changelist via git-svn."""
5130 message = ('git-cl no longer supports committing to SVN repositories via '
5131 'git-svn. You probably want to use `git cl land` instead.')
5132 print(message)
5133 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005134
5135
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005136@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005137@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005138def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005139 """Commits the current changelist via git.
5140
5141 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5142 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005143 """
5144 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5145 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005146 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005147 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005148 parser.add_option('--parallel', action='store_true',
5149 help='Run all tests specified by input_api.RunTests in all '
5150 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005151 parser.add_option('--resultdb', action='store_true',
5152 help='Run presubmit checks in the ResultSink environment '
5153 'and send results to the ResultDB database.')
5154 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005155 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005156
Edward Lemur934836a2019-09-09 20:16:54 +00005157 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005158
Robert Iannucci2e73d432018-03-14 01:10:47 -07005159 if not cl.GetIssue():
5160 DieWithError('You must upload the change first to Gerrit.\n'
5161 ' If you would rather have `git cl land` upload '
5162 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005163 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5164 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005165
5166
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005167@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005168@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005169def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005170 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005171 parser.add_option('-b', dest='newbranch',
5172 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005173 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005174 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005175 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005176 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005177
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005178 group = optparse.OptionGroup(
5179 parser,
5180 'Options for continuing work on the current issue uploaded from a '
5181 'different clone (e.g. different machine). Must be used independently '
5182 'from the other options. No issue number should be specified, and the '
5183 'branch must have an issue number associated with it')
5184 group.add_option('--reapply', action='store_true', dest='reapply',
5185 help='Reset the branch and reapply the issue.\n'
5186 'CAUTION: This will undo any local changes in this '
5187 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005188
5189 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005190 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005191 parser.add_option_group(group)
5192
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005193 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005194
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005195 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005196 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005197 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005198 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005199 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005200
Edward Lemur934836a2019-09-09 20:16:54 +00005201 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005202 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005203 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005204
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005205 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005206 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005207 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005208
5209 RunGit(['reset', '--hard', upstream])
5210 if options.pull:
5211 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005212
Edward Lemur678a6842019-10-03 22:25:05 +00005213 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005214 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5215 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005216
5217 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005218 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005219
Edward Lemurf38bc172019-09-03 21:02:13 +00005220 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005221 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005222 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005223
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005224 # We don't want uncommitted changes mixed up with the patch.
5225 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005226 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005227
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005228 if options.newbranch:
5229 if options.force:
5230 RunGit(['branch', '-D', options.newbranch],
5231 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005232 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005233
Edward Lemur678a6842019-10-03 22:25:05 +00005234 cl = Changelist(
5235 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005236
Edward Lemur678a6842019-10-03 22:25:05 +00005237 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005238 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005239
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005240 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5241 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005242
5243
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005244def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005245 """Fetches the tree status and returns either 'open', 'closed',
5246 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005247 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005248 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005249 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005250 if status.find('closed') != -1 or status == '0':
5251 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005252
5253 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005254 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005255
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005256 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005257 return 'unset'
5258
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005259
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005260def GetTreeStatusReason():
5261 """Fetches the tree status from a json url and returns the message
5262 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005263 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005264 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005265 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005266 status = json.loads(connection.read())
5267 connection.close()
5268 return status['message']
5269
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005270
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005271@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005272def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005273 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005274 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005275 status = GetTreeStatus()
5276 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005277 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005278 return 2
5279
vapiera7fbd5a2016-06-16 09:17:49 -07005280 print('The tree is %s' % status)
5281 print()
5282 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005283 if status != 'open':
5284 return 1
5285 return 0
5286
5287
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005288@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005289def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005290 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5291 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005292 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005293 '-b', '--bot', action='append',
5294 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5295 'times to specify multiple builders. ex: '
5296 '"-b win_rel -b win_layout". See '
5297 'the try server waterfall for the builders name and the tests '
5298 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005299 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005300 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005301 help=('Buildbucket bucket to send the try requests. Format: '
5302 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005303 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005304 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005305 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005306 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005307 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005308 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005309 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005310 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005311 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005312 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005313 '-q',
5314 '--quick-run',
5315 action='store_true',
5316 default=False,
5317 help='trigger in quick run mode '
5318 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5319 'uick_run.md) (chromium only).')
5320 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005321 '--category', default='git_cl_try', help='Specify custom build category.')
5322 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005323 '--project',
5324 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005325 'in recipe to determine to which repository or directory to '
5326 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005327 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005328 '-p', '--property', dest='properties', action='append', default=[],
5329 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005330 'key2=value2 etc. The value will be treated as '
5331 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005332 'NOTE: using this may make your tryjob not usable for CQ, '
5333 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005334 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005335 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5336 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005337 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005338 parser.add_option(
5339 '-R', '--retry-failed', action='store_true', default=False,
5340 help='Retry failed jobs from the latest set of tryjobs. '
5341 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005342 parser.add_option(
5343 '-i', '--issue', type=int,
5344 help='Operate on this issue instead of the current branch\'s implicit '
5345 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005346 options, args = parser.parse_args(args)
5347
machenbach@chromium.org45453142015-09-15 08:45:22 +00005348 # Make sure that all properties are prop=value pairs.
5349 bad_params = [x for x in options.properties if '=' not in x]
5350 if bad_params:
5351 parser.error('Got properties with missing "=": %s' % bad_params)
5352
maruel@chromium.org15192402012-09-06 12:38:29 +00005353 if args:
5354 parser.error('Unknown arguments: %s' % args)
5355
Edward Lemur934836a2019-09-09 20:16:54 +00005356 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005357 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005358 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005359
Edward Lemurf38bc172019-09-03 21:02:13 +00005360 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005361 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005362
tandriie113dfd2016-10-11 10:20:12 -07005363 error_message = cl.CannotTriggerTryJobReason()
5364 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005365 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005366
Edward Lemur45768512020-03-02 19:03:14 +00005367 if options.bot:
5368 if options.retry_failed:
5369 parser.error('--bot is not compatible with --retry-failed.')
5370 if not options.bucket:
5371 parser.error('A bucket (e.g. "chromium/try") is required.')
5372
5373 triggered = [b for b in options.bot if 'triggered' in b]
5374 if triggered:
5375 parser.error(
5376 'Cannot schedule builds on triggered bots: %s.\n'
5377 'This type of bot requires an initial job from a parent (usually a '
5378 'builder). Schedule a job on the parent instead.\n' % triggered)
5379
5380 if options.bucket.startswith('.master'):
5381 parser.error('Buildbot masters are not supported.')
5382
5383 project, bucket = _parse_bucket(options.bucket)
5384 if project is None or bucket is None:
5385 parser.error('Invalid bucket: %s.' % options.bucket)
5386 jobs = sorted((project, bucket, bot) for bot in options.bot)
5387 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005388 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005389 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005390 if options.verbose:
5391 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005392 jobs = _filter_failed_for_retry(builds)
5393 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005394 print('There are no failed jobs in the latest set of jobs '
5395 '(patchset #%d), doing nothing.' % patchset)
5396 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005397 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005398 if num_builders > 10:
5399 confirm_or_exit('There are %d builders with failed builds.'
5400 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005401 elif options.quick_run:
5402 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5403 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005404 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005405 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005406 print('git cl try with no bots now defaults to CQ dry run.')
5407 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5408 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005409
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005410 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005411 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005412 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005413 except BuildbucketResponseException as ex:
5414 print('ERROR: %s' % ex)
5415 return 1
5416 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005417
5418
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005419@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005420def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005421 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005422 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005423 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005424 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005425 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005426 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005427 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005428 '--color', action='store_true', default=setup_color.IS_TTY,
5429 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005430 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005431 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5432 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005433 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005434 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005435 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005436 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005437 parser.add_option(
5438 '-i', '--issue', type=int,
5439 help='Operate on this issue instead of the current branch\'s implicit '
5440 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005441 options, args = parser.parse_args(args)
5442 if args:
5443 parser.error('Unrecognized args: %s' % ' '.join(args))
5444
Edward Lemur934836a2019-09-09 20:16:54 +00005445 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005446 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005447 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005448
tandrii221ab252016-10-06 08:12:04 -07005449 patchset = options.patchset
5450 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005451 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005452 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005453 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005454 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005455 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005456 cl.GetIssue())
5457
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005458 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005459 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005460 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005461 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005462 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005463 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005464 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005465 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005466 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005467 return 0
5468
5469
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005470@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005471@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005472def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005473 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005474 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005475 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005476 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005477
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005478 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005479 if args:
5480 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005481 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005482 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005483 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005484 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005485
5486 # Clear configured merge-base, if there is one.
5487 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005488 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005489 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005490 return 0
5491
5492
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005493@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005494def CMDweb(parser, args):
5495 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005496 parser.add_option('-p',
5497 '--print-only',
5498 action='store_true',
5499 dest='print_only',
5500 help='Only print the Gerrit URL, don\'t open it in the '
5501 'browser.')
5502 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005503 if args:
5504 parser.error('Unrecognized args: %s' % ' '.join(args))
5505
5506 issue_url = Changelist().GetIssueURL()
5507 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005508 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005509 return 1
5510
Orr Bernstein0b960582022-12-22 20:16:18 +00005511 if options.print_only:
5512 print(issue_url)
5513 return 0
5514
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005515 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005516 # allows us to hide the "Created new window in existing browser session."
5517 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005518 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005519 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005520 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005521 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005522 os.open(os.devnull, os.O_RDWR)
5523 try:
5524 webbrowser.open(issue_url)
5525 finally:
5526 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005527 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005528 return 0
5529
5530
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005531@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005532def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005533 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005534 parser.add_option('-d', '--dry-run', action='store_true',
5535 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005536 parser.add_option(
5537 '-q',
5538 '--quick-run',
5539 action='store_true',
5540 help='trigger in quick run mode '
5541 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5542 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005543 parser.add_option('-c', '--clear', action='store_true',
5544 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005545 parser.add_option(
5546 '-i', '--issue', type=int,
5547 help='Operate on this issue instead of the current branch\'s implicit '
5548 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005549 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005550 if args:
5551 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005552 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5553 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005554
Edward Lemur934836a2019-09-09 20:16:54 +00005555 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005556 if not cl.GetIssue():
5557 parser.error('Must upload the issue first.')
5558
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005559 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005560 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005561 elif options.quick_run:
5562 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005563 elif options.dry_run:
5564 state = _CQState.DRY_RUN
5565 else:
5566 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005567 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005568 return 0
5569
5570
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005571@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005572def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005573 """Closes the issue."""
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)
groby@chromium.org411034a2013-02-26 15:12:01 +00005579 if args:
5580 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005581 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005582 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005583 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005584 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005585 cl.CloseIssue()
5586 return 0
5587
5588
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005589@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005590def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005591 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005592 parser.add_option(
5593 '--stat',
5594 action='store_true',
5595 dest='stat',
5596 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005597 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005598 if args:
5599 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005600
Edward Lemur934836a2019-09-09 20:16:54 +00005601 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005602 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005603 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005604 if not issue:
5605 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005606
Gavin Makbe2e9262022-11-08 23:41:55 +00005607 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005608 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005609 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005610 if not base:
5611 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5612 revision_info = detail['revisions'][detail['current_revision']]
5613 fetch_info = revision_info['fetch']['http']
5614 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5615 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005616
Aaron Gablea718c3e2017-08-28 17:47:28 -07005617 cmd = ['git', 'diff']
5618 if options.stat:
5619 cmd.append('--stat')
5620 cmd.append(base)
5621 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005622
5623 return 0
5624
5625
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005626@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005627def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005628 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005629 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005630 '--ignore-current',
5631 action='store_true',
5632 help='Ignore the CL\'s current reviewers and start from scratch.')
5633 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005634 '--ignore-self',
5635 action='store_true',
5636 help='Do not consider CL\'s author as an owners.')
5637 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005638 '--no-color',
5639 action='store_true',
5640 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005641 parser.add_option(
5642 '--batch',
5643 action='store_true',
5644 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005645 # TODO: Consider moving this to another command, since other
5646 # git-cl owners commands deal with owners for a given CL.
5647 parser.add_option(
5648 '--show-all',
5649 action='store_true',
5650 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005651 options, args = parser.parse_args(args)
5652
Edward Lemur934836a2019-09-09 20:16:54 +00005653 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005654 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005655
Yang Guo6e269a02019-06-26 11:17:02 +00005656 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005657 if len(args) == 0:
5658 print('No files specified for --show-all. Nothing to do.')
5659 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005660 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005661 for path in args:
5662 print('Owners for %s:' % path)
5663 print('\n'.join(
5664 ' - %s' % owner
5665 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005666 return 0
5667
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005668 if args:
5669 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005670 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005671 base_branch = args[0]
5672 else:
5673 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005674 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005675
Edward Lemur2c62b332020-03-12 22:12:33 +00005676 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005677
5678 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005679 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5680 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005681 return 0
5682
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005683 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005684 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005685 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005686 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005687 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005688 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005689 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005690
5691
Aiden Bennerc08566e2018-10-03 17:52:42 +00005692def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005693 """Generates a diff command."""
5694 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005695 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5696
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005697 if allow_prefix:
5698 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5699 # case that diff.noprefix is set in the user's git config.
5700 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5701 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005702 diff_cmd += ['--no-prefix']
5703
5704 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005705
5706 if args:
5707 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005708 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005709 diff_cmd.append(arg)
5710 else:
5711 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005712
5713 return diff_cmd
5714
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005715
Jamie Madill5e96ad12020-01-13 16:08:35 +00005716def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5717 """Runs clang-format-diff and sets a return value if necessary."""
5718
5719 if not clang_diff_files:
5720 return 0
5721
5722 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5723 # formatted. This is used to block during the presubmit.
5724 return_value = 0
5725
5726 # Locate the clang-format binary in the checkout
5727 try:
5728 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5729 except clang_format.NotFoundError as e:
5730 DieWithError(e)
5731
5732 if opts.full or settings.GetFormatFullByDefault():
5733 cmd = [clang_format_tool]
5734 if not opts.dry_run and not opts.diff:
5735 cmd.append('-i')
5736 if opts.dry_run:
5737 for diff_file in clang_diff_files:
5738 with open(diff_file, 'r') as myfile:
5739 code = myfile.read().replace('\r\n', '\n')
5740 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5741 stdout = stdout.replace('\r\n', '\n')
5742 if opts.diff:
5743 sys.stdout.write(stdout)
5744 if code != stdout:
5745 return_value = 2
5746 else:
5747 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5748 if opts.diff:
5749 sys.stdout.write(stdout)
5750 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005751 try:
5752 script = clang_format.FindClangFormatScriptInChromiumTree(
5753 'clang-format-diff.py')
5754 except clang_format.NotFoundError as e:
5755 DieWithError(e)
5756
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005757 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005758 if not opts.dry_run and not opts.diff:
5759 cmd.append('-i')
5760
5761 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005762 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005763
Edward Lesmes89624cd2020-04-06 17:51:56 +00005764 env = os.environ.copy()
5765 env['PATH'] = (
5766 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5767 stdout = RunCommand(
5768 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005769 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005770 if opts.diff:
5771 sys.stdout.write(stdout)
5772 if opts.dry_run and len(stdout) > 0:
5773 return_value = 2
5774
5775 return return_value
5776
5777
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005778def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5779 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5780 presubmit checks have failed (and returns 0 otherwise)."""
5781
5782 if not rust_diff_files:
5783 return 0
5784
5785 # Locate the rustfmt binary.
5786 try:
5787 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5788 except rustfmt.NotFoundError as e:
5789 DieWithError(e)
5790
5791 # TODO(crbug.com/1231317): Support formatting only the changed lines
5792 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5793 # https://github.com/emilio/rustfmt-format-diff
5794 cmd = [rustfmt_tool]
5795 if opts.dry_run:
5796 cmd.append('--check')
5797 cmd += rust_diff_files
5798 rustfmt_exitcode = subprocess2.call(cmd)
5799
5800 if opts.presubmit and rustfmt_exitcode != 0:
5801 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005802
5803 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005804
5805
Olivier Robin0a6b5442022-04-07 07:25:04 +00005806def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5807 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5808 that presubmit checks have failed (and returns 0 otherwise)."""
5809
5810 if not swift_diff_files:
5811 return 0
5812
5813 # Locate the swift-format binary.
5814 try:
5815 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5816 except swift_format.NotFoundError as e:
5817 DieWithError(e)
5818
5819 cmd = [swift_format_tool]
5820 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005821 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005822 else:
5823 cmd += ['format', '-i']
5824 cmd += swift_diff_files
5825 swift_format_exitcode = subprocess2.call(cmd)
5826
5827 if opts.presubmit and swift_format_exitcode != 0:
5828 return 2
5829
5830 return 0
5831
5832
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005833def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005834 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005835 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005836
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005837
enne@chromium.org555cfe42014-01-29 18:21:39 +00005838@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005839@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005840def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005841 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005842 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005843 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005844 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005845 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005846 parser.add_option('--full', action='store_true',
5847 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005848 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005849 parser.add_option('--dry-run', action='store_true',
5850 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005851 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005852 '--no-clang-format',
5853 dest='clang_format',
5854 action='store_false',
5855 default=True,
5856 help='Disables formatting of various file types using clang-format.')
5857 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005858 '--python',
5859 action='store_true',
5860 default=None,
5861 help='Enables python formatting on all python files.')
5862 parser.add_option(
5863 '--no-python',
5864 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005865 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005866 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005867 'If neither --python or --no-python are set, python files that have a '
5868 '.style.yapf file in an ancestor directory will be formatted. '
5869 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005870 parser.add_option(
5871 '--js',
5872 action='store_true',
5873 help='Format javascript code with clang-format. '
5874 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005875 parser.add_option('--diff', action='store_true',
5876 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005877 parser.add_option('--presubmit', action='store_true',
5878 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005879
5880 parser.add_option('--rust-fmt',
5881 dest='use_rust_fmt',
5882 action='store_true',
5883 default=rustfmt.IsRustfmtSupported(),
5884 help='Enables formatting of Rust file types using rustfmt.')
5885 parser.add_option(
5886 '--no-rust-fmt',
5887 dest='use_rust_fmt',
5888 action='store_false',
5889 help='Disables formatting of Rust file types using rustfmt.')
5890
Olivier Robin0a6b5442022-04-07 07:25:04 +00005891 parser.add_option(
5892 '--swift-format',
5893 dest='use_swift_format',
5894 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005895 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005896 help='Enables formatting of Swift file types using swift-format '
5897 '(macOS host only).')
5898 parser.add_option(
5899 '--no-swift-format',
5900 dest='use_swift_format',
5901 action='store_false',
5902 help='Disables formatting of Swift file types using swift-format.')
5903
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005904 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005905
Garrett Beaty91a6f332020-01-06 16:57:24 +00005906 if opts.python is not None and opts.no_python:
5907 raise parser.error('Cannot set both --python and --no-python')
5908 if opts.no_python:
5909 opts.python = False
5910
Daniel Chengc55eecf2016-12-30 03:11:02 -08005911 # Normalize any remaining args against the current path, so paths relative to
5912 # the current directory are still resolved as expected.
5913 args = [os.path.join(os.getcwd(), arg) for arg in args]
5914
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005915 # git diff generates paths against the root of the repository. Change
5916 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005917 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005918 if rel_base_path:
5919 os.chdir(rel_base_path)
5920
digit@chromium.org29e47272013-05-17 17:01:46 +00005921 # Grab the merge-base commit, i.e. the upstream commit of the current
5922 # branch when it was created or the last time it was rebased. This is
5923 # to cover the case where the user may have called "git fetch origin",
5924 # moving the origin branch to a newer commit, but hasn't rebased yet.
5925 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005926 upstream_branch = opts.upstream
5927 if not upstream_branch:
5928 cl = Changelist()
5929 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005930 if upstream_branch:
5931 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5932 upstream_commit = upstream_commit.strip()
5933
5934 if not upstream_commit:
5935 DieWithError('Could not find base commit for this branch. '
5936 'Are you in detached state?')
5937
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005938 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5939 diff_output = RunGit(changed_files_cmd)
5940 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005941 # Filter out files deleted by this CL
5942 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005943
Andreas Haas417d89c2020-02-06 10:24:27 +00005944 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005945 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005946
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005947 clang_diff_files = []
5948 if opts.clang_format:
5949 clang_diff_files = [
5950 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5951 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005952 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005953 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005954 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005955 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005956
Edward Lesmes50da7702020-03-30 19:23:43 +00005957 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005958
Jamie Madill5e96ad12020-01-13 16:08:35 +00005959 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5960 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005961
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005962 if opts.use_rust_fmt:
5963 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5964 upstream_commit)
5965 if rust_fmt_return_value == 2:
5966 return_value = 2
5967
Olivier Robin0a6b5442022-04-07 07:25:04 +00005968 if opts.use_swift_format:
5969 if sys.platform != 'darwin':
5970 DieWithError('swift-format is only supported on macOS.')
5971 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5972 upstream_commit)
5973 if swift_format_return_value == 2:
5974 return_value = 2
5975
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005976 # Similar code to above, but using yapf on .py files rather than clang-format
5977 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005978 py_explicitly_disabled = opts.python is not None and not opts.python
5979 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005980 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5981 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005982
Aiden Bennerc08566e2018-10-03 17:52:42 +00005983 # Used for caching.
5984 yapf_configs = {}
5985 for f in python_diff_files:
5986 # Find the yapf style config for the current file, defaults to depot
5987 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005988 _FindYapfConfigFile(f, yapf_configs, top_dir)
5989
5990 # Turn on python formatting by default if a yapf config is specified.
5991 # This breaks in the case of this repo though since the specified
5992 # style file is also the global default.
5993 if opts.python is None:
5994 filtered_py_files = []
5995 for f in python_diff_files:
5996 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5997 filtered_py_files.append(f)
5998 else:
5999 filtered_py_files = python_diff_files
6000
6001 # Note: yapf still seems to fix indentation of the entire file
6002 # even if line ranges are specified.
6003 # See https://github.com/google/yapf/issues/499
6004 if not opts.full and filtered_py_files:
6005 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6006
Brian Sheedyb4307d52019-12-02 19:18:17 +00006007 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6008 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6009 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006010
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006011 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006012 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6013 # Default to pep8 if not .style.yapf is found.
6014 if not yapf_style:
6015 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006016
Peter Wend9399922020-06-17 17:33:49 +00006017 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006018 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006019 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006020 else:
6021 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006022
6023 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006024
6025 has_formattable_lines = False
6026 if not opts.full:
6027 # Only run yapf over changed line ranges.
6028 for diff_start, diff_len in py_line_diffs[f]:
6029 diff_end = diff_start + diff_len - 1
6030 # Yapf errors out if diff_end < diff_start but this
6031 # is a valid line range diff for a removal.
6032 if diff_end >= diff_start:
6033 has_formattable_lines = True
6034 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6035 # If all line diffs were removals we have nothing to format.
6036 if not has_formattable_lines:
6037 continue
6038
6039 if opts.diff or opts.dry_run:
6040 cmd += ['--diff']
6041 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006042 stdout = RunCommand(cmd,
6043 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006044 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006045 cwd=top_dir,
6046 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006047 if opts.diff:
6048 sys.stdout.write(stdout)
6049 elif len(stdout) > 0:
6050 return_value = 2
6051 else:
6052 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006053 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006054
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006055 # Format GN build files. Always run on full build files for canonical form.
6056 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006057 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006058 if opts.dry_run or opts.diff:
6059 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006060 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006061 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006062 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006063 cwd=top_dir)
6064 if opts.dry_run and gn_ret == 2:
6065 return_value = 2 # Not formatted.
6066 elif opts.diff and gn_ret == 2:
6067 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006068 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006069 elif gn_ret != 0:
6070 # For non-dry run cases (and non-2 return values for dry-run), a
6071 # nonzero error code indicates a failure, probably because the file
6072 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006073 DieWithError('gn format failed on ' + gn_diff_file +
6074 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006075
Ilya Shermane081cbe2017-08-15 17:51:04 -07006076 # Skip the metrics formatting from the global presubmit hook. These files have
6077 # a separate presubmit hook that issues an error if the files need formatting,
6078 # whereas the top-level presubmit script merely issues a warning. Formatting
6079 # these files is somewhat slow, so it's important not to duplicate the work.
6080 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006081 for diff_xml in GetDiffXMLs(diff_files):
6082 xml_dir = GetMetricsDir(diff_xml)
6083 if not xml_dir:
6084 continue
6085
Ilya Shermane081cbe2017-08-15 17:51:04 -07006086 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006087 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006088 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006089
6090 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6091 # command as histograms/pretty_print.py now needs a relative path argument
6092 # after splitting the histograms into multiple directories.
6093 # For example, in tools/metrics/ukm, pretty-print could be run using:
6094 # $ python pretty_print.py
6095 # But in tools/metrics/histogrmas, pretty-print should be run with an
6096 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006097 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006098 # $ python pretty_print.py enums.xml
6099
Weilun Shib92c4b72020-08-27 17:45:11 +00006100 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006101 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006102 cmd.append(diff_xml)
6103
Ilya Shermane081cbe2017-08-15 17:51:04 -07006104 if opts.dry_run or opts.diff:
6105 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006106
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006107 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6108 # `shell` param and instead replace `'vpython'` with
6109 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006110 stdout = RunCommand(cmd,
6111 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006112 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006113 if opts.diff:
6114 sys.stdout.write(stdout)
6115 if opts.dry_run and stdout:
6116 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006117
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006118 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006119
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006120
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006121def GetDiffXMLs(diff_files):
6122 return [
6123 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6124 ]
6125
6126
6127def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006128 metrics_xml_dirs = [
6129 os.path.join('tools', 'metrics', 'actions'),
6130 os.path.join('tools', 'metrics', 'histograms'),
6131 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006132 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006133 os.path.join('tools', 'metrics', 'ukm'),
6134 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006135 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006136 if diff_xml.startswith(xml_dir):
6137 return xml_dir
6138 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006139
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006140
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006141@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006142@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006143def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006144 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006145 _, args = parser.parse_args(args)
6146
6147 if len(args) != 1:
6148 parser.print_help()
6149 return 1
6150
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006151 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006152 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006153 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006154
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006155 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006156
Edward Lemur52969c92020-02-06 18:15:28 +00006157 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006158 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006159 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006160
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006161 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006162 for key, issue in [x.split() for x in output.splitlines()]:
6163 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006164 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006165
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006166 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006167 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006168 return 1
6169 if len(branches) == 1:
6170 RunGit(['checkout', branches[0]])
6171 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006172 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006173 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006174 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006175 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006176 try:
6177 RunGit(['checkout', branches[int(which)]])
6178 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006179 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006180 return 1
6181
6182 return 0
6183
6184
maruel@chromium.org29404b52014-09-08 22:58:00 +00006185def CMDlol(parser, args):
6186 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006187 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006188 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6189 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6190 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006191 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006192 return 0
6193
6194
Josip Sokcevic0399e172022-03-21 23:11:51 +00006195def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006196 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006197 print(utils.depot_tools_version())
6198
6199
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006200class OptionParser(optparse.OptionParser):
6201 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006202
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006203 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006204 optparse.OptionParser.__init__(
6205 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006206 self.add_option(
6207 '-v', '--verbose', action='count', default=0,
6208 help='Use 2 times for more debugging info')
6209
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006210 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006211 try:
6212 return self._parse_args(args)
6213 finally:
6214 # Regardless of success or failure of args parsing, we want to report
6215 # metrics, but only after logging has been initialized (if parsing
6216 # succeeded).
6217 global settings
6218 settings = Settings()
6219
Edward Lesmes9c349062021-05-06 20:02:39 +00006220 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006221 # GetViewVCUrl ultimately calls logging method.
6222 project_url = settings.GetViewVCUrl().strip('/+')
6223 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6224 metrics.collector.add('project_urls', [project_url])
6225
6226 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006227 # Create an optparse.Values object that will store only the actual passed
6228 # options, without the defaults.
6229 actual_options = optparse.Values()
6230 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6231 # Create an optparse.Values object with the default options.
6232 options = optparse.Values(self.get_default_values().__dict__)
6233 # Update it with the options passed by the user.
6234 options._update_careful(actual_options.__dict__)
6235 # Store the options passed by the user in an _actual_options attribute.
6236 # We store only the keys, and not the values, since the values can contain
6237 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006238 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006239
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006240 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006241 logging.basicConfig(
6242 level=levels[min(options.verbose, len(levels) - 1)],
6243 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6244 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006245
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006246 return options, args
6247
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006248
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006249def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006250 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006251 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006252 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006253 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006254
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006255 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006256 dispatcher = subcommand.CommandDispatcher(__name__)
6257 try:
6258 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006259 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006260 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006261 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006262 if e.code != 500:
6263 raise
6264 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006265 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006266 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006267 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006268
6269
6270if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006271 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6272 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006273 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006274 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006275 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006276 sys.exit(main(sys.argv[1:]))