blob: e68951e001dad5cf44d310324b7baed27e03b462 [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
Josip Sokcevic7958e302023-03-01 23:02:21 +000058from lib import utils
Edward Lemur79d4f992019-11-11 23:49:02 +000059from third_party import six
60from six.moves import urllib
61
62
63if sys.version_info.major == 3:
64 basestring = (str,) # pylint: disable=redefined-builtin
65
Edward Lemurb9830242019-10-30 22:19:20 +000066
tandrii7400cf02016-06-21 08:48:07 -070067__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000068
Edward Lemur0f58ae42019-04-30 17:24:12 +000069# Traces for git push will be stored in a traces directory inside the
70# depot_tools checkout.
71DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
72TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000073PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000074
75# When collecting traces, Git hashes will be reduced to 6 characters to reduce
76# the size after compression.
77GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
78# Used to redact the cookies from the gitcookies file.
79GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
80
Edward Lemurd4d1ba42019-09-20 21:46:37 +000081MAX_ATTEMPTS = 3
82
Edward Lemur1b52d872019-05-09 21:12:12 +000083# The maximum number of traces we will keep. Multiplied by 3 since we store
84# 3 files per trace.
85MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000086# Message to be displayed to the user to inform where to find the traces for a
87# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000088TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000089'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000091' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000092'Copies of your gitcookies file and git config have been recorded at:\n'
93' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000094# Format of the message to be stored as part of the traces to give developers a
95# better context when they go through traces.
96TRACES_README_FORMAT = (
97'Date: %(now)s\n'
98'\n'
99'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
100'Title: %(title)s\n'
101'\n'
102'%(description)s\n'
103'\n'
104'Execution time: %(execution_time)s\n'
105'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000106
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800107POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000108DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000109REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000110 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
111 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000112}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000113
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000114DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
115DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
116
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000117DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
118
thestig@chromium.org44202a22014-03-11 19:22:18 +0000119# Valid extensions for files we want to lint.
120DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
121DEFAULT_LINT_IGNORE_REGEX = r"$^"
122
Aiden Bennerc08566e2018-10-03 17:52:42 +0000123# File name for yapf style config files.
124YAPF_CONFIG_FILENAME = '.style.yapf'
125
Edward Lesmes50da7702020-03-30 19:23:43 +0000126# The issue, patchset and codereview server are stored on git config for each
127# branch under branch.<branch-name>.<config-key>.
128ISSUE_CONFIG_KEY = 'gerritissue'
129PATCHSET_CONFIG_KEY = 'gerritpatchset'
130CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000131# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
132# you make to Gerrit. Instead, it creates a new commit object that contains all
133# changes you've made, diffed against a parent/merge base.
134# This is the hash of the new squashed commit and you can find this on Gerrit.
135GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
136# This is the latest uploaded local commit hash.
137LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000138
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000139# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000140Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000141
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000142# Initialized in main()
143settings = None
144
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100145# Used by tests/git_cl_test.py to add extra logging.
146# Inside the weirdly failing test, add this:
147# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700148# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100149_IS_BEING_TESTED = False
150
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000151_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000152
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000153_KNOWN_GERRIT_TO_SHORT_URLS = {
154 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
155 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
156}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000157assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
158 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000159
160
Joanna Wang18de1f62023-01-21 01:24:24 +0000161# Maximum number of branches in a stack that can be traversed and uploaded
162# at once. Picked arbitrarily.
163_MAX_STACKED_BRANCHES_UPLOAD = 20
164
165
Joanna Wang5051ffe2023-03-01 22:24:07 +0000166# Repo prefixes that are enrolled in the stacked changes dogfood.
167DOGFOOD_STACKED_CHANGES_REPOS = [
168 'chromium.googlesource.com/infra/',
169 'chrome-internal.googlesource.com/infra/'
170]
171
172
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000173class GitPushError(Exception):
174 pass
175
176
Christopher Lamf732cd52017-01-24 12:40:11 +1100177def DieWithError(message, change_desc=None):
178 if change_desc:
179 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000180 print('\n ** Content of CL description **\n' +
181 '='*72 + '\n' +
182 change_desc.description + '\n' +
183 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100184
vapiera7fbd5a2016-06-16 09:17:49 -0700185 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000186 sys.exit(1)
187
188
Christopher Lamf732cd52017-01-24 12:40:11 +1100189def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000190 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000191 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000192 with open(backup_path, 'wb') as backup_file:
193 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100194
195
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000196def GetNoGitPagerEnv():
197 env = os.environ.copy()
198 # 'cat' is a magical git string that disables pagers on all platforms.
199 env['GIT_PAGER'] = 'cat'
200 return env
201
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000202
bsep@chromium.org627d9002016-04-29 00:00:52 +0000203def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000204 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000205 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
206 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000207 except subprocess2.CalledProcessError as e:
208 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000209 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000210 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
211 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000212 out = e.stdout.decode('utf-8', 'replace')
213 if e.stderr:
214 out += e.stderr.decode('utf-8', 'replace')
215 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000216
217
218def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000219 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000220 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000221
222
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000223def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000224 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700225 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000226 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700227 else:
228 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000229 try:
tandrii5d48c322016-08-18 16:19:37 -0700230 (out, _), code = subprocess2.communicate(['git'] + args,
231 env=GetNoGitPagerEnv(),
232 stdout=subprocess2.PIPE,
233 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000234 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700235 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900236 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000237 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000238
239
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000240def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000241 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000242 return RunGitWithCode(args, suppress_stderr=True)[1]
243
244
tandrii2a16b952016-10-19 07:09:44 -0700245def time_sleep(seconds):
246 # Use this so that it can be mocked in tests without interfering with python
247 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700248 return time.sleep(seconds)
249
250
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000251def time_time():
252 # Use this so that it can be mocked in tests without interfering with python
253 # system machinery.
254 return time.time()
255
256
Edward Lemur1b52d872019-05-09 21:12:12 +0000257def datetime_now():
258 # Use this so that it can be mocked in tests without interfering with python
259 # system machinery.
260 return datetime.datetime.now()
261
262
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100263def confirm_or_exit(prefix='', action='confirm'):
264 """Asks user to press enter to continue or press Ctrl+C to abort."""
265 if not prefix or prefix.endswith('\n'):
266 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100267 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100268 mid = ' Press'
269 elif prefix.endswith(' '):
270 mid = 'press'
271 else:
272 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000273 gclient_utils.AskForData(
274 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100275
276
277def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000278 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000279 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100280 while True:
281 if 'yes'.startswith(result):
282 return True
283 if 'no'.startswith(result):
284 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000285 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100286
287
machenbach@chromium.org45453142015-09-15 08:45:22 +0000288def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000289 prop_list = getattr(options, 'properties', [])
290 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000291 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000292 try:
293 properties[key] = json.loads(val)
294 except ValueError:
295 pass # If a value couldn't be evaluated, treat it as a string.
296 return properties
297
298
Edward Lemur4c707a22019-09-24 21:13:43 +0000299def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000300 """Calls a buildbucket v2 method and returns the parsed json response."""
301 headers = {
302 'Accept': 'application/json',
303 'Content-Type': 'application/json',
304 }
305 request = json.dumps(request)
306 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
307
308 logging.info('POST %s with %s' % (url, request))
309
310 attempts = 1
311 time_to_sleep = 1
312 while True:
313 response, content = http.request(url, 'POST', body=request, headers=headers)
314 if response.status == 200:
315 return json.loads(content[4:])
316 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
317 msg = '%s error when calling POST %s with %s: %s' % (
318 response.status, url, request, content)
319 raise BuildbucketResponseException(msg)
320 logging.debug(
321 '%s error when calling POST %s with %s. '
322 'Sleeping for %d seconds and retrying...' % (
323 response.status, url, request, time_to_sleep))
324 time.sleep(time_to_sleep)
325 time_to_sleep *= 2
326 attempts += 1
327
328 assert False, 'unreachable'
329
330
Edward Lemur6215c792019-10-03 21:59:05 +0000331def _parse_bucket(raw_bucket):
332 legacy = True
333 project = bucket = None
334 if '/' in raw_bucket:
335 legacy = False
336 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000337 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000338 elif raw_bucket.startswith('luci.'):
339 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000340 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000341 elif '.' in raw_bucket:
342 project = raw_bucket.split('.')[0]
343 bucket = raw_bucket
344 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000345 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000346 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
347 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000348
349
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000350def _canonical_git_googlesource_host(host):
351 """Normalizes Gerrit hosts (with '-review') to Git host."""
352 assert host.endswith(_GOOGLESOURCE)
353 # Prefix doesn't include '.' at the end.
354 prefix = host[:-(1 + len(_GOOGLESOURCE))]
355 if prefix.endswith('-review'):
356 prefix = prefix[:-len('-review')]
357 return prefix + '.' + _GOOGLESOURCE
358
359
360def _canonical_gerrit_googlesource_host(host):
361 git_host = _canonical_git_googlesource_host(host)
362 prefix = git_host.split('.', 1)[0]
363 return prefix + '-review.' + _GOOGLESOURCE
364
365
366def _get_counterpart_host(host):
367 assert host.endswith(_GOOGLESOURCE)
368 git = _canonical_git_googlesource_host(host)
369 gerrit = _canonical_gerrit_googlesource_host(git)
370 return git if gerrit == host else gerrit
371
372
Quinten Yearsley777660f2020-03-04 23:37:06 +0000373def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000374 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700375
376 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000377 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000378 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700379 options: Command-line options.
380 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000382 for project, bucket, builder in jobs:
383 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000384 print('To see results here, run: git cl try-results')
385 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700386
Quinten Yearsley777660f2020-03-04 23:37:06 +0000387 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000388 if not requests:
389 return
390
Edward Lemur5b929a42019-10-21 17:57:39 +0000391 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000392 http.force_exception_to_status_code = True
393
394 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000395 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
396 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000397
398 errors = [
399 ' ' + response['error']['message']
400 for response in batch_response.get('responses', [])
401 if 'error' in response
402 ]
403 if errors:
404 raise BuildbucketResponseException(
405 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
406
407
Quinten Yearsley777660f2020-03-04 23:37:06 +0000408def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000409 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000410 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000411 shared_properties = {
412 'category': options.ensure_value('category', 'git_cl_try')
413 }
414 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000415 shared_properties['clobber'] = True
416 shared_properties.update(_get_properties_from_options(options) or {})
417
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000418 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000419 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000420 shared_tags.append({'key': 'retry_failed',
421 'value': '1'})
422
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000423 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000424 for (project, bucket, builder) in jobs:
425 properties = shared_properties.copy()
426 if 'presubmit' in builder.lower():
427 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000428
Edward Lemur45768512020-03-02 19:03:14 +0000429 requests.append({
430 'scheduleBuild': {
431 'requestId': str(uuid.uuid4()),
432 'builder': {
433 'project': getattr(options, 'project', None) or project,
434 'bucket': bucket,
435 'builder': builder,
436 },
437 'gerritChanges': gerrit_changes,
438 'properties': properties,
439 'tags': [
440 {'key': 'builder', 'value': builder},
441 ] + shared_tags,
442 }
443 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000444
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000445 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000446 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000447 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000448 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000449 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000450 'id': options.revision,
451 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000452 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000453
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000454 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000455
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000456
Quinten Yearsley777660f2020-03-04 23:37:06 +0000457def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000458 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000459
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000460 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000461 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000462 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000463 request = {
464 'predicate': {
465 'gerritChanges': [changelist.GetGerritChange(patchset)],
466 },
467 'fields': ','.join('builds.*.' + field for field in fields),
468 }
tandrii221ab252016-10-06 08:12:04 -0700469
Edward Lemur5b929a42019-10-21 17:57:39 +0000470 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000471 if authenticator.has_cached_credentials():
472 http = authenticator.authorize(httplib2.Http())
473 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700474 print('Warning: Some results might be missing because %s' %
475 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000476 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000477 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000478 http.force_exception_to_status_code = True
479
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000480 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
481 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000482
Edward Lemur45768512020-03-02 19:03:14 +0000483
Edward Lemur5b929a42019-10-21 17:57:39 +0000484def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000485 """Fetches builds from the latest patchset that has builds (within
486 the last few patchsets).
487
488 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000489 changelist (Changelist): The CL to fetch builds for
490 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000491 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
492 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000494 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
495 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000496 """
497 assert buildbucket_host
498 assert changelist.GetIssue(), 'CL must be uploaded first'
499 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000500 if latest_patchset is None:
501 assert changelist.GetMostRecentPatchset()
502 ps = changelist.GetMostRecentPatchset()
503 else:
504 assert latest_patchset > 0, latest_patchset
505 ps = latest_patchset
506
Quinten Yearsley983111f2019-09-26 17:18:48 +0000507 min_ps = max(1, ps - 5)
508 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000509 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000510 if len(builds):
511 return builds, ps
512 ps -= 1
513 return [], 0
514
515
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000516def _filter_failed_for_retry(all_builds):
517 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000518
519 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000520 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000521 i.e. a list of buildbucket.v2.Builds which includes status and builder
522 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000523
524 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000525 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000526 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000527 """
Edward Lemur45768512020-03-02 19:03:14 +0000528 grouped = {}
529 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000530 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000531 key = (builder['project'], builder['bucket'], builder['builder'])
532 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000533
Edward Lemur45768512020-03-02 19:03:14 +0000534 jobs = []
535 for (project, bucket, builder), builds in grouped.items():
536 if 'triggered' in builder:
537 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
538 'from a parent. Please schedule a manual job for the parent '
539 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000540 continue
541 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
542 # Don't retry if any are running.
543 continue
Edward Lemur45768512020-03-02 19:03:14 +0000544 # If builder had several builds, retry only if the last one failed.
545 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
546 # build, but in case of retrying failed jobs retrying a flaky one makes
547 # sense.
548 builds = sorted(builds, key=lambda b: b['createTime'])
549 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
550 continue
551 # Don't retry experimental build previously triggered by CQ.
552 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
553 for t in builds[-1]['tags']):
554 continue
555 jobs.append((project, bucket, builder))
556
557 # Sort the jobs to make testing easier.
558 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000559
560
Quinten Yearsley777660f2020-03-04 23:37:06 +0000561def _print_tryjobs(options, builds):
562 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000563 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000564 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565 return
566
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000567 longest_builder = max(len(b['builder']['builder']) for b in builds)
568 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
571 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000572
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000573 builds_by_status = {}
574 for b in builds:
575 builds_by_status.setdefault(b['status'], []).append({
576 'id': b['id'],
577 'name': name_fmt.format(
578 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
579 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000581 sort_key = lambda b: (b['name'], b['id'])
582
583 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000585 if not builds:
586 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000587
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000588 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000589 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000590 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591 else:
592 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
593
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000594 print(colorize(title))
595 for b in sorted(builds, key=sort_key):
596 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000597
598 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000599 print_builds(
600 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
601 print_builds(
602 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
603 color=Fore.MAGENTA)
604 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
605 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
606 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000607 print_builds('Started:', builds_by_status.pop('STARTED', []),
608 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000609 print_builds(
610 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000611 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000612 print_builds(
613 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000614 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615
616
Aiden Bennerc08566e2018-10-03 17:52:42 +0000617def _ComputeDiffLineRanges(files, upstream_commit):
618 """Gets the changed line ranges for each file since upstream_commit.
619
620 Parses a git diff on provided files and returns a dict that maps a file name
621 to an ordered list of range tuples in the form (start_line, count).
622 Ranges are in the same format as a git diff.
623 """
624 # If files is empty then diff_output will be a full diff.
625 if len(files) == 0:
626 return {}
627
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000628 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000629 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000630 diff_output = RunGit(diff_cmd)
631
632 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
633 # 2 capture groups
634 # 0 == fname of diff file
635 # 1 == 'diff_start,diff_count' or 'diff_start'
636 # will match each of
637 # diff --git a/foo.foo b/foo.py
638 # @@ -12,2 +14,3 @@
639 # @@ -12,2 +17 @@
640 # running re.findall on the above string with pattern will give
641 # [('foo.py', ''), ('', '14,3'), ('', '17')]
642
643 curr_file = None
644 line_diffs = {}
645 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
646 if match[0] != '':
647 # Will match the second filename in diff --git a/a.py b/b.py.
648 curr_file = match[0]
649 line_diffs[curr_file] = []
650 else:
651 # Matches +14,3
652 if ',' in match[1]:
653 diff_start, diff_count = match[1].split(',')
654 else:
655 # Single line changes are of the form +12 instead of +12,1.
656 diff_start = match[1]
657 diff_count = 1
658
659 diff_start = int(diff_start)
660 diff_count = int(diff_count)
661
662 # If diff_count == 0 this is a removal we can ignore.
663 line_diffs[curr_file].append((diff_start, diff_count))
664
665 return line_diffs
666
667
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000668def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000669 """Checks if a yapf file is in any parent directory of fpath until top_dir.
670
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000671 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000672 is found returns None. Uses yapf_config_cache as a cache for previously found
673 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000674 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000675 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676 # Return result if we've already computed it.
677 if fpath in yapf_config_cache:
678 return yapf_config_cache[fpath]
679
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000680 parent_dir = os.path.dirname(fpath)
681 if os.path.isfile(fpath):
682 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000683 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000684 # Otherwise fpath is a directory
685 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
686 if os.path.isfile(yapf_file):
687 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000688 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000689 # If we're at the top level directory, or if we're at root
690 # there is no provided style.
691 ret = None
692 else:
693 # Otherwise recurse on the current directory.
694 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000695 yapf_config_cache[fpath] = ret
696 return ret
697
698
Brian Sheedyb4307d52019-12-02 19:18:17 +0000699def _GetYapfIgnorePatterns(top_dir):
700 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000701
702 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
703 but this functionality appears to break when explicitly passing files to
704 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000705 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000706 the .yapfignore file should be in the directory that yapf is invoked from,
707 which we assume to be the top level directory in this case.
708
709 Args:
710 top_dir: The top level directory for the repository being formatted.
711
712 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000713 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000714 """
715 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000716 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000717 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000718 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000719
Anthony Politoc64e3902021-04-30 21:55:25 +0000720 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
721 stripped_line = line.strip()
722 # Comments and blank lines should be ignored.
723 if stripped_line.startswith('#') or stripped_line == '':
724 continue
725 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000726 return ignore_patterns
727
728
729def _FilterYapfIgnoredFiles(filepaths, patterns):
730 """Filters out any filepaths that match any of the given patterns.
731
732 Args:
733 filepaths: An iterable of strings containing filepaths to filter.
734 patterns: An iterable of strings containing fnmatch patterns to filter on.
735
736 Returns:
737 A list of strings containing all the elements of |filepaths| that did not
738 match any of the patterns in |patterns|.
739 """
740 # Not inlined so that tests can use the same implementation.
741 return [f for f in filepaths
742 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000743
744
Aaron Gable13101a62018-02-09 13:20:41 -0800745def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000746 """Prints statistics about the change to the user."""
747 # --no-ext-diff is broken in some versions of Git, so try to work around
748 # this by overriding the environment (but there is still a problem if the
749 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000750 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751 if 'GIT_EXTERNAL_DIFF' in env:
752 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000753
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800755 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000756 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757
758
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000759class BuildbucketResponseException(Exception):
760 pass
761
762
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763class Settings(object):
764 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000765 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000766 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000767 self.tree_status_url = None
768 self.viewvc_url = None
769 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000770 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000771 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000772 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000773 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000774 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000775 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000776
Edward Lemur26964072020-02-19 19:18:51 +0000777 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000778 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000779 if self.updated:
780 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000781
Edward Lemur26964072020-02-19 19:18:51 +0000782 # The only value that actually changes the behavior is
783 # autoupdate = "false". Everything else means "true".
784 autoupdate = (
785 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
786
787 cr_settings_file = FindCodereviewSettingsFile()
788 if autoupdate != 'false' and cr_settings_file:
789 LoadCodereviewSettingsFromFile(cr_settings_file)
790 cr_settings_file.close()
791
792 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000793
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000794 @staticmethod
795 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000796 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000797
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000798 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000799 if self.root is None:
800 self.root = os.path.abspath(self.GetRelativeRoot())
801 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000803 def GetTreeStatusUrl(self, error_ok=False):
804 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000805 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
806 if self.tree_status_url is None and not error_ok:
807 DieWithError(
808 'You must configure your tree status URL by running '
809 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 return self.tree_status_url
811
812 def GetViewVCUrl(self):
813 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000814 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000815 return self.viewvc_url
816
rmistry@google.com90752582014-01-14 21:04:50 +0000817 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000818 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000819
rmistry@google.com5626a922015-02-26 14:03:30 +0000820 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000821 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000822 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000823 return run_post_upload_hook == "True"
824
Joanna Wangc8f23e22023-01-19 21:18:10 +0000825 def GetDefaultCCList(self):
826 return self._GetConfig('rietveld.cc')
827
Dirk Pranke6f0df682021-06-25 00:42:33 +0000828 def GetUsePython3(self):
829 return self._GetConfig('rietveld.use-python3')
830
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000831 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000832 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000833 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000834 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
835 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000836 # Default is squash now (http://crbug.com/611892#c23).
837 self.squash_gerrit_uploads = self._GetConfig(
838 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000839 return self.squash_gerrit_uploads
840
Edward Lesmes4de54132020-05-05 19:41:33 +0000841 def GetSquashGerritUploadsOverride(self):
842 """Return True or False if codereview.settings should be overridden.
843
844 Returns None if no override has been defined.
845 """
846 # See also http://crbug.com/611892#c23
847 result = self._GetConfig('gerrit.override-squash-uploads').lower()
848 if result == 'true':
849 return True
850 if result == 'false':
851 return False
852 return None
853
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000854 def GetIsGerrit(self):
855 """Return True if gerrit.host is set."""
856 if self.is_gerrit is None:
857 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
858 return self.is_gerrit
859
tandrii@chromium.org28253532016-04-14 13:46:56 +0000860 def GetGerritSkipEnsureAuthenticated(self):
861 """Return True if EnsureAuthenticated should not be done for Gerrit
862 uploads."""
863 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000864 self.gerrit_skip_ensure_authenticated = self._GetConfig(
865 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000866 return self.gerrit_skip_ensure_authenticated
867
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000868 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000869 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000870 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000871 # Git requires single quotes for paths with spaces. We need to replace
872 # them with double quotes for Windows to treat such paths as a single
873 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000874 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000875 return self.git_editor or None
876
thestig@chromium.org44202a22014-03-11 19:22:18 +0000877 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000878 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000879
880 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000881 return self._GetConfig(
882 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000883
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000884 def GetFormatFullByDefault(self):
885 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000886 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000887 result = (
888 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
889 error_ok=True).strip())
890 self.format_full_by_default = (result == 'true')
891 return self.format_full_by_default
892
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000893 def IsStatusCommitOrderByDate(self):
894 if self.is_status_commit_order_by_date is None:
895 result = (RunGit(['config', '--bool', 'cl.date-order'],
896 error_ok=True).strip())
897 self.is_status_commit_order_by_date = (result == 'true')
898 return self.is_status_commit_order_by_date
899
Edward Lemur26964072020-02-19 19:18:51 +0000900 def _GetConfig(self, key, default=''):
901 self._LazyUpdateIfNeeded()
902 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000903
904
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000905class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000906 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000907 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000908 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000909 DRY_RUN = 'dry_run'
910 COMMIT = 'commit'
911
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000912 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000913
914
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000915class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000916 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000917 self.issue = issue
918 self.patchset = patchset
919 self.hostname = hostname
920
921 @property
922 def valid(self):
923 return self.issue is not None
924
925
Edward Lemurf38bc172019-09-03 21:02:13 +0000926def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000927 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
928 fail_result = _ParsedIssueNumberArgument()
929
Edward Lemur678a6842019-10-03 22:25:05 +0000930 if isinstance(arg, int):
931 return _ParsedIssueNumberArgument(issue=arg)
932 if not isinstance(arg, basestring):
933 return fail_result
934
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000935 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000936 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700937
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000938 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000939 if not url.startswith('http'):
940 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000941 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
942 if url.startswith(short_url):
943 url = gerrit_url + url[len(short_url):]
944 break
945
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000946 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000947 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000948 except ValueError:
949 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200950
Alex Turner30ae6372022-01-04 02:32:52 +0000951 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
952 # URL.
953 if not arg.startswith('http') and '.' not in parsed_url.netloc:
954 return fail_result
955
Edward Lemur678a6842019-10-03 22:25:05 +0000956 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
957 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
958 # Short urls like https://domain/<issue_number> can be used, but don't allow
959 # specifying the patchset (you'd 404), but we allow that here.
960 if parsed_url.path == '/':
961 part = parsed_url.fragment
962 else:
963 part = parsed_url.path
964
965 match = re.match(
966 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
967 if not match:
968 return fail_result
969
970 issue = int(match.group('issue'))
971 patchset = match.group('patchset')
972 return _ParsedIssueNumberArgument(
973 issue=issue,
974 patchset=int(patchset) if patchset else None,
975 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000976
977
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000978def _create_description_from_log(args):
979 """Pulls out the commit log to use as a base for the CL description."""
980 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000981 if len(args) == 1 and args[0] == None:
982 # Handle the case where None is passed as the branch.
983 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000984 if len(args) == 1 and not args[0].endswith('.'):
985 log_args = [args[0] + '..']
986 elif len(args) == 1 and args[0].endswith('...'):
987 log_args = [args[0][:-1]]
988 elif len(args) == 2:
989 log_args = [args[0] + '..' + args[1]]
990 else:
991 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000992 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000993
994
Aaron Gablea45ee112016-11-22 15:14:38 -0800995class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700996 def __init__(self, issue, url):
997 self.issue = issue
998 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800999 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001000
1001 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001002 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001003 self.issue, self.url)
1004
1005
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001006_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001007 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001008 # TODO(tandrii): these two aren't known in Gerrit.
1009 'approval', 'disapproval'])
1010
1011
Joanna Wang6215dd02023-02-07 15:58:03 +00001012# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001013_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001014 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001015 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001016])
1017
1018
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001019class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001020 """Changelist works with one changelist in local branch.
1021
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001022 Notes:
1023 * Not safe for concurrent multi-{thread,process} use.
1024 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001025 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001026 """
1027
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001028 def __init__(self,
1029 branchref=None,
1030 issue=None,
1031 codereview_host=None,
1032 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001033 """Create a new ChangeList instance.
1034
Edward Lemurf38bc172019-09-03 21:02:13 +00001035 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001036 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001038 global settings
1039 if not settings:
1040 # Happens when git_cl.py is used as a utility library.
1041 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001042
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 self.branchref = branchref
1044 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001045 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001046 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 else:
1048 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001049 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001050 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001051 self.lookedup_issue = False
1052 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001053 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001054 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001055 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001056 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001057 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001058 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001059 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001060
Edward Lemur125d60a2019-09-13 18:25:41 +00001061 # Lazily cached values.
1062 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1063 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001064 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001065 # Map from change number (issue) to its detail cache.
1066 self._detail_cache = {}
1067
1068 if codereview_host is not None:
1069 assert not codereview_host.startswith('https://'), codereview_host
1070 self._gerrit_host = codereview_host
1071 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001072
Edward Lesmese1576912021-02-16 21:53:34 +00001073 @property
1074 def owners_client(self):
1075 if self._owners_client is None:
1076 remote, remote_branch = self.GetRemoteBranch()
1077 branch = GetTargetRef(remote, remote_branch, None)
1078 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001079 host=self.GetGerritHost(),
1080 project=self.GetGerritProject(),
1081 branch=branch)
1082 return self._owners_client
1083
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001084 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001085 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001086
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001087 The return value is a string suitable for passing to git cl with the --cc
1088 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001089 """
1090 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001091 base_cc = settings.GetDefaultCCList()
1092 more_cc = ','.join(self.more_cc)
1093 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001094 return self.cc
1095
Daniel Cheng7227d212017-11-17 08:12:37 -08001096 def ExtendCC(self, more_cc):
1097 """Extends the list of users to cc on this CL based on the changed files."""
1098 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001100 def GetCommitDate(self):
1101 """Returns the commit date as provided in the constructor"""
1102 return self.commit_date
1103
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001104 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001105 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001106 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001107 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001108 if not branchref:
1109 return None
1110 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001111 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001112 return self.branch
1113
1114 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001115 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 self.GetBranch() # Poke the lazy loader.
1117 return self.branchref
1118
Edward Lemur85153282020-02-14 22:06:29 +00001119 def _GitGetBranchConfigValue(self, key, default=None):
1120 return scm.GIT.GetBranchConfig(
1121 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001122
Edward Lemur85153282020-02-14 22:06:29 +00001123 def _GitSetBranchConfigValue(self, key, value):
1124 action = 'set %s to %r' % (key, value)
1125 if not value:
1126 action = 'unset %s' % key
1127 assert self.GetBranch(), 'a branch is needed to ' + action
1128 return scm.GIT.SetBranchConfig(
1129 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001130
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001131 @staticmethod
1132 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001133 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001134 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001136 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1137 settings.GetRoot(), branch)
1138 if not remote or not upstream_branch:
1139 DieWithError(
1140 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001141 'Verify this branch is set up to track another \n'
1142 '(via the --track argument to "git checkout -b ..."). \n'
1143 'or pass complete "git diff"-style arguments if supported, like\n'
1144 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145
1146 return remote, upstream_branch
1147
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001148 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001149 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001150 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001151 DieWithError('The upstream for the current branch (%s) does not exist '
1152 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001153 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001154 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001155
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001156 def GetUpstreamBranch(self):
1157 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001158 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001159 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001160 upstream_branch = upstream_branch.replace('refs/heads/',
1161 'refs/remotes/%s/' % remote)
1162 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1163 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001164 self.upstream_branch = upstream_branch
1165 return self.upstream_branch
1166
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001168 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 remote, branch = None, self.GetBranch()
1170 seen_branches = set()
1171 while branch not in seen_branches:
1172 seen_branches.add(branch)
1173 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001174 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001175 if remote != '.' or branch.startswith('refs/remotes'):
1176 break
1177 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001178 remotes = RunGit(['remote'], error_ok=True).split()
1179 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001180 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001181 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001182 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001183 logging.warning('Could not determine which remote this change is '
1184 'associated with, so defaulting to "%s".' %
1185 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001186 else:
Gavin Make6a62332020-12-04 21:57:10 +00001187 logging.warning('Could not determine which remote this change is '
1188 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001189 branch = 'HEAD'
1190 if branch.startswith('refs/remotes'):
1191 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001192 elif branch.startswith('refs/branch-heads/'):
1193 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001194 else:
1195 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001196 return self._remote
1197
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001198 def GetRemoteUrl(self):
1199 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1200
1201 Returns None if there is no remote.
1202 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001203 is_cached, value = self._cached_remote_url
1204 if is_cached:
1205 return value
1206
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001207 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001208 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001209
Edward Lemur298f2cf2019-02-22 21:40:39 +00001210 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001211 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001212 if host:
1213 self._cached_remote_url = (True, url)
1214 return url
1215
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001216 # If it cannot be parsed as an url, assume it is a local directory,
1217 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001218 logging.warning('"%s" doesn\'t appear to point to a git host. '
1219 'Interpreting it as a local directory.', url)
1220 if not os.path.isdir(url):
1221 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001222 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1223 'but it doesn\'t exist.',
1224 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001225 return None
1226
1227 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001228 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001229
Edward Lemur79d4f992019-11-11 23:49:02 +00001230 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001231 if not host:
1232 logging.error(
1233 'Remote "%(remote)s" for branch "%(branch)s" points to '
1234 '"%(cache_path)s", but it is misconfigured.\n'
1235 '"%(cache_path)s" must be a git repo and must have a remote named '
1236 '"%(remote)s" pointing to the git host.', {
1237 'remote': remote,
1238 'cache_path': cache_path,
1239 'branch': self.GetBranch()})
1240 return None
1241
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001242 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001243 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001244
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001245 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001246 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001247 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001248 if self.GetBranch():
1249 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001250 if self.issue is not None:
1251 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001252 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 return self.issue
1254
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001255 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001256 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001257 issue = self.GetIssue()
1258 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001259 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001260 server = self.GetCodereviewServer()
1261 if short:
1262 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1263 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001264
Dirk Pranke6f0df682021-06-25 00:42:33 +00001265 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001266 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001267
Edward Lemur6c6827c2020-02-06 21:15:18 +00001268 def FetchDescription(self, pretty=False):
1269 assert self.GetIssue(), 'issue is required to query Gerrit'
1270
Edward Lemur9aa1a962020-02-25 00:58:38 +00001271 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001272 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1273 current_rev = data['current_revision']
1274 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001275
1276 if not pretty:
1277 return self.description
1278
1279 # Set width to 72 columns + 2 space indent.
1280 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1281 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1282 lines = self.description.splitlines()
1283 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284
1285 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001286 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001287 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001288 if self.GetBranch():
1289 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001290 if self.patchset is not None:
1291 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001292 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293 return self.patchset
1294
Edward Lemur9aa1a962020-02-25 00:58:38 +00001295 def GetAuthor(self):
1296 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1297
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001299 """Set this branch's patchset. If patchset=0, clears the patchset."""
1300 assert self.GetBranch()
1301 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001302 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001303 else:
1304 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001305 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001306
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001307 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001308 """Set this branch's issue. If issue isn't given, clears the issue."""
1309 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001310 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001311 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001312 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001313 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001314 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001315 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001316 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001317 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001318 else:
tandrii5d48c322016-08-18 16:19:37 -07001319 # Reset all of these just to be clean.
1320 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001321 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001322 ISSUE_CONFIG_KEY,
1323 PATCHSET_CONFIG_KEY,
1324 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001325 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001326 ]
tandrii5d48c322016-08-18 16:19:37 -07001327 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001328 try:
1329 self._GitSetBranchConfigValue(prop, None)
1330 except subprocess2.CalledProcessError:
1331 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001332 msg = RunGit(['log', '-1', '--format=%B']).strip()
1333 if msg and git_footers.get_footer_change_id(msg):
1334 print('WARNING: The change patched into this branch has a Change-Id. '
1335 'Removing it.')
1336 RunGit(['commit', '--amend', '-m',
1337 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001338 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001339 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001340 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001341
Joanna Wangb46232e2023-01-21 01:58:46 +00001342 def GetAffectedFiles(self, upstream, end_commit=None):
1343 # type: (str, Optional[str]) -> Sequence[str]
1344 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001345 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001346 return [
1347 f for _, f in scm.GIT.CaptureStatus(
1348 settings.GetRoot(), upstream, end_commit=end_commit)
1349 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001350 except subprocess2.CalledProcessError:
1351 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001352 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001353 'This branch probably doesn\'t exist anymore. To reset the\n'
1354 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001355 ' git branch --set-upstream-to origin/main %s\n'
1356 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001357 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001358
dsansomee2d6fd92016-09-08 00:10:47 -07001359 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001360 assert self.GetIssue(), 'issue is required to update description'
1361
1362 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001363 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001364 if not force:
1365 confirm_or_exit(
1366 'The description cannot be modified while the issue has a pending '
1367 'unpublished edit. Either publish the edit in the Gerrit web UI '
1368 'or delete it.\n\n', action='delete the unpublished edit')
1369
1370 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001371 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001372 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001373 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001374 description, notify='NONE')
1375
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001376 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001377
Edward Lemur75526302020-02-27 22:31:05 +00001378 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001379 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001380 '--root', settings.GetRoot(),
1381 '--upstream', upstream,
1382 ]
1383
1384 args.extend(['--verbose'] * verbose)
1385
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001386 remote, remote_branch = self.GetRemoteBranch()
1387 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001388 if settings.GetIsGerrit():
1389 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1390 args.extend(['--gerrit_project', self.GetGerritProject()])
1391 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001392
Edward Lemur99df04e2020-03-05 19:39:43 +00001393 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001394 issue = self.GetIssue()
1395 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001396 if author:
1397 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001398 if issue:
1399 args.extend(['--issue', str(issue)])
1400 if patchset:
1401 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001402
Edward Lemur75526302020-02-27 22:31:05 +00001403 return args
1404
Josip Sokcevic017544d2022-03-31 23:47:53 +00001405 def RunHook(self,
1406 committing,
1407 may_prompt,
1408 verbose,
1409 parallel,
1410 upstream,
1411 description,
1412 all_files,
1413 files=None,
1414 resultdb=False,
1415 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001416 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1417 args = self._GetCommonPresubmitArgs(verbose, upstream)
1418 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001419 if may_prompt:
1420 args.append('--may_prompt')
1421 if parallel:
1422 args.append('--parallel')
1423 if all_files:
1424 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001425 if files:
1426 args.extend(files.split(';'))
1427 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001428 if files or all_files:
1429 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001430
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001431 if resultdb and not realm:
1432 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1433 # it is not required to pass the realm flag
1434 print('Note: ResultDB reporting will NOT be performed because --realm'
1435 ' was not specified. To enable ResultDB, please run the command'
1436 ' again with the --realm argument to specify the LUCI realm.')
1437
Bruce Dawson8454fc22023-03-07 22:15:25 +00001438 return self._RunPresubmit(args,
1439 description,
1440 use_python3=True,
1441 resultdb=resultdb,
1442 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001443
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001444 def _RunPresubmit(self,
1445 args,
1446 description,
1447 use_python3,
1448 resultdb=None,
1449 realm=None):
1450 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1451 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001452 args = args[:]
1453 vpython = 'vpython3' if use_python3 else 'vpython'
1454
Edward Lemur227d5102020-02-25 23:45:35 +00001455 with gclient_utils.temporary_file() as description_file:
1456 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001457 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001458 args.extend(['--json_output', json_output])
1459 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001460 if self.GetUsePython3():
1461 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001462 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001463 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001464 if resultdb and realm:
1465 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001466
1467 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001468 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001469
Edward Lemur227d5102020-02-25 23:45:35 +00001470 metrics.collector.add_repeated('sub_commands', {
1471 'command': 'presubmit',
1472 'execution_time': time_time() - start,
1473 'exit_code': exit_code,
1474 })
1475
1476 if exit_code:
1477 sys.exit(exit_code)
1478
1479 json_results = gclient_utils.FileRead(json_output)
1480 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001481
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001482 def _MergePresubmitResults(self, py2_results, py3_results):
1483 return {
1484 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1485 py3_results.get('more_cc', []))),
1486 'errors': (
1487 py2_results.get('errors', []) + py3_results.get('errors', [])),
1488 'notifications': (
1489 py2_results.get('notifications', []) +
1490 py3_results.get('notifications', [])),
1491 'warnings': (
1492 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1493 }
1494
Brian Sheedy7326ca22022-11-02 18:36:17 +00001495 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001496 args = self._GetCommonPresubmitArgs(verbose, upstream)
1497 args.append('--post_upload')
1498
1499 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001500 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001501 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001502 if not py3_only:
1503 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001504 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1505 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001506 if not py3_only:
1507 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001508 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001509
Edward Lemur5a644f82020-03-18 16:44:57 +00001510 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001511 # type: (optparse.Values, Sequence[str], Sequence[str]
1512 # ) -> ChangeDescription
1513 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001514 if self.GetIssue():
1515 description = self.FetchDescription()
1516 elif options.message:
1517 description = options.message
1518 else:
1519 description = _create_description_from_log(git_diff_args)
1520 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001521 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001522
Edward Lemur5a644f82020-03-18 16:44:57 +00001523 bug = options.bug
1524 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001525 if not self.GetIssue():
1526 # Extract bug number from branch name, but only if issue is being created.
1527 # It must start with bug or fix, followed by _ or - and number.
1528 # Optionally, it may contain _ or - after number with arbitrary text.
1529 # Examples:
1530 # bug-123
1531 # bug_123
1532 # fix-123
1533 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001534 branch = self.GetBranch()
1535 if branch is not None:
1536 match = re.match(
1537 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1538 if not bug and not fixed and match:
1539 if match.group('type') == 'bug':
1540 bug = match.group('bugnum')
1541 else:
1542 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001543
1544 change_description = ChangeDescription(description, bug, fixed)
1545
Joanna Wang39811b12023-01-20 23:09:48 +00001546 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001547 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001548 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001549 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001550 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001551 missing_files = [
1552 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001553 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001554 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001555 owners = self.owners_client.SuggestOwners(
1556 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001557 assert isinstance(options.reviewers, list), options.reviewers
1558 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001559
Edward Lemur5a644f82020-03-18 16:44:57 +00001560 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001561 if options.reviewers:
1562 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001563
1564 return change_description
1565
Joanna Wanga1abbed2023-01-24 01:41:05 +00001566 def _GetTitleForUpload(self, options, multi_change_upload=False):
1567 # type: (optparse.Values, Optional[bool]) -> str
1568
1569 # Getting titles for multipl commits is not supported so we return the
1570 # default.
1571 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001572 return options.title
1573
1574 # On first upload, patchset title is always this string, while options.title
1575 # gets converted to first line of message.
1576 if not self.GetIssue():
1577 return 'Initial upload'
1578
1579 # When uploading subsequent patchsets, options.message is taken as the title
1580 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001581 if options.message:
1582 return options.message.strip()
1583
1584 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001585 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001586 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001587 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001588 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001589
1590 # Use the default title if the user confirms the default with a 'y'.
1591 if user_title.lower() == 'y':
1592 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001593 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001594
Joanna Wang562481d2023-01-26 21:57:14 +00001595 def _GetRefSpecOptions(self,
1596 options,
1597 change_desc,
1598 multi_change_upload=False,
1599 dogfood_path=False):
1600 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1601 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001602
1603 # Extra options that can be specified at push time. Doc:
1604 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1605 refspec_opts = []
1606
1607 # By default, new changes are started in WIP mode, and subsequent patchsets
1608 # don't send email. At any time, passing --send-mail or --send-email will
1609 # mark the change ready and send email for that particular patch.
1610 if options.send_mail:
1611 refspec_opts.append('ready')
1612 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001613 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001614 refspec_opts.append('wip')
1615 else:
1616 refspec_opts.append('notify=NONE')
1617
1618 # TODO(tandrii): options.message should be posted as a comment if
1619 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1620 # to do it.
1621
1622 # Set options.title in case user was prompted in _GetTitleForUpload and
1623 # _CMDUploadChange needs to be called again.
1624 options.title = self._GetTitleForUpload(
1625 options, multi_change_upload=multi_change_upload)
1626
1627 if options.title:
1628 # Punctuation and whitespace in |title| must be percent-encoded.
1629 refspec_opts.append('m=' +
1630 gerrit_util.PercentEncodeForGitRef(options.title))
1631
1632 if options.private:
1633 refspec_opts.append('private')
1634
1635 if options.topic:
1636 # Documentation on Gerrit topics is here:
1637 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1638 refspec_opts.append('topic=%s' % options.topic)
1639
1640 if options.enable_auto_submit:
1641 refspec_opts.append('l=Auto-Submit+1')
1642 if options.set_bot_commit:
1643 refspec_opts.append('l=Bot-Commit+1')
1644 if options.use_commit_queue:
1645 refspec_opts.append('l=Commit-Queue+2')
1646 elif options.cq_dry_run:
1647 refspec_opts.append('l=Commit-Queue+1')
1648 elif options.cq_quick_run:
1649 refspec_opts.append('l=Commit-Queue+1')
1650 refspec_opts.append('l=Quick-Run+1')
1651
1652 if change_desc.get_reviewers(tbr_only=True):
1653 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1654 self.GetGerritProject())
1655 refspec_opts.append('l=Code-Review+%s' % score)
1656
Joanna Wang40497912023-01-24 21:18:16 +00001657 # Gerrit sorts hashtags, so order is not important.
1658 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1659 # We check GetIssue because we only add hashtags from the
1660 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001661 # TODO(b/265929888): When we fully launch the new path:
1662 # 1) remove fetching hashtags from description alltogether
1663 # 2) Or use descrtiption hashtags for:
1664 # `not (self.GetIssue() and multi_change_upload)`
1665 # 3) Or enabled change description tags for multi and single changes
1666 # by adding them post `git push`.
1667 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001668 hashtags.update(change_desc.get_hash_tags())
1669 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001670
1671 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001672 # branch/change.
1673 return refspec_opts
1674
Joanna Wang6215dd02023-02-07 15:58:03 +00001675 def PrepareSquashedCommit(self, options, parent, end_commit=None):
1676 # type: (optparse.Values, str, Optional[str]) -> _NewUpload()
Joanna Wangb88a4342023-01-24 01:28:22 +00001677 """Create a squashed commit to upload."""
Joanna Wangb88a4342023-01-24 01:28:22 +00001678
1679 if end_commit is None:
1680 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1681
1682 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1683 end_commit)
1684 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1685 with gclient_utils.temporary_file() as desc_tempfile:
1686 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1687 commit_to_push = RunGit(
1688 ['commit-tree', latest_tree, '-p', parent, '-F',
1689 desc_tempfile]).strip()
1690
Joanna Wang7603f042023-03-01 22:17:36 +00001691 # Gerrit may or may not update fast enough to return the correct patchset
1692 # number after we push. Get the pre-upload patchset and increment later.
1693 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001694 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001695 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001696
Joanna Wang6215dd02023-02-07 15:58:03 +00001697 def PrepareCherryPickSquashedCommit(self, options, parent):
1698 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001699 """Create a commit cherry-picked on parent to push."""
1700
Joanna Wang6215dd02023-02-07 15:58:03 +00001701 # The `parent` is what we will cherry-pick on top of.
1702 # The `cherry_pick_base` is the beginning range of what
1703 # we are cherry-picking.
1704 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1705 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001706 self.branchref)
1707
1708 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1709 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1710 with gclient_utils.temporary_file() as desc_tempfile:
1711 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001712 commit_to_cp = RunGit([
1713 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1714 desc_tempfile
1715 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001716
Joanna Wang6215dd02023-02-07 15:58:03 +00001717 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001718 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1719 if ret:
1720 RunGit(['cherry-pick', '--abort'])
1721 RunGit(['checkout', '-q', self.branch])
1722 DieWithError('Could not cleanly cherry-pick')
1723
Joanna Wang6215dd02023-02-07 15:58:03 +00001724 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001725 RunGit(['checkout', '-q', self.branch])
1726
Joanna Wang7603f042023-03-01 22:17:36 +00001727 # Gerrit may or may not update fast enough to return the correct patchset
1728 # number after we push. Get the pre-upload patchset and increment later.
1729 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001730 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001731 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001732
Joanna Wangb46232e2023-01-21 01:58:46 +00001733 def _PrepareChange(self, options, parent, end_commit):
1734 # type: (optparse.Values, str, str) ->
1735 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1736 """Prepares the change to be uploaded."""
1737 self.EnsureCanUploadPatchset(options.force)
1738
1739 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1740 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1741 files)
1742
1743 watchlist = watchlists.Watchlists(settings.GetRoot())
1744 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1745 if not options.bypass_hooks:
1746 hook_results = self.RunHook(committing=False,
1747 may_prompt=not options.force,
1748 verbose=options.verbose,
1749 parallel=options.parallel,
1750 upstream=parent,
1751 description=change_desc.description,
1752 all_files=False)
1753 self.ExtendCC(hook_results['more_cc'])
1754
1755 # Update the change description and ensure we have a Change Id.
1756 if self.GetIssue():
1757 if options.edit_description:
1758 change_desc.prompt()
1759 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1760 change_id = change_detail['change_id']
1761 change_desc.ensure_change_id(change_id)
1762
Joanna Wangb46232e2023-01-21 01:58:46 +00001763 else: # No change issue. First time uploading
1764 if not options.force and not options.message_file:
1765 change_desc.prompt()
1766
1767 # Check if user added a change_id in the descripiton.
1768 change_ids = git_footers.get_footer_change_id(change_desc.description)
1769 if len(change_ids) == 1:
1770 change_id = change_ids[0]
1771 else:
1772 change_id = GenerateGerritChangeId(change_desc.description)
1773 change_desc.ensure_change_id(change_id)
1774
1775 if options.preserve_tryjobs:
1776 change_desc.set_preserve_tryjobs()
1777
1778 SaveDescriptionBackup(change_desc)
1779
1780 # Add ccs
1781 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001782 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001783 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001784 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001785 ccs = self.GetCCList().split(',')
1786 if len(ccs) > 100:
1787 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1788 'process/lsc/lsc_workflow.md')
1789 print('WARNING: This will auto-CC %s users.' % len(ccs))
1790 print('LSC may be more appropriate: %s' % lsc)
1791 print('You can also use the --no-autocc flag to disable auto-CC.')
1792 confirm_or_exit(action='continue')
1793
1794 # Add ccs from the --cc flag.
1795 if options.cc:
1796 ccs.extend(options.cc)
1797
1798 ccs = [email.strip() for email in ccs if email.strip()]
1799 if change_desc.get_cced():
1800 ccs.extend(change_desc.get_cced())
1801
1802 return change_desc.get_reviewers(), ccs, change_desc
1803
Joanna Wang40497912023-01-24 21:18:16 +00001804 def PostUploadUpdates(self, options, new_upload, change_number):
1805 # type: (optparse.Values, _NewUpload, change_number) -> None
1806 """Makes necessary post upload changes to the local and remote cl."""
1807 if not self.GetIssue():
1808 self.SetIssue(change_number)
1809
Joanna Wang7603f042023-03-01 22:17:36 +00001810 self.SetPatchset(new_upload.prev_patchset + 1)
1811
Joanna Wang40497912023-01-24 21:18:16 +00001812 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1813 new_upload.commit_to_push)
1814 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1815 new_upload.new_last_uploaded_commit)
1816
1817 if settings.GetRunPostUploadHook():
1818 self.RunPostUploadHook(options.verbose, new_upload.parent,
1819 new_upload.change_desc.description,
1820 options.no_python2_post_upload_hooks)
1821
1822 if new_upload.reviewers or new_upload.ccs:
1823 gerrit_util.AddReviewers(self.GetGerritHost(),
1824 self._GerritChangeIdentifier(),
1825 reviewers=new_upload.reviewers,
1826 ccs=new_upload.ccs,
1827 notify=bool(options.send_mail))
1828
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001829 def CMDUpload(self, options, git_diff_args, orig_args):
1830 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001831 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001832 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001833 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001834 else:
1835 if self.GetBranch() is None:
1836 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1837
1838 # Default to diffing against common ancestor of upstream branch
1839 base_branch = self.GetCommonAncestorWithUpstream()
1840 git_diff_args = [base_branch, 'HEAD']
1841
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001842 # Fast best-effort checks to abort before running potentially expensive
1843 # hooks if uploading is likely to fail anyway. Passing these checks does
1844 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001845 self.EnsureAuthenticated(force=options.force)
1846 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001847
1848 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001849 watchlist = watchlists.Watchlists(settings.GetRoot())
1850 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001851 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001852 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001853
Edward Lemur5a644f82020-03-18 16:44:57 +00001854 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001855 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001856 hook_results = self.RunHook(committing=False,
1857 may_prompt=not options.force,
1858 verbose=options.verbose,
1859 parallel=options.parallel,
1860 upstream=base_branch,
1861 description=change_desc.description,
1862 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001863 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001864
Aaron Gable13101a62018-02-09 13:20:41 -08001865 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001866 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001867 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001868 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001869 if self.GetBranch() is not None:
1870 self._GitSetBranchConfigValue(
1871 LAST_UPLOAD_HASH_CONFIG_KEY,
1872 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001873 # Run post upload hooks, if specified.
1874 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001875 self.RunPostUploadHook(options.verbose, base_branch,
1876 change_desc.description,
1877 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001878
1879 # Upload all dependencies if specified.
1880 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001881 print()
1882 print('--dependencies has been specified.')
1883 print('All dependent local branches will be re-uploaded.')
1884 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001885 # Remove the dependencies flag from args so that we do not end up in a
1886 # loop.
1887 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001888 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001889 return ret
1890
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001891 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001892 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001893
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001894 Issue must have been already uploaded and known. Optionally allows for
1895 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001896 """
1897 assert new_state in _CQState.ALL_STATES
1898 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001899 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001900 vote_map = {
1901 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001902 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001903 _CQState.DRY_RUN: 1,
1904 _CQState.COMMIT: 2,
1905 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001906 if new_state == _CQState.QUICK_RUN:
1907 labels = {
1908 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1909 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1910 }
1911 else:
1912 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001913 notify = False if new_state == _CQState.DRY_RUN else None
1914 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001915 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001916 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001917 return 0
1918 except KeyboardInterrupt:
1919 raise
1920 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001921 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001922 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001923 ' * Your project has no CQ,\n'
1924 ' * You don\'t have permission to change the CQ state,\n'
1925 ' * There\'s a bug in this code (see stack trace below).\n'
1926 'Consider specifying which bots to trigger manually or asking your '
1927 'project owners for permissions or contacting Chrome Infra at:\n'
1928 'https://www.chromium.org/infra\n\n' %
1929 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001930 # Still raise exception so that stack trace is printed.
1931 raise
1932
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001933 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001934 # Lazy load of configs.
1935 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001936 if self._gerrit_host and '.' not in self._gerrit_host:
1937 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1938 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001939 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001940 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001941 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001942 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001943 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1944 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001945 return self._gerrit_host
1946
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001947 def _GetGitHost(self):
1948 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001949 remote_url = self.GetRemoteUrl()
1950 if not remote_url:
1951 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001952 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001953
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001954 def GetCodereviewServer(self):
1955 if not self._gerrit_server:
1956 # If we're on a branch then get the server potentially associated
1957 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001958 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001959 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001960 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001961 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001962 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001963 if not self._gerrit_server:
1964 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1965 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001966 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001967 parts[0] = parts[0] + '-review'
1968 self._gerrit_host = '.'.join(parts)
1969 self._gerrit_server = 'https://%s' % self._gerrit_host
1970 return self._gerrit_server
1971
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001972 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001973 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001974 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001975 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001976 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001977 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001978 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001979 if project.endswith('.git'):
1980 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001981 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1982 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1983 # gitiles/git-over-https protocol. E.g.,
1984 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1985 # as
1986 # https://chromium.googlesource.com/v8/v8
1987 if project.startswith('a/'):
1988 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001989 return project
1990
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001991 def _GerritChangeIdentifier(self):
1992 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1993
1994 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001995 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001996 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001997 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001998 if project:
1999 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2000 # Fall back on still unique, but less efficient change number.
2001 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002002
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002003 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002004 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002005 if settings.GetGerritSkipEnsureAuthenticated():
2006 # For projects with unusual authentication schemes.
2007 # See http://crbug.com/603378.
2008 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002009
2010 # Check presence of cookies only if using cookies-based auth method.
2011 cookie_auth = gerrit_util.Authenticator.get()
2012 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002013 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002014
Florian Mayerae510e82020-01-30 21:04:48 +00002015 remote_url = self.GetRemoteUrl()
2016 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002017 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002018 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002019 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2020 logging.warning(
2021 'Ignoring branch %(branch)s with non-https/sso remote '
2022 '%(remote)s', {
2023 'branch': self.branch,
2024 'remote': self.GetRemoteUrl()
2025 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002026 return
2027
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002028 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002029 self.GetCodereviewServer()
2030 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002031 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002032
2033 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2034 git_auth = cookie_auth.get_auth_header(git_host)
2035 if gerrit_auth and git_auth:
2036 if gerrit_auth == git_auth:
2037 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002038 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002039 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002040 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002041 ' %s\n'
2042 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002043 ' Consider running the following command:\n'
2044 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002045 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002046 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002047 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002048 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002049 cookie_auth.get_new_password_message(git_host)))
2050 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002051 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002052 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002053
2054 missing = (
2055 ([] if gerrit_auth else [self._gerrit_host]) +
2056 ([] if git_auth else [git_host]))
2057 DieWithError('Credentials for the following hosts are required:\n'
2058 ' %s\n'
2059 'These are read from %s (or legacy %s)\n'
2060 '%s' % (
2061 '\n '.join(missing),
2062 cookie_auth.get_gitcookies_path(),
2063 cookie_auth.get_netrc_path(),
2064 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002065
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002066 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002067 if not self.GetIssue():
2068 return
2069
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002070 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002071 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002072 DieWithError(
2073 'Change %s has been abandoned, new uploads are not allowed' %
2074 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002075 if status == 'MERGED':
2076 answer = gclient_utils.AskForData(
2077 'Change %s has been submitted, new uploads are not allowed. '
2078 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2079 ).lower()
2080 if answer not in ('y', ''):
2081 DieWithError('New uploads are not allowed.')
2082 self.SetIssue()
2083 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002084
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002085 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2086 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2087 # Apparently this check is not very important? Otherwise get_auth_email
2088 # could have been added to other implementations of Authenticator.
2089 cookies_auth = gerrit_util.Authenticator.get()
2090 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002091 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002092
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002093 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002094 if self.GetIssueOwner() == cookies_user:
2095 return
2096 logging.debug('change %s owner is %s, cookies user is %s',
2097 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002098 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002099 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002100 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002101 if details['email'] == self.GetIssueOwner():
2102 return
2103 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002104 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002105 'as %s.\n'
2106 'Uploading may fail due to lack of permissions.' %
2107 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2108 confirm_or_exit(action='upload')
2109
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002110 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002111 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002112 or CQ status, assuming adherence to a common workflow.
2113
2114 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002115 * 'error' - error from review tool (including deleted issues)
2116 * 'unsent' - no reviewers added
2117 * 'waiting' - waiting for review
2118 * 'reply' - waiting for uploader to reply to review
2119 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002120 * 'dry-run' - dry-running in the CQ
2121 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002122 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002123 """
2124 if not self.GetIssue():
2125 return None
2126
2127 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002128 data = self._GetChangeDetail([
2129 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002130 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002131 return 'error'
2132
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002133 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002134 return 'closed'
2135
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002136 cq_label = data['labels'].get('Commit-Queue', {})
2137 max_cq_vote = 0
2138 for vote in cq_label.get('all', []):
2139 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2140 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002141 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002142 if max_cq_vote == 1:
2143 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002144
Aaron Gable9ab38c62017-04-06 14:36:33 -07002145 if data['labels'].get('Code-Review', {}).get('approved'):
2146 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002147
2148 if not data.get('reviewers', {}).get('REVIEWER', []):
2149 return 'unsent'
2150
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002151 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002152 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002153 while messages:
2154 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002155 if (m.get('tag', '').startswith('autogenerated:cq') or
2156 m.get('tag', '').startswith('autogenerated:cv')):
2157 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002158 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002159 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002160 # Most recent message was by owner.
2161 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002162
2163 # Some reply from non-owner.
2164 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002165
2166 # Somehow there are no messages even though there are reviewers.
2167 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002168
Gavin Mak4e5e3992022-11-14 22:40:12 +00002169 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002170 if not self.GetIssue():
2171 return None
2172
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002173 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002174 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002175 if update:
2176 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002177 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002178
Gavin Makf35a9eb2022-11-17 18:34:36 +00002179 def _IsPatchsetRangeSignificant(self, lower, upper):
2180 """Returns True if the inclusive range of patchsets contains any reworks or
2181 rebases."""
2182 if not self.GetIssue():
2183 return False
2184
2185 data = self._GetChangeDetail(['ALL_REVISIONS'])
2186 ps_kind = {}
2187 for rev_info in data.get('revisions', {}).values():
2188 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2189
2190 for ps in range(lower, upper + 1):
2191 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2192 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2193 return True
2194 return False
2195
Gavin Make61ccc52020-11-13 00:12:57 +00002196 def GetMostRecentDryRunPatchset(self):
2197 """Get patchsets equivalent to the most recent patchset and return
2198 the patchset with the latest dry run. If none have been dry run, return
2199 the latest patchset."""
2200 if not self.GetIssue():
2201 return None
2202
2203 data = self._GetChangeDetail(['ALL_REVISIONS'])
2204 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002205 dry_run = {int(m['_revision_number'])
2206 for m in data.get('messages', [])
2207 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002208
2209 for revision_info in sorted(data.get('revisions', {}).values(),
2210 key=lambda c: c['_number'], reverse=True):
2211 if revision_info['_number'] in dry_run:
2212 patchset = revision_info['_number']
2213 break
2214 if revision_info.get('kind', '') not in \
2215 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2216 break
2217 self.SetPatchset(patchset)
2218 return patchset
2219
Aaron Gable636b13f2017-07-14 10:42:48 -07002220 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002221 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002222 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002223 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002224
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002225 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002226 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002227 # CURRENT_REVISION is included to get the latest patchset so that
2228 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002229 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002230 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2231 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002232 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002233 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002234 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002235 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002236
2237 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002238 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002239 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002240 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002241 line_comments = file_comments.setdefault(path, [])
2242 line_comments.extend(
2243 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002244
2245 # Build dictionary of file comments for easy access and sorting later.
2246 # {author+date: {path: {patchset: {line: url+message}}}}
2247 comments = collections.defaultdict(
2248 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002249
2250 server = self.GetCodereviewServer()
2251 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2252 # /c/ is automatically added by short URL server.
2253 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2254 self.GetIssue())
2255 else:
2256 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2257
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002258 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002259 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002260 tag = comment.get('tag', '')
2261 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002262 continue
2263 key = (comment['author']['email'], comment['updated'])
2264 if comment.get('side', 'REVISION') == 'PARENT':
2265 patchset = 'Base'
2266 else:
2267 patchset = 'PS%d' % comment['patch_set']
2268 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002269 url = ('%s/%s/%s#%s%s' %
2270 (url_prefix, comment['patch_set'], path,
2271 'b' if comment.get('side') == 'PARENT' else '',
2272 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002273 comments[key][path][patchset][line] = (url, comment['message'])
2274
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002275 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002276 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002277 summary = self._BuildCommentSummary(msg, comments, readable)
2278 if summary:
2279 summaries.append(summary)
2280 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002281
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002282 @staticmethod
2283 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002284 if 'email' not in msg['author']:
2285 # Some bot accounts may not have an email associated.
2286 return None
2287
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002288 key = (msg['author']['email'], msg['date'])
2289 # Don't bother showing autogenerated messages that don't have associated
2290 # file or line comments. this will filter out most autogenerated
2291 # messages, but will keep robot comments like those from Tricium.
2292 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2293 if is_autogenerated and not comments.get(key):
2294 return None
2295 message = msg['message']
2296 # Gerrit spits out nanoseconds.
2297 assert len(msg['date'].split('.')[-1]) == 9
2298 date = datetime.datetime.strptime(msg['date'][:-3],
2299 '%Y-%m-%d %H:%M:%S.%f')
2300 if key in comments:
2301 message += '\n'
2302 for path, patchsets in sorted(comments.get(key, {}).items()):
2303 if readable:
2304 message += '\n%s' % path
2305 for patchset, lines in sorted(patchsets.items()):
2306 for line, (url, content) in sorted(lines.items()):
2307 if line:
2308 line_str = 'Line %d' % line
2309 path_str = '%s:%d:' % (path, line)
2310 else:
2311 line_str = 'File comment'
2312 path_str = '%s:0:' % path
2313 if readable:
2314 message += '\n %s, %s: %s' % (patchset, line_str, url)
2315 message += '\n %s\n' % content
2316 else:
2317 message += '\n%s ' % path_str
2318 message += '\n%s\n' % content
2319
2320 return _CommentSummary(
2321 date=date,
2322 message=message,
2323 sender=msg['author']['email'],
2324 autogenerated=is_autogenerated,
2325 # These could be inferred from the text messages and correlated with
2326 # Code-Review label maximum, however this is not reliable.
2327 # Leaving as is until the need arises.
2328 approval=False,
2329 disapproval=False,
2330 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002331
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002332 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002333 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002334 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002335
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002336 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002337 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002338 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002339
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002340 def _GetChangeDetail(self, options=None):
2341 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002342 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002343 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002344
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002345 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002346 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002347 options.append('CURRENT_COMMIT')
2348
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002349 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002350 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002351 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002352
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002353 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2354 # Assumption: data fetched before with extra options is suitable
2355 # for return for a smaller set of options.
2356 # For example, if we cached data for
2357 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2358 # and request is for options=[CURRENT_REVISION],
2359 # THEN we can return prior cached data.
2360 if options_set.issubset(cached_options_set):
2361 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002362
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002363 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002364 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002365 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002366 except gerrit_util.GerritError as e:
2367 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002368 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002369 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002370
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002371 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002372 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002373
Gavin Mak4e5e3992022-11-14 22:40:12 +00002374 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002375 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002376 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002377 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2378 self._GerritChangeIdentifier(),
2379 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002380 except gerrit_util.GerritError as e:
2381 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002382 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002383 raise
agable32978d92016-11-01 12:55:02 -07002384 return data
2385
Karen Qian40c19422019-03-13 21:28:29 +00002386 def _IsCqConfigured(self):
2387 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002388 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002389
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002390 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002391 if git_common.is_dirty_git_tree('land'):
2392 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002393
tandriid60367b2016-06-22 05:25:12 -07002394 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002395 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002396 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002397 'which can test and land changes for you. '
2398 'Are you sure you wish to bypass it?\n',
2399 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002400 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002401 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002402 # Note: git diff outputs nothing if there is no diff.
2403 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002404 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002405 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002406 if detail['current_revision'] == last_upload:
2407 differs = False
2408 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002409 print('WARNING: Local branch contents differ from latest uploaded '
2410 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002411 if differs:
2412 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002413 confirm_or_exit(
2414 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2415 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002416 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002417 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002418 upstream = self.GetCommonAncestorWithUpstream()
2419 if self.GetIssue():
2420 description = self.FetchDescription()
2421 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002422 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002423 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002424 committing=True,
2425 may_prompt=not force,
2426 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002427 parallel=parallel,
2428 upstream=upstream,
2429 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002430 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002431 resultdb=resultdb,
2432 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002433
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002434 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002435 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002436 links = self._GetChangeCommit().get('web_links', [])
2437 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002438 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002439 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002440 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002441 return 0
2442
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002443 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2444 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002445 assert parsed_issue_arg.valid
2446
Edward Lemur125d60a2019-09-13 18:25:41 +00002447 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002448
2449 if parsed_issue_arg.hostname:
2450 self._gerrit_host = parsed_issue_arg.hostname
2451 self._gerrit_server = 'https://%s' % self._gerrit_host
2452
tandriic2405f52016-10-10 08:13:15 -07002453 try:
2454 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002455 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002456 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002457
2458 if not parsed_issue_arg.patchset:
2459 # Use current revision by default.
2460 revision_info = detail['revisions'][detail['current_revision']]
2461 patchset = int(revision_info['_number'])
2462 else:
2463 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002464 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002465 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2466 break
2467 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002468 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002469 (parsed_issue_arg.patchset, self.GetIssue()))
2470
Edward Lemur125d60a2019-09-13 18:25:41 +00002471 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002472 if remote_url.endswith('.git'):
2473 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002474 remote_url = remote_url.rstrip('/')
2475
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002476 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002477 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002478
2479 if remote_url != fetch_info['url']:
2480 DieWithError('Trying to patch a change from %s but this repo appears '
2481 'to be %s.' % (fetch_info['url'], remote_url))
2482
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002483 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002484
Joanna Wangc023a632023-01-26 17:59:25 +00002485 # Set issue immediately in case the cherry-pick fails, which happens
2486 # when resolving conflicts.
2487 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002488 self.SetIssue(parsed_issue_arg.issue)
2489
Aaron Gable62619a32017-06-16 08:22:09 -07002490 if force:
2491 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2492 print('Checked out commit for change %i patchset %i locally' %
2493 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002494 elif nocommit:
2495 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2496 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002497 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002498 RunGit(['cherry-pick', 'FETCH_HEAD'])
2499 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002500 (parsed_issue_arg.issue, patchset))
2501 print('Note: this created a local commit which does not have '
2502 'the same hash as the one uploaded for review. This will make '
2503 'uploading changes based on top of this branch difficult.\n'
2504 'If you want to do that, use "git cl patch --force" instead.')
2505
Stefan Zagerd08043c2017-10-12 12:07:02 -07002506 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002507 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002508 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002509 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2510 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002511 else:
2512 print('WARNING: You are in detached HEAD state.\n'
2513 'The patch has been applied to your checkout, but you will not be '
2514 'able to upload a new patch set to the gerrit issue.\n'
2515 'Try using the \'-b\' option if you would like to work on a '
2516 'branch and/or upload a new patch set.')
2517
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002518 return 0
2519
Joanna Wang18de1f62023-01-21 01:24:24 +00002520 @staticmethod
2521 def _GerritCommitMsgHookCheck(offer_removal):
2522 # type: (bool) -> None
2523 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002524 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2525 if not os.path.exists(hook):
2526 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002527 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2528 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002529 data = gclient_utils.FileRead(hook)
2530 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2531 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002532 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002533 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002534 'and may interfere with it in subtle ways.\n'
2535 'We recommend you remove the commit-msg hook.')
2536 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002537 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002538 gclient_utils.rm_file_or_tree(hook)
2539 print('Gerrit commit-msg hook removed.')
2540 else:
2541 print('OK, will keep Gerrit commit-msg hook in place.')
2542
Edward Lemur1b52d872019-05-09 21:12:12 +00002543 def _CleanUpOldTraces(self):
2544 """Keep only the last |MAX_TRACES| traces."""
2545 try:
2546 traces = sorted([
2547 os.path.join(TRACES_DIR, f)
2548 for f in os.listdir(TRACES_DIR)
2549 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2550 and not f.startswith('tmp'))
2551 ])
2552 traces_to_delete = traces[:-MAX_TRACES]
2553 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002554 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002555 except OSError:
2556 print('WARNING: Failed to remove old git traces from\n'
2557 ' %s'
2558 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002559
Edward Lemur5737f022019-05-17 01:24:00 +00002560 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002561 """Zip and write the git push traces stored in traces_dir."""
2562 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002563 traces_zip = trace_name + '-traces'
2564 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002565 # Create a temporary dir to store git config and gitcookies in. It will be
2566 # compressed and stored next to the traces.
2567 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002568 git_info_zip = trace_name + '-git-info'
2569
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002570 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002571
Edward Lemur1b52d872019-05-09 21:12:12 +00002572 git_push_metadata['trace_name'] = trace_name
2573 gclient_utils.FileWrite(
2574 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2575
2576 # Keep only the first 6 characters of the git hashes on the packet
2577 # trace. This greatly decreases size after compression.
2578 packet_traces = os.path.join(traces_dir, 'trace-packet')
2579 if os.path.isfile(packet_traces):
2580 contents = gclient_utils.FileRead(packet_traces)
2581 gclient_utils.FileWrite(
2582 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2583 shutil.make_archive(traces_zip, 'zip', traces_dir)
2584
2585 # Collect and compress the git config and gitcookies.
2586 git_config = RunGit(['config', '-l'])
2587 gclient_utils.FileWrite(
2588 os.path.join(git_info_dir, 'git-config'),
2589 git_config)
2590
2591 cookie_auth = gerrit_util.Authenticator.get()
2592 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2593 gitcookies_path = cookie_auth.get_gitcookies_path()
2594 if os.path.isfile(gitcookies_path):
2595 gitcookies = gclient_utils.FileRead(gitcookies_path)
2596 gclient_utils.FileWrite(
2597 os.path.join(git_info_dir, 'gitcookies'),
2598 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2599 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2600
Edward Lemur1b52d872019-05-09 21:12:12 +00002601 gclient_utils.rmtree(git_info_dir)
2602
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002603 def _RunGitPushWithTraces(self,
2604 refspec,
2605 refspec_opts,
2606 git_push_metadata,
2607 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002608 """Run git push and collect the traces resulting from the execution."""
2609 # Create a temporary directory to store traces in. Traces will be compressed
2610 # and stored in a 'traces' dir inside depot_tools.
2611 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002612 trace_name = os.path.join(
2613 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002614
2615 env = os.environ.copy()
2616 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2617 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002618 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002619 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2620 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2621 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2622
2623 try:
2624 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002625 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002626 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002627 push_cmd = ['git', 'push', remote_url, refspec]
2628 if git_push_options:
2629 for opt in git_push_options:
2630 push_cmd.extend(['-o', opt])
2631
Edward Lemur0f58ae42019-04-30 17:24:12 +00002632 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002633 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002634 env=env,
2635 print_stdout=True,
2636 # Flush after every line: useful for seeing progress when running as
2637 # recipe.
2638 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002639 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002640 except subprocess2.CalledProcessError as e:
2641 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002642 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002643 raise GitPushError(
2644 'Failed to create a change, very likely due to blocked keyword. '
2645 'Please examine output above for the reason of the failure.\n'
2646 'If this is a false positive, you can try to bypass blocked '
2647 'keyword by using push option '
2648 '-o uploadvalidator~skip, e.g.:\n'
2649 'git cl upload -o uploadvalidator~skip\n\n'
2650 'If git-cl is not working correctly, file a bug under the '
2651 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002652 if 'git push -o nokeycheck' in str(e.stdout):
2653 raise GitPushError(
2654 'Failed to create a change, very likely due to a private key being '
2655 'detected. Please examine output above for the reason of the '
2656 'failure.\n'
2657 'If this is a false positive, you can try to bypass private key '
2658 'detection by using push option '
2659 '-o nokeycheck, e.g.:\n'
2660 'git cl upload -o nokeycheck\n\n'
2661 'If git-cl is not working correctly, file a bug under the '
2662 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002663
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002664 raise GitPushError(
2665 'Failed to create a change. Please examine output above for the '
2666 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002667 'For emergencies, Googlers can escalate to '
2668 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002669 'Hint: run command below to diagnose common Git/Gerrit '
2670 'credential problems:\n'
2671 ' git cl creds-check\n'
2672 '\n'
2673 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2674 'component including the files below.\n'
2675 'Review the files before upload, since they might contain sensitive '
2676 'information.\n'
2677 'Set the Restrict-View-Google label so that they are not publicly '
2678 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002679 finally:
2680 execution_time = time_time() - before_push
2681 metrics.collector.add_repeated('sub_commands', {
2682 'command': 'git push',
2683 'execution_time': execution_time,
2684 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002685 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002686 })
2687
Edward Lemur1b52d872019-05-09 21:12:12 +00002688 git_push_metadata['execution_time'] = execution_time
2689 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002690 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002691
Edward Lemur1b52d872019-05-09 21:12:12 +00002692 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002693 gclient_utils.rmtree(traces_dir)
2694
2695 return push_stdout
2696
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002697 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2698 change_desc):
2699 """Upload the current branch to Gerrit, retry if new remote HEAD is
2700 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002701 remote, remote_branch = self.GetRemoteBranch()
2702 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2703
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002704 try:
2705 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002706 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002707 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002708 # Repository might be in the middle of transition to main branch as
2709 # default, and uploads to old default might be blocked.
2710 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002711 DieWithError(str(e), change_desc)
2712
Josip Sokcevicb631a882021-01-06 18:18:10 +00002713 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2714 self.GetGerritProject())
2715 if project_head == branch:
2716 DieWithError(str(e), change_desc)
2717 branch = project_head
2718
2719 print("WARNING: Fetching remote state and retrying upload to default "
2720 "branch...")
2721 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002722 options.edit_description = False
2723 options.force = True
2724 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002725 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2726 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002727 except GitPushError as e:
2728 DieWithError(str(e), change_desc)
2729
2730 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002731 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002732 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002733 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002734 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002735 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002736 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002737 # User requested to change description
2738 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002739 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002740 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2741 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002742 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002743
2744 # Check if changes outside of this workspace have been uploaded.
2745 current_rev = change_detail['current_revision']
2746 last_uploaded_rev = self._GitGetBranchConfigValue(
2747 GERRIT_SQUASH_HASH_CONFIG_KEY)
2748 if last_uploaded_rev and current_rev != last_uploaded_rev:
2749 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002750 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002751 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002752 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002753 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002754 if len(change_ids) == 1:
2755 change_id = change_ids[0]
2756 else:
2757 change_id = GenerateGerritChangeId(change_desc.description)
2758 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002759
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002760 if options.preserve_tryjobs:
2761 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002762
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002763 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002764 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002765 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002766 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002767 with gclient_utils.temporary_file() as desc_tempfile:
2768 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2769 ref_to_push = RunGit(
2770 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002771 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002772 if options.no_add_changeid:
2773 pass
2774 else: # adding Change-Ids is okay.
2775 if not git_footers.get_footer_change_id(change_desc.description):
2776 DownloadGerritHook(False)
2777 change_desc.set_description(
2778 self._AddChangeIdToCommitMessage(change_desc.description,
2779 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002780 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002781 # For no-squash mode, we assume the remote called "origin" is the one we
2782 # want. It is not worthwhile to support different workflows for
2783 # no-squash mode.
2784 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002785 # attempt to extract the changeid from the current description
2786 # fail informatively if not possible.
2787 change_id_candidates = git_footers.get_footer_change_id(
2788 change_desc.description)
2789 if not change_id_candidates:
2790 DieWithError("Unable to extract change-id from message.")
2791 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002792
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002793 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002794 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2795 ref_to_push)]).splitlines()
2796 if len(commits) > 1:
2797 print('WARNING: This will upload %d commits. Run the following command '
2798 'to see which commits will be uploaded: ' % len(commits))
2799 print('git log %s..%s' % (parent, ref_to_push))
2800 print('You can also use `git squash-branch` to squash these into a '
2801 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002802 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002803
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002804 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002805 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002806 # Add default, watchlist, presubmit ccs if this is the initial upload
2807 # and CL is not private and auto-ccing has not been disabled.
2808 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002809 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002810 if len(cc) > 100:
2811 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2812 'process/lsc/lsc_workflow.md')
2813 print('WARNING: This will auto-CC %s users.' % len(cc))
2814 print('LSC may be more appropriate: %s' % lsc)
2815 print('You can also use the --no-autocc flag to disable auto-CC.')
2816 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002817 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002818 if options.cc:
2819 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002820 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002821 if change_desc.get_cced():
2822 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002823 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002824 valid_accounts = set(reviewers + cc)
2825 # TODO(crbug/877717): relax this for all hosts.
2826 else:
2827 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002828 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002829 logging.info('accounts %s are recognized, %s invalid',
2830 sorted(valid_accounts),
2831 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002832
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002833 # Extra options that can be specified at push time. Doc:
2834 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002835 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002836
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002837 for r in sorted(reviewers):
2838 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002839 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002840 reviewers.remove(r)
2841 else:
2842 # TODO(tandrii): this should probably be a hard failure.
2843 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2844 % r)
2845 for c in sorted(cc):
2846 # refspec option will be rejected if cc doesn't correspond to an
2847 # account, even though REST call to add such arbitrary cc may succeed.
2848 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002849 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002850 cc.remove(c)
2851
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002852 refspec_suffix = ''
2853 if refspec_opts:
2854 refspec_suffix = '%' + ','.join(refspec_opts)
2855 assert ' ' not in refspec_suffix, (
2856 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2857 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002858
Edward Lemur1b52d872019-05-09 21:12:12 +00002859 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002860 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002861 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002862 'change_id': change_id,
2863 'description': change_desc.description,
2864 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002865
Gavin Mak4e5e3992022-11-14 22:40:12 +00002866 # Gerrit may or may not update fast enough to return the correct patchset
2867 # number after we push. Get the pre-upload patchset and increment later.
2868 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2869
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002870 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002871 git_push_metadata,
2872 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002873
2874 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002875 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002876 change_numbers = [m.group(1)
2877 for m in map(regex.match, push_stdout.splitlines())
2878 if m]
2879 if len(change_numbers) != 1:
2880 DieWithError(
2881 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002882 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002883 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002884 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002885 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002886
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002887 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002888 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002889 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002890 gerrit_util.AddReviewers(self.GetGerritHost(),
2891 self._GerritChangeIdentifier(),
2892 reviewers,
2893 cc,
2894 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002895
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002896 return 0
2897
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002898 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2899 change_desc):
2900 """Computes parent of the generated commit to be uploaded to Gerrit.
2901
2902 Returns revision or a ref name.
2903 """
2904 if custom_cl_base:
2905 # Try to avoid creating additional unintended CLs when uploading, unless
2906 # user wants to take this risk.
2907 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2908 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2909 local_ref_of_target_remote])
2910 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002911 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002912 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2913 'If you proceed with upload, more than 1 CL may be created by '
2914 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2915 'If you are certain that specified base `%s` has already been '
2916 'uploaded to Gerrit as another CL, you may proceed.\n' %
2917 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2918 if not force:
2919 confirm_or_exit(
2920 'Do you take responsibility for cleaning up potential mess '
2921 'resulting from proceeding with upload?',
2922 action='upload')
2923 return custom_cl_base
2924
Aaron Gablef97e33d2017-03-30 15:44:27 -07002925 if remote != '.':
2926 return self.GetCommonAncestorWithUpstream()
2927
2928 # If our upstream branch is local, we base our squashed commit on its
2929 # squashed version.
2930 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2931
Aaron Gablef97e33d2017-03-30 15:44:27 -07002932 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002933 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002934 if upstream_branch_name == 'main':
2935 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002936
2937 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002938 # TODO(tandrii): consider checking parent change in Gerrit and using its
2939 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2940 # the tree hash of the parent branch. The upside is less likely bogus
2941 # requests to reupload parent change just because it's uploadhash is
2942 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002943 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2944 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002945 # Verify that the upstream branch has been uploaded too, otherwise
2946 # Gerrit will create additional CLs when uploading.
2947 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2948 RunGitSilent(['rev-parse', parent + ':'])):
2949 DieWithError(
2950 '\nUpload upstream branch %s first.\n'
2951 'It is likely that this branch has been rebased since its last '
2952 'upload, so you just need to upload it again.\n'
2953 '(If you uploaded it with --no-squash, then branch dependencies '
2954 'are not supported, and you should reupload with --squash.)'
2955 % upstream_branch_name,
2956 change_desc)
2957 return parent
2958
Gavin Mak4e5e3992022-11-14 22:40:12 +00002959 def _UpdateWithExternalChanges(self):
2960 """Updates workspace with external changes.
2961
2962 Returns the commit hash that should be used as the merge base on upload.
2963 """
2964 local_ps = self.GetPatchset()
2965 if local_ps is None:
2966 return
2967
2968 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002969 if external_ps is None or local_ps == external_ps or \
2970 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002971 return
2972
2973 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002974 if num_changes > 1:
2975 change_words = 'changes were'
2976 else:
2977 change_words = 'change was'
2978 print('\n%d external %s published to %s:\n' %
2979 (num_changes, change_words, self.GetIssueURL(short=True)))
2980
2981 # Print an overview of external changes.
2982 ps_to_commit = {}
2983 ps_to_info = {}
2984 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2985 for commit_id, revision_info in revisions.get('revisions', {}).items():
2986 ps_num = revision_info['_number']
2987 ps_to_commit[ps_num] = commit_id
2988 ps_to_info[ps_num] = revision_info
2989
2990 for ps in range(external_ps, local_ps, -1):
2991 commit = ps_to_commit[ps][:8]
2992 desc = ps_to_info[ps].get('description', '')
2993 print('Patchset %d [%s] %s' % (ps, commit, desc))
2994
2995 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2996 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002997 return
2998
2999 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3000 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3001 external_base = external_parent['commit']
3002
3003 branch = git_common.current_branch()
3004 local_base = self.GetCommonAncestorWithUpstream()
3005 if local_base != external_base:
3006 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3007 (local_base, external_base))
3008 if git_common.upstream(branch):
3009 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3010 'to make these the same.')
3011 print('No upstream branch set. Consider setting it and using '
3012 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3013
3014 # Fetch Gerrit's CL base if it doesn't exist locally.
3015 remote, _ = self.GetRemoteBranch()
3016 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3017 RunGitSilent(['fetch', remote, external_base])
3018
3019 # Get the diff between local_ps and external_ps.
3020 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003021 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003022 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3023 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3024 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3025 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3026 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3027
3028 # Diff can be empty in the case of trivial rebases.
3029 if not diff:
3030 return external_base
3031
3032 # Apply the diff.
3033 with gclient_utils.temporary_file() as diff_tempfile:
3034 gclient_utils.FileWrite(diff_tempfile, diff)
3035 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3036 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3037 if not clean_patch:
3038 # Normally patchset is set after upload. But because we exit, that never
3039 # happens. Updating here makes sure that subsequent uploads don't need
3040 # to fetch/apply the same diff again.
3041 self.SetPatchset(external_ps)
3042 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3043 'conflicts and reupload.')
3044
3045 message = 'Incorporate external changes from '
3046 if num_changes == 1:
3047 message += 'patchset %d' % external_ps
3048 else:
3049 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3050 RunGitSilent(['commit', '-am', message])
3051 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3052 # patchset title instead of this 'Incorporate' message.
3053 return external_base
3054
Edward Lemura12175c2020-03-09 16:58:26 +00003055 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003056 """Re-commits using the current message, assumes the commit hook is in
3057 place.
3058 """
Edward Lemura12175c2020-03-09 16:58:26 +00003059 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003060 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003061 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003062 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003063 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003064
3065 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003066
tandriie113dfd2016-10-11 10:20:12 -07003067 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003068 try:
3069 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003070 except GerritChangeNotExists:
3071 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003072
3073 if data['status'] in ('ABANDONED', 'MERGED'):
3074 return 'CL %s is closed' % self.GetIssue()
3075
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003076 def GetGerritChange(self, patchset=None):
3077 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003078 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003079 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003080 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003081 data = self._GetChangeDetail(['ALL_REVISIONS'])
3082
3083 assert host and issue and patchset, 'CL must be uploaded first'
3084
3085 has_patchset = any(
3086 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003087 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003088 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003089 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003090 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003091
tandrii8c5a3532016-11-04 07:52:02 -07003092 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003093 'host': host,
3094 'change': issue,
3095 'project': data['project'],
3096 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003097 }
tandriie113dfd2016-10-11 10:20:12 -07003098
tandriide281ae2016-10-12 06:02:30 -07003099 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003100 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003101
Edward Lemur707d70b2018-02-07 00:50:14 +01003102 def GetReviewers(self):
3103 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003104 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003105
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003106
Lei Zhang8a0efc12020-08-05 19:58:45 +00003107def _get_bug_line_values(default_project_prefix, bugs):
3108 """Given default_project_prefix and comma separated list of bugs, yields bug
3109 line values.
tandriif9aefb72016-07-01 09:06:51 -07003110
3111 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003112 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003113 * string, which is left as is.
3114
3115 This function may produce more than one line, because bugdroid expects one
3116 project per line.
3117
Lei Zhang8a0efc12020-08-05 19:58:45 +00003118 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003119 ['v8:123', 'chromium:789']
3120 """
3121 default_bugs = []
3122 others = []
3123 for bug in bugs.split(','):
3124 bug = bug.strip()
3125 if bug:
3126 try:
3127 default_bugs.append(int(bug))
3128 except ValueError:
3129 others.append(bug)
3130
3131 if default_bugs:
3132 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003133 if default_project_prefix:
3134 if not default_project_prefix.endswith(':'):
3135 default_project_prefix += ':'
3136 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003137 else:
3138 yield default_bugs
3139 for other in sorted(others):
3140 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3141 yield other
3142
3143
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003144class ChangeDescription(object):
3145 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003146 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003147 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003148 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003149 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003150 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003151 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3152 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003153 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003154 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003155
Dan Beamd8b04ca2019-10-10 21:23:26 +00003156 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003157 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003158 if bug:
3159 regexp = re.compile(self.BUG_LINE)
3160 prefix = settings.GetBugPrefix()
3161 if not any((regexp.match(line) for line in self._description_lines)):
3162 values = list(_get_bug_line_values(prefix, bug))
3163 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003164 if fixed:
3165 regexp = re.compile(self.FIXED_LINE)
3166 prefix = settings.GetBugPrefix()
3167 if not any((regexp.match(line) for line in self._description_lines)):
3168 values = list(_get_bug_line_values(prefix, fixed))
3169 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003170
agable@chromium.org42c20792013-09-12 17:34:49 +00003171 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003172 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003173 return '\n'.join(self._description_lines)
3174
3175 def set_description(self, desc):
3176 if isinstance(desc, basestring):
3177 lines = desc.splitlines()
3178 else:
3179 lines = [line.rstrip() for line in desc]
3180 while lines and not lines[0]:
3181 lines.pop(0)
3182 while lines and not lines[-1]:
3183 lines.pop(-1)
3184 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003185
Edward Lemur5a644f82020-03-18 16:44:57 +00003186 def ensure_change_id(self, change_id):
3187 description = self.description
3188 footer_change_ids = git_footers.get_footer_change_id(description)
3189 # Make sure that the Change-Id in the description matches the given one.
3190 if footer_change_ids != [change_id]:
3191 if footer_change_ids:
3192 # Remove any existing Change-Id footers since they don't match the
3193 # expected change_id footer.
3194 description = git_footers.remove_footer(description, 'Change-Id')
3195 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3196 'if you want to set a new one.')
3197 # Add the expected Change-Id footer.
3198 description = git_footers.add_footer_change_id(description, change_id)
3199 self.set_description(description)
3200
Joanna Wang39811b12023-01-20 23:09:48 +00003201 def update_reviewers(self, reviewers):
3202 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003203
3204 Args:
3205 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003206 """
Joanna Wang39811b12023-01-20 23:09:48 +00003207 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003208 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003209
3210 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003211
Joanna Wang39811b12023-01-20 23:09:48 +00003212 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003213 regexp = re.compile(self.R_LINE)
3214 matches = [regexp.match(line) for line in self._description_lines]
3215 new_desc = [l for i, l in enumerate(self._description_lines)
3216 if not matches[i]]
3217 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003218
Joanna Wang39811b12023-01-20 23:09:48 +00003219 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003220
Joanna Wang39811b12023-01-20 23:09:48 +00003221 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003222 for match in matches:
3223 if not match:
3224 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003225 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003226
Joanna Wang39811b12023-01-20 23:09:48 +00003227 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003228
3229 # Put the new lines in the description where the old first R= line was.
3230 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3231 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003232 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003233 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003234 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003235
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003236 def set_preserve_tryjobs(self):
3237 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3238 footers = git_footers.parse_footers(self.description)
3239 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3240 if v.lower() == 'true':
3241 return
3242 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3243
Anthony Polito8b955342019-09-24 19:01:36 +00003244 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003245 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003246 self.set_description([
3247 '# Enter a description of the change.',
3248 '# This will be displayed on the codereview site.',
3249 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003250 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003251 '--------------------',
3252 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003253 bug_regexp = re.compile(self.BUG_LINE)
3254 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003255 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003256 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003257
Dan Beamd8b04ca2019-10-10 21:23:26 +00003258 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003259 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003260
Bruce Dawsonfc487042020-10-27 19:11:37 +00003261 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003262 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003263 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003264 if not content:
3265 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003266 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003267
Bruce Dawson2377b012018-01-11 16:46:49 -08003268 # Strip off comments and default inserted "Bug:" line.
3269 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003270 (line.startswith('#') or
3271 line.rstrip() == "Bug:" or
3272 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003273 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003274 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003275 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003276
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003277 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003278 """Adds a footer line to the description.
3279
3280 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3281 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3282 that Gerrit footers are always at the end.
3283 """
3284 parsed_footer_line = git_footers.parse_footer(line)
3285 if parsed_footer_line:
3286 # Line is a gerrit footer in the form: Footer-Key: any value.
3287 # Thus, must be appended observing Gerrit footer rules.
3288 self.set_description(
3289 git_footers.add_footer(self.description,
3290 key=parsed_footer_line[0],
3291 value=parsed_footer_line[1]))
3292 return
3293
3294 if not self._description_lines:
3295 self._description_lines.append(line)
3296 return
3297
3298 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3299 if gerrit_footers:
3300 # git_footers.split_footers ensures that there is an empty line before
3301 # actual (gerrit) footers, if any. We have to keep it that way.
3302 assert top_lines and top_lines[-1] == ''
3303 top_lines, separator = top_lines[:-1], top_lines[-1:]
3304 else:
3305 separator = [] # No need for separator if there are no gerrit_footers.
3306
3307 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003308 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3309 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003310 top_lines.append('')
3311 top_lines.append(line)
3312 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003313
tandrii99a72f22016-08-17 14:33:24 -07003314 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003315 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003316 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003317 reviewers = [match.group(2).strip()
3318 for match in matches
3319 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003320 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003321
bradnelsond975b302016-10-23 12:20:23 -07003322 def get_cced(self):
3323 """Retrieves the list of reviewers."""
3324 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3325 cced = [match.group(2).strip() for match in matches if match]
3326 return cleanup_list(cced)
3327
Nodir Turakulov23b82142017-11-16 11:04:25 -08003328 def get_hash_tags(self):
3329 """Extracts and sanitizes a list of Gerrit hashtags."""
3330 subject = (self._description_lines or ('',))[0]
3331 subject = re.sub(
3332 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3333
3334 tags = []
3335 start = 0
3336 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3337 while True:
3338 m = bracket_exp.match(subject, start)
3339 if not m:
3340 break
3341 tags.append(self.sanitize_hash_tag(m.group(1)))
3342 start = m.end()
3343
3344 if not tags:
3345 # Try "Tag: " prefix.
3346 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3347 if m:
3348 tags.append(self.sanitize_hash_tag(m.group(1)))
3349 return tags
3350
3351 @classmethod
3352 def sanitize_hash_tag(cls, tag):
3353 """Returns a sanitized Gerrit hash tag.
3354
3355 A sanitized hashtag can be used as a git push refspec parameter value.
3356 """
3357 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3358
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003359
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003360def FindCodereviewSettingsFile(filename='codereview.settings'):
3361 """Finds the given file starting in the cwd and going up.
3362
3363 Only looks up to the top of the repository unless an
3364 'inherit-review-settings-ok' file exists in the root of the repository.
3365 """
3366 inherit_ok_file = 'inherit-review-settings-ok'
3367 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003368 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003369 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003370 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003371 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003372 if os.path.isfile(os.path.join(cwd, filename)):
3373 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003374 if cwd == root:
3375 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003376 parent_dir = os.path.dirname(cwd)
3377 if parent_dir == cwd:
3378 # We hit the system root directory.
3379 break
3380 cwd = parent_dir
3381 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003382
3383
3384def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003385 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003386 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003387
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003388 def SetProperty(name, setting, unset_error_ok=False):
3389 fullname = 'rietveld.' + name
3390 if setting in keyvals:
3391 RunGit(['config', fullname, keyvals[setting]])
3392 else:
3393 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3394
tandrii48df5812016-10-17 03:55:37 -07003395 if not keyvals.get('GERRIT_HOST', False):
3396 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003397 # Only server setting is required. Other settings can be absent.
3398 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003399 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003400 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3401 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003402 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003403 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3404 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003405 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3406 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003407 SetProperty(
3408 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003409 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003410
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003411 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003412 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003413
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003414 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003415 RunGit(['config', 'gerrit.squash-uploads',
3416 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003417
tandrii@chromium.org28253532016-04-14 13:46:56 +00003418 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003419 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003420 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3421
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003422 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003423 # should be of the form
3424 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3425 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003426 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3427 keyvals['ORIGIN_URL_CONFIG']])
3428
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003429
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003430def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003431 """Downloads a network object to a local file, like urllib.urlretrieve.
3432
3433 This is necessary because urllib is broken for SSL connections via a proxy.
3434 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003435 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003436 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003437
3438
ukai@chromium.org712d6102013-11-27 00:52:58 +00003439def hasSheBang(fname):
3440 """Checks fname is a #! script."""
3441 with open(fname) as f:
3442 return f.read(2).startswith('#!')
3443
3444
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003445def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003446 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003447
3448 Args:
3449 force: True to update hooks. False to install hooks if not present.
3450 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003451 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003452 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3453 if not os.access(dst, os.X_OK):
3454 if os.path.exists(dst):
3455 if not force:
3456 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003457 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003458 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003459 if not hasSheBang(dst):
3460 DieWithError('Not a script: %s\n'
3461 'You need to download from\n%s\n'
3462 'into .git/hooks/commit-msg and '
3463 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003464 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3465 except Exception:
3466 if os.path.exists(dst):
3467 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003468 DieWithError('\nFailed to download hooks.\n'
3469 'You need to download from\n%s\n'
3470 'into .git/hooks/commit-msg and '
3471 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003472
3473
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003474class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003475 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003476
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003477 def __init__(self):
3478 # Cached list of [host, identity, source], where source is either
3479 # .gitcookies or .netrc.
3480 self._all_hosts = None
3481
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003482 def ensure_configured_gitcookies(self):
3483 """Runs checks and suggests fixes to make git use .gitcookies from default
3484 path."""
3485 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3486 configured_path = RunGitSilent(
3487 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003488 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003489 if configured_path:
3490 self._ensure_default_gitcookies_path(configured_path, default)
3491 else:
3492 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003493
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003494 @staticmethod
3495 def _ensure_default_gitcookies_path(configured_path, default_path):
3496 assert configured_path
3497 if configured_path == default_path:
3498 print('git is already configured to use your .gitcookies from %s' %
3499 configured_path)
3500 return
3501
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003502 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003503 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3504 (configured_path, default_path))
3505
3506 if not os.path.exists(configured_path):
3507 print('However, your configured .gitcookies file is missing.')
3508 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3509 action='reconfigure')
3510 RunGit(['config', '--global', 'http.cookiefile', default_path])
3511 return
3512
3513 if os.path.exists(default_path):
3514 print('WARNING: default .gitcookies file already exists %s' %
3515 default_path)
3516 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3517 default_path)
3518
3519 confirm_or_exit('Move existing .gitcookies to default location?',
3520 action='move')
3521 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003522 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003523 print('Moved and reconfigured git to use .gitcookies from %s' %
3524 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003525
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003526 @staticmethod
3527 def _configure_gitcookies_path(default_path):
3528 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3529 if os.path.exists(netrc_path):
3530 print('You seem to be using outdated .netrc for git credentials: %s' %
3531 netrc_path)
3532 print('This tool will guide you through setting up recommended '
3533 '.gitcookies store for git credentials.\n'
3534 '\n'
3535 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3536 ' git config --global --unset http.cookiefile\n'
3537 ' mv %s %s.backup\n\n' % (default_path, default_path))
3538 confirm_or_exit(action='setup .gitcookies')
3539 RunGit(['config', '--global', 'http.cookiefile', default_path])
3540 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003541
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003542 def get_hosts_with_creds(self, include_netrc=False):
3543 if self._all_hosts is None:
3544 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003545 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3546 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3547 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3548 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003549
3550 if include_netrc:
3551 return self._all_hosts
3552 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3553
3554 def print_current_creds(self, include_netrc=False):
3555 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3556 if not hosts:
3557 print('No Git/Gerrit credentials found')
3558 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003559 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003560 header = [('Host', 'User', 'Which file'),
3561 ['=' * l for l in lengths]]
3562 for row in (header + hosts):
3563 print('\t'.join((('%%+%ds' % l) % s)
3564 for l, s in zip(lengths, row)))
3565
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003566 @staticmethod
3567 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003568 """Parses identity "git-<username>.domain" into <username> and domain."""
3569 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003570 # distinguishable from sub-domains. But we do know typical domains:
3571 if identity.endswith('.chromium.org'):
3572 domain = 'chromium.org'
3573 username = identity[:-len('.chromium.org')]
3574 else:
3575 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003576 if username.startswith('git-'):
3577 username = username[len('git-'):]
3578 return username, domain
3579
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003580 def has_generic_host(self):
3581 """Returns whether generic .googlesource.com has been configured.
3582
3583 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3584 """
3585 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003586 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003587 return True
3588 return False
3589
3590 def _get_git_gerrit_identity_pairs(self):
3591 """Returns map from canonic host to pair of identities (Git, Gerrit).
3592
3593 One of identities might be None, meaning not configured.
3594 """
3595 host_to_identity_pairs = {}
3596 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003597 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003598 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3599 idx = 0 if canonical == host else 1
3600 pair[idx] = identity
3601 return host_to_identity_pairs
3602
3603 def get_partially_configured_hosts(self):
3604 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003605 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003606 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003607 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003608
3609 def get_conflicting_hosts(self):
3610 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003611 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003612 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003613 if None not in (i1, i2) and i1 != i2)
3614
3615 def get_duplicated_hosts(self):
3616 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003617 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003618
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003619
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003620 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003621 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003622 hosts = sorted(hosts)
3623 assert hosts
3624 if extra_column_func is None:
3625 extras = [''] * len(hosts)
3626 else:
3627 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003628 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3629 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003630 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003631 lines.append(tmpl % he)
3632 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003633
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003634 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003635 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003636 yield ('.googlesource.com wildcard record detected',
3637 ['Chrome Infrastructure team recommends to list full host names '
3638 'explicitly.'],
3639 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003640
3641 dups = self.get_duplicated_hosts()
3642 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003643 yield ('The following hosts were defined twice',
3644 self._format_hosts(dups),
3645 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003646
3647 partial = self.get_partially_configured_hosts()
3648 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003649 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3650 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003651 self._format_hosts(
3652 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3653 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003654
3655 conflicting = self.get_conflicting_hosts()
3656 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003657 yield ('The following Git hosts have differing credentials from their '
3658 'Gerrit counterparts',
3659 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3660 tuple(self._get_git_gerrit_identity_pairs()[host])),
3661 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003662
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003663 def find_and_report_problems(self):
3664 """Returns True if there was at least one problem, else False."""
3665 found = False
3666 bad_hosts = set()
3667 for title, sublines, hosts in self._find_problems():
3668 if not found:
3669 found = True
3670 print('\n\n.gitcookies problem report:\n')
3671 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003672 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003673 if sublines:
3674 print()
3675 print(' %s' % '\n '.join(sublines))
3676 print()
3677
3678 if bad_hosts:
3679 assert found
3680 print(' You can manually remove corresponding lines in your %s file and '
3681 'visit the following URLs with correct account to generate '
3682 'correct credential lines:\n' %
3683 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003684 print(' %s' % '\n '.join(
3685 sorted(
3686 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3687 _canonical_git_googlesource_host(host))
3688 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003689 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003690
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003691
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003692@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003693def CMDcreds_check(parser, args):
3694 """Checks credentials and suggests changes."""
3695 _, _ = parser.parse_args(args)
3696
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003697 # Code below checks .gitcookies. Abort if using something else.
3698 authn = gerrit_util.Authenticator.get()
3699 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003700 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003701 'This command is not designed for bot environment. It checks '
3702 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003703 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3704 if isinstance(authn, gerrit_util.GceAuthenticator):
3705 message += (
3706 '\n'
3707 'If you need to run this on GCE or a cloudtop instance, '
3708 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3709 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003710
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003711 checker = _GitCookiesChecker()
3712 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003713
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003714 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003715 checker.print_current_creds(include_netrc=True)
3716
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003717 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003718 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003719 return 0
3720 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003721
3722
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003723@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003724def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003725 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003726 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003727 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003728 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003729 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003730 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003731 return RunGit(['config', 'branch.%s.base-url' % branch],
3732 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003733
3734 print('Setting base-url to %s' % args[0])
3735 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3736 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003737
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003738
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003739def color_for_status(status):
3740 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003741 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003742 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003743 'unsent': BOLD + Fore.YELLOW,
3744 'waiting': BOLD + Fore.RED,
3745 'reply': BOLD + Fore.YELLOW,
3746 'not lgtm': BOLD + Fore.RED,
3747 'lgtm': BOLD + Fore.GREEN,
3748 'commit': BOLD + Fore.MAGENTA,
3749 'closed': BOLD + Fore.CYAN,
3750 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003751 }.get(status, Fore.WHITE)
3752
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003753
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003754def get_cl_statuses(changes, fine_grained, max_processes=None):
3755 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003756
3757 If fine_grained is true, this will fetch CL statuses from the server.
3758 Otherwise, simply indicate if there's a matching url for the given branches.
3759
3760 If max_processes is specified, it is used as the maximum number of processes
3761 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3762 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003763
3764 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003765 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003766 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003767 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003768
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003769 if not fine_grained:
3770 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003771 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003772 for cl in changes:
3773 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003774 return
3775
3776 # First, sort out authentication issues.
3777 logging.debug('ensuring credentials exist')
3778 for cl in changes:
3779 cl.EnsureAuthenticated(force=False, refresh=True)
3780
3781 def fetch(cl):
3782 try:
3783 return (cl, cl.GetStatus())
3784 except:
3785 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003786 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003787 raise
3788
3789 threads_count = len(changes)
3790 if max_processes:
3791 threads_count = max(1, min(threads_count, max_processes))
3792 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3793
Edward Lemur61bf4172020-02-24 23:22:37 +00003794 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003795 fetched_cls = set()
3796 try:
3797 it = pool.imap_unordered(fetch, changes).__iter__()
3798 while True:
3799 try:
3800 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003801 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003802 break
3803 fetched_cls.add(cl)
3804 yield cl, status
3805 finally:
3806 pool.close()
3807
3808 # Add any branches that failed to fetch.
3809 for cl in set(changes) - fetched_cls:
3810 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003811
rmistry@google.com2dd99862015-06-22 12:22:18 +00003812
Jose Lopes3863fc52020-04-07 17:00:25 +00003813def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003814 """Uploads CLs of local branches that are dependents of the current branch.
3815
3816 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003817
3818 test1 -> test2.1 -> test3.1
3819 -> test3.2
3820 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003821
3822 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3823 run on the dependent branches in this order:
3824 test2.1, test3.1, test3.2, test2.2, test3.3
3825
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003826 Note: This function does not rebase your local dependent branches. Use it
3827 when you make a change to the parent branch that will not conflict
3828 with its dependent branches, and you would like their dependencies
3829 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003830 """
3831 if git_common.is_dirty_git_tree('upload-branch-deps'):
3832 return 1
3833
3834 root_branch = cl.GetBranch()
3835 if root_branch is None:
3836 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3837 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003838 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003839 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3840 'patchset dependencies without an uploaded CL.')
3841
3842 branches = RunGit(['for-each-ref',
3843 '--format=%(refname:short) %(upstream:short)',
3844 'refs/heads'])
3845 if not branches:
3846 print('No local branches found.')
3847 return 0
3848
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003849 # Create a dictionary of all local branches to the branches that are
3850 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003851 tracked_to_dependents = collections.defaultdict(list)
3852 for b in branches.splitlines():
3853 tokens = b.split()
3854 if len(tokens) == 2:
3855 branch_name, tracked = tokens
3856 tracked_to_dependents[tracked].append(branch_name)
3857
vapiera7fbd5a2016-06-16 09:17:49 -07003858 print()
3859 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003860 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003861
rmistry@google.com2dd99862015-06-22 12:22:18 +00003862 def traverse_dependents_preorder(branch, padding=''):
3863 dependents_to_process = tracked_to_dependents.get(branch, [])
3864 padding += ' '
3865 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003866 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003867 dependents.append(dependent)
3868 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003869
rmistry@google.com2dd99862015-06-22 12:22:18 +00003870 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003871 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003872
3873 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003874 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003875 return 0
3876
rmistry@google.com2dd99862015-06-22 12:22:18 +00003877 # Record all dependents that failed to upload.
3878 failures = {}
3879 # Go through all dependents, checkout the branch and upload.
3880 try:
3881 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003882 print()
3883 print('--------------------------------------')
3884 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003886 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003887 try:
3888 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003891 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003892 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003893 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003894 finally:
3895 # Swap back to the original root branch.
3896 RunGit(['checkout', '-q', root_branch])
3897
vapiera7fbd5a2016-06-16 09:17:49 -07003898 print()
3899 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003900 for dependent_branch in dependents:
3901 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003902 print(' %s : %s' % (dependent_branch, upload_status))
3903 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003904
3905 return 0
3906
3907
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003908def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003909 """Given a proposed tag name, returns a tag name that is guaranteed to be
3910 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3911 or 'foo-3', and so on."""
3912
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003913 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003914 for suffix_num in itertools.count(1):
3915 if suffix_num == 1:
3916 to_check = proposed_tag
3917 else:
3918 to_check = '%s-%d' % (proposed_tag, suffix_num)
3919
3920 if to_check not in existing_tags:
3921 return to_check
3922
3923
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003924@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003925def CMDarchive(parser, args):
3926 """Archives and deletes branches associated with closed changelists."""
3927 parser.add_option(
3928 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003929 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003930 parser.add_option(
3931 '-f', '--force', action='store_true',
3932 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003933 parser.add_option(
3934 '-d', '--dry-run', action='store_true',
3935 help='Skip the branch tagging and removal steps.')
3936 parser.add_option(
3937 '-t', '--notags', action='store_true',
3938 help='Do not tag archived branches. '
3939 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003940 parser.add_option(
3941 '-p',
3942 '--pattern',
3943 default='git-cl-archived-{issue}-{branch}',
3944 help='Format string for archive tags. '
3945 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003946
kmarshall3bff56b2016-06-06 18:31:47 -07003947 options, args = parser.parse_args(args)
3948 if args:
3949 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003950
3951 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3952 if not branches:
3953 return 0
3954
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003955 tags = RunGit(['for-each-ref', '--format=%(refname)',
3956 'refs/tags']).splitlines() or []
3957 tags = [t.split('/')[-1] for t in tags]
3958
vapiera7fbd5a2016-06-16 09:17:49 -07003959 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003960 changes = [Changelist(branchref=b)
3961 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003962 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3963 statuses = get_cl_statuses(changes,
3964 fine_grained=True,
3965 max_processes=options.maxjobs)
3966 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003967 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3968 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003969 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003970 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003971 proposal.sort()
3972
3973 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003974 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003975 return 0
3976
Edward Lemur85153282020-02-14 22:06:29 +00003977 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003978
vapiera7fbd5a2016-06-16 09:17:49 -07003979 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003980 if options.notags:
3981 for next_item in proposal:
3982 print(' ' + next_item[0])
3983 else:
3984 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3985 for next_item in proposal:
3986 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003987
kmarshall9249e012016-08-23 12:02:16 -07003988 # Quit now on precondition failure or if instructed by the user, either
3989 # via an interactive prompt or by command line flags.
3990 if options.dry_run:
3991 print('\nNo changes were made (dry run).\n')
3992 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003993
3994 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003995 print('You are currently on a branch \'%s\' which is associated with a '
3996 'closed codereview issue, so archive cannot proceed. Please '
3997 'checkout another branch and run this command again.' %
3998 current_branch)
3999 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004000
4001 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004002 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004003 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004004 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004005 return 1
4006
4007 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004008 if not options.notags:
4009 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004010
4011 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4012 # Clean up the tag if we failed to delete the branch.
4013 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004014
vapiera7fbd5a2016-06-16 09:17:49 -07004015 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004016
4017 return 0
4018
4019
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004020@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004021def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004022 """Show status of changelists.
4023
4024 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004025 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004026 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004027 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004028 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004029 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004030 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004031 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004032
4033 Also see 'git cl comments'.
4034 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004035 parser.add_option(
4036 '--no-branch-color',
4037 action='store_true',
4038 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004039 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004040 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004041 parser.add_option('-f', '--fast', action='store_true',
4042 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004043 parser.add_option(
4044 '-j', '--maxjobs', action='store', type=int,
4045 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004046 parser.add_option(
4047 '-i', '--issue', type=int,
4048 help='Operate on this issue instead of the current branch\'s implicit '
4049 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004050 parser.add_option('-d',
4051 '--date-order',
4052 action='store_true',
4053 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004054 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004055 if args:
4056 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004057
iannuccie53c9352016-08-17 14:40:40 -07004058 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004059 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004060
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004061 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004062 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004063 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004064 if cl.GetIssue():
4065 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004066 elif options.field == 'id':
4067 issueid = cl.GetIssue()
4068 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004069 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004070 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004071 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004072 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004073 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004074 elif options.field == 'status':
4075 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004076 elif options.field == 'url':
4077 url = cl.GetIssueURL()
4078 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004079 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004080 return 0
4081
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004082 branches = RunGit([
4083 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4084 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004085 if not branches:
4086 print('No local branch found.')
4087 return 0
4088
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004089 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004090 Changelist(branchref=b, commit_date=ct)
4091 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4092 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004093 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004094 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004095 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004096 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004097
Edward Lemur85153282020-02-14 22:06:29 +00004098 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004099
4100 def FormatBranchName(branch, colorize=False):
4101 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4102 an asterisk when it is the current branch."""
4103
4104 asterisk = ""
4105 color = Fore.RESET
4106 if branch == current_branch:
4107 asterisk = "* "
4108 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004109 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004110
4111 if colorize:
4112 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004113 return asterisk + branch_name
4114
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004115 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004116
4117 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004118
4119 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004120 sorted_changes = sorted(changes,
4121 key=lambda c: c.GetCommitDate(),
4122 reverse=True)
4123 else:
4124 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4125 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004126 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004127 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004128 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004129 branch_statuses[c.GetBranch()] = status
4130 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004131 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004132 if url and (not status or status == 'error'):
4133 # The issue probably doesn't exist anymore.
4134 url += ' (broken)'
4135
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004136 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004137 # Turn off bold as well as colors.
4138 END = '\033[0m'
4139 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004140 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004141 color = ''
4142 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004143 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004144
Alan Cuttera3be9a52019-03-04 18:50:33 +00004145 branch_display = FormatBranchName(branch)
4146 padding = ' ' * (alignment - len(branch_display))
4147 if not options.no_branch_color:
4148 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004149
Alan Cuttera3be9a52019-03-04 18:50:33 +00004150 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4151 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004152
vapiera7fbd5a2016-06-16 09:17:49 -07004153 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004154 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004155 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004156 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004157 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004158 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004159 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004160 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004161 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004162 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004163 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004164 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004165 return 0
4166
4167
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004168def colorize_CMDstatus_doc():
4169 """To be called once in main() to add colors to git cl status help."""
4170 colors = [i for i in dir(Fore) if i[0].isupper()]
4171
4172 def colorize_line(line):
4173 for color in colors:
4174 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004175 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004176 indent = len(line) - len(line.lstrip(' ')) + 1
4177 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4178 return line
4179
4180 lines = CMDstatus.__doc__.splitlines()
4181 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4182
4183
phajdan.jre328cf92016-08-22 04:12:17 -07004184def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004185 if path == '-':
4186 json.dump(contents, sys.stdout)
4187 else:
4188 with open(path, 'w') as f:
4189 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004190
4191
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004192@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004193@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004194def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004195 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004196
4197 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004198 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004199 parser.add_option('-r', '--reverse', action='store_true',
4200 help='Lookup the branch(es) for the specified issues. If '
4201 'no issues are specified, all branches with mapped '
4202 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004203 parser.add_option('--json',
4204 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004205 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004206
dnj@chromium.org406c4402015-03-03 17:22:28 +00004207 if options.reverse:
4208 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004209 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004210 # Reverse issue lookup.
4211 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004212
4213 git_config = {}
4214 for config in RunGit(['config', '--get-regexp',
4215 r'branch\..*issue']).splitlines():
4216 name, _space, val = config.partition(' ')
4217 git_config[name] = val
4218
dnj@chromium.org406c4402015-03-03 17:22:28 +00004219 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004220 issue = git_config.get(
4221 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004222 if issue:
4223 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004224 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004225 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004226 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004227 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004228 try:
4229 issue_num = int(issue)
4230 except ValueError:
4231 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004232 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004233 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004234 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004235 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004236 if options.json:
4237 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004238 return 0
4239
4240 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004241 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004242 if not issue.valid:
4243 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4244 'or no argument to list it.\n'
4245 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004246 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004247 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004248 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004249 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004250 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4251 if options.json:
4252 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004253 'gerrit_host': cl.GetGerritHost(),
4254 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004255 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004256 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004257 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004258 return 0
4259
4260
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004261@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004262def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004263 """Shows or posts review comments for any changelist."""
4264 parser.add_option('-a', '--add-comment', dest='comment',
4265 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004266 parser.add_option('-p', '--publish', action='store_true',
4267 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004268 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004269 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004270 parser.add_option('-m', '--machine-readable', dest='readable',
4271 action='store_false', default=True,
4272 help='output comments in a format compatible with '
4273 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004274 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004275 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004276 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004277
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004278 issue = None
4279 if options.issue:
4280 try:
4281 issue = int(options.issue)
4282 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004283 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004284
Edward Lemur934836a2019-09-09 20:16:54 +00004285 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004286
4287 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004288 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004289 return 0
4290
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004291 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4292 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004293 for comment in summary:
4294 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004295 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004296 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004297 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004298 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004299 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004300 elif comment.autogenerated:
4301 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004302 else:
4303 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004304 print('\n%s%s %s%s\n%s' % (
4305 color,
4306 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4307 comment.sender,
4308 Fore.RESET,
4309 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4310
smut@google.comc85ac942015-09-15 16:34:43 +00004311 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004312 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004313 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004314 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4315 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004316 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004317 return 0
4318
4319
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004320@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004321@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004322def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004323 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004324 parser.add_option('-d', '--display', action='store_true',
4325 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004326 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004327 help='New description to set for this issue (- for stdin, '
4328 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004329 parser.add_option('-f', '--force', action='store_true',
4330 help='Delete any unpublished Gerrit edits for this issue '
4331 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004332
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004333 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004334
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004335 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004336 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004337 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004338 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004339 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004340
Edward Lemur934836a2019-09-09 20:16:54 +00004341 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004342 if target_issue_arg:
4343 kwargs['issue'] = target_issue_arg.issue
4344 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004345
4346 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004347 if not cl.GetIssue():
4348 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004349
Edward Lemur678a6842019-10-03 22:25:05 +00004350 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004351 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004352
Edward Lemur6c6827c2020-02-06 21:15:18 +00004353 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004354
smut@google.com34fb6b12015-07-13 20:03:26 +00004355 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004356 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004357 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004358
4359 if options.new_description:
4360 text = options.new_description
4361 if text == '-':
4362 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004363 elif text == '+':
4364 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004365 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004366
4367 description.set_description(text)
4368 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004369 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004370 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004371 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004372 return 0
4373
4374
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004375@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004376def CMDlint(parser, args):
4377 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004378 parser.add_option('--filter', action='append', metavar='-x,+y',
4379 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004380 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004381
4382 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004383 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004384 try:
4385 import cpplint
4386 import cpplint_chromium
4387 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004388 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004389 return 1
4390
4391 # Change the current working directory before calling lint so that it
4392 # shows the correct base.
4393 previous_cwd = os.getcwd()
4394 os.chdir(settings.GetRoot())
4395 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004396 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004397 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004398 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004399 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004400 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004401
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004402 # Process cpplint arguments, if any.
4403 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4404 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004405 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004406
Lei Zhang379d1ad2020-07-15 19:40:06 +00004407 include_regex = re.compile(settings.GetLintRegex())
4408 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004409 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4410 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004411 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004412 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004413 continue
4414
4415 if ignore_regex.match(filename):
4416 print('Ignoring file %s' % filename)
4417 continue
4418
4419 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4420 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004421 finally:
4422 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004423 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004424 if cpplint._cpplint_state.error_count != 0:
4425 return 1
4426 return 0
4427
4428
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004429@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004430def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004431 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004432 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004433 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004434 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004435 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004436 parser.add_option('--all', action='store_true',
4437 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004438 parser.add_option('--files',
4439 nargs=1,
4440 help='Semicolon-separated list of files to be marked as '
4441 'modified when executing presubmit or post-upload hooks. '
4442 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004443 parser.add_option('--parallel', action='store_true',
4444 help='Run all tests specified by input_api.RunTests in all '
4445 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004446 parser.add_option('--resultdb', action='store_true',
4447 help='Run presubmit checks in the ResultSink environment '
4448 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004449 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004450 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004451
sbc@chromium.org71437c02015-04-09 19:29:40 +00004452 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004453 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004454 return 1
4455
Edward Lemur934836a2019-09-09 20:16:54 +00004456 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004457 if args:
4458 base_branch = args[0]
4459 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004460 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004461 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004462
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004463 start = time.time()
4464 try:
4465 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4466 description = cl.FetchDescription()
4467 else:
4468 description = _create_description_from_log([base_branch])
4469 except Exception as e:
4470 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004471 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004472 elapsed = time.time() - start
4473 if elapsed > 5:
4474 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004475
Bruce Dawson13acea32022-05-03 22:13:08 +00004476 if not base_branch:
4477 if not options.force:
4478 print('use --force to check even when not on a branch.')
4479 return 1
4480 base_branch = 'HEAD'
4481
Josip Sokcevic017544d2022-03-31 23:47:53 +00004482 cl.RunHook(committing=not options.upload,
4483 may_prompt=False,
4484 verbose=options.verbose,
4485 parallel=options.parallel,
4486 upstream=base_branch,
4487 description=description,
4488 all_files=options.all,
4489 files=options.files,
4490 resultdb=options.resultdb,
4491 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004492 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004493
4494
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004495def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004496 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004497
4498 Works the same way as
4499 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4500 but can be called on demand on all platforms.
4501
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004502 The basic idea is to generate git hash of a state of the tree, original
4503 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004504 """
4505 lines = []
4506 tree_hash = RunGitSilent(['write-tree'])
4507 lines.append('tree %s' % tree_hash.strip())
4508 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4509 if code == 0:
4510 lines.append('parent %s' % parent.strip())
4511 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4512 lines.append('author %s' % author.strip())
4513 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4514 lines.append('committer %s' % committer.strip())
4515 lines.append('')
4516 # Note: Gerrit's commit-hook actually cleans message of some lines and
4517 # whitespace. This code is not doing this, but it clearly won't decrease
4518 # entropy.
4519 lines.append(message)
4520 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004521 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004522 return 'I%s' % change_hash.strip()
4523
4524
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004525def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004526 """Computes the remote branch ref to use for the CL.
4527
4528 Args:
4529 remote (str): The git remote for the CL.
4530 remote_branch (str): The git remote branch for the CL.
4531 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004532 """
4533 if not (remote and remote_branch):
4534 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004535
wittman@chromium.org455dc922015-01-26 20:15:50 +00004536 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004537 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004538 # refs, which are then translated into the remote full symbolic refs
4539 # below.
4540 if '/' not in target_branch:
4541 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4542 else:
4543 prefix_replacements = (
4544 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4545 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4546 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4547 )
4548 match = None
4549 for regex, replacement in prefix_replacements:
4550 match = re.search(regex, target_branch)
4551 if match:
4552 remote_branch = target_branch.replace(match.group(0), replacement)
4553 break
4554 if not match:
4555 # This is a branch path but not one we recognize; use as-is.
4556 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004557 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004558 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004559 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004560 # Handle the refs that need to land in different refs.
4561 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004562
wittman@chromium.org455dc922015-01-26 20:15:50 +00004563 # Create the true path to the remote branch.
4564 # Does the following translation:
4565 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004566 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004567 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4568 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4569 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4570 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4571 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4572 'refs/heads/')
4573 elif remote_branch.startswith('refs/remotes/branch-heads'):
4574 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004575
wittman@chromium.org455dc922015-01-26 20:15:50 +00004576 return remote_branch
4577
4578
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004579def cleanup_list(l):
4580 """Fixes a list so that comma separated items are put as individual items.
4581
4582 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4583 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4584 """
4585 items = sum((i.split(',') for i in l), [])
4586 stripped_items = (i.strip() for i in items)
4587 return sorted(filter(None, stripped_items))
4588
4589
Aaron Gable4db38df2017-11-03 14:59:07 -07004590@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004591@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004592def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004593 """Uploads the current changelist to codereview.
4594
4595 Can skip dependency patchset uploads for a branch by running:
4596 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004597 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004598 git config --unset branch.branch_name.skip-deps-uploads
4599 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004600
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004601 If the name of the checked out branch starts with "bug-" or "fix-" followed
4602 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004603 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004604
4605 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004606 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004607 [git-cl] add support for hashtags
4608 Foo bar: implement foo
4609 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004610 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004611 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4612 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004613 parser.add_option('--bypass-watchlists', action='store_true',
4614 dest='bypass_watchlists',
4615 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004616 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004617 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004618 parser.add_option('--message', '-m', dest='message',
4619 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004620 parser.add_option('-b', '--bug',
4621 help='pre-populate the bug number(s) for this issue. '
4622 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004623 parser.add_option('--message-file', dest='message_file',
4624 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004625 parser.add_option('--title', '-t', dest='title',
4626 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004627 parser.add_option('-T', '--skip-title', action='store_true',
4628 dest='skip_title',
4629 help='Use the most recent commit message as the title of '
4630 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004631 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004632 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004633 help='reviewer email addresses')
4634 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004635 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004636 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004637 parser.add_option('--hashtag', dest='hashtags',
4638 action='append', default=[],
4639 help=('Gerrit hashtag for new CL; '
4640 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004641 parser.add_option('-s',
4642 '--send-mail',
4643 '--send-email',
4644 dest='send_mail',
4645 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004646 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004647 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004648 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004649 metavar='TARGET',
4650 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004651 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004652 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004653 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004654 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004655 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004656 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004657 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004658 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4659 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004660 parser.add_option('-c',
4661 '--use-commit-queue',
4662 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004663 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004664 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004665 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004666 parser.add_option('-d', '--cq-dry-run',
4667 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004668 help='Send the patchset to do a CQ dry run right after '
4669 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004670 parser.add_option(
4671 '-q',
4672 '--cq-quick-run',
4673 action='store_true',
4674 default=False,
4675 help='Send the patchset to do a CQ quick run right after '
4676 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4677 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004678 parser.add_option('--set-bot-commit', action='store_true',
4679 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004680 parser.add_option('--preserve-tryjobs', action='store_true',
4681 help='instruct the CQ to let tryjobs running even after '
4682 'new patchsets are uploaded instead of canceling '
4683 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004684 parser.add_option('--dependencies', action='store_true',
4685 help='Uploads CLs of all the local branches that depend on '
4686 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004687 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4688 help='Sends your change to the CQ after an approval. Only '
4689 'works on repos that have the Auto-Submit label '
4690 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004691 parser.add_option('--parallel', action='store_true',
4692 help='Run all tests specified by input_api.RunTests in all '
4693 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004694 parser.add_option('--no-autocc', action='store_true',
4695 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004696 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004697 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004698 parser.add_option('-R', '--retry-failed', action='store_true',
4699 help='Retry failed tryjobs from old patchset immediately '
4700 'after uploading new patchset. Cannot be used with '
4701 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004702 parser.add_option('--fixed', '-x',
4703 help='List of bugs that will be commented on and marked '
4704 'fixed (pre-populates "Fixed:" tag). Same format as '
4705 '-b option / "Bug:" tag. If fixing several issues, '
4706 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004707 parser.add_option('--edit-description', action='store_true', default=False,
4708 help='Modify description before upload. Cannot be used '
4709 'with --force. It is a noop when --no-squash is set '
4710 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004711 parser.add_option('--git-completion-helper', action="store_true",
4712 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004713 parser.add_option('-o',
4714 '--push-options',
4715 action='append',
4716 default=[],
4717 help='Transmit the given string to the server when '
4718 'performing git push (pass-through). See git-push '
4719 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004720 parser.add_option('--no-add-changeid',
4721 action='store_true',
4722 dest='no_add_changeid',
4723 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004724 parser.add_option('--no-python2-post-upload-hooks',
4725 action='store_true',
4726 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004727 parser.add_option('--cherry-pick-stacked',
4728 '--cp',
4729 dest='cherry_pick_stacked',
4730 action='store_true',
4731 help='If parent branch has un-uploaded updates, '
4732 'automatically skip parent branches and just upload '
4733 'the current branch cherry-pick on its parent\'s last '
4734 'uploaded commit. Allows users to skip the potential '
4735 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004736 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004737
rmistry@google.com2dd99862015-06-22 12:22:18 +00004738 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004739 (options, args) = parser.parse_args(args)
4740
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004741 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004742 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4743 if opt.help != optparse.SUPPRESS_HELP))
4744 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004745
sbc@chromium.org71437c02015-04-09 19:29:40 +00004746 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004747 return 1
4748
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004749 options.reviewers = cleanup_list(options.reviewers)
4750 options.cc = cleanup_list(options.cc)
4751
Josipe827b0f2020-01-30 00:07:20 +00004752 if options.edit_description and options.force:
4753 parser.error('Only one of --force and --edit-description allowed')
4754
tandriib80458a2016-06-23 12:20:07 -07004755 if options.message_file:
4756 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004757 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004758 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004759
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004760 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004761 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004762 options.use_commit_queue,
4763 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004764 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4765 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004766
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004767 if options.skip_title and options.title:
4768 parser.error('Only one of --title and --skip-title allowed.')
4769
Aaron Gableedbc4132017-09-11 13:22:28 -07004770 if options.use_commit_queue:
4771 options.send_mail = True
4772
Edward Lesmes0dd54822020-03-26 18:24:25 +00004773 if options.squash is None:
4774 # Load default for user, repo, squash=true, in this order.
4775 options.squash = settings.GetSquashGerritUploads()
4776
Joanna Wang5051ffe2023-03-01 22:24:07 +00004777 cl = Changelist(branchref=options.target_branch)
4778
4779 # Warm change details cache now to avoid RPCs later, reducing latency for
4780 # developers.
4781 if cl.GetIssue():
4782 cl._GetChangeDetail(
4783 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4784
4785 if options.retry_failed and not cl.GetIssue():
4786 print('No previous patchsets, so --retry-failed has no effect.')
4787 options.retry_failed = False
4788
4789 remote = cl.GetRemoteUrl()
4790 dogfood_stacked_changes = (os.environ.get('DOGFOOD_STACKED_CHANGES')
4791 not in ['1', '0']
4792 and any(repo in remote
4793 for repo in DOGFOOD_STACKED_CHANGES_REPOS))
4794
4795 if dogfood_stacked_changes:
4796 print('This repo has been enrolled in the stacked changes dogfood. '
4797 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4798 'File bugs at https://bit.ly/3Y6opoI')
4799
4800 if options.squash and (dogfood_stacked_changes
4801 or os.environ.get('DOGFOOD_STACKED_CHANGES') == '1'):
Joanna Wangdd12deb2023-01-26 20:43:28 +00004802 if options.dependencies:
4803 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004804
Joanna Wangd75fc882023-03-01 21:53:34 +00004805 if options.cherry_pick_stacked:
4806 try:
4807 orig_args.remove('--cherry-pick-stacked')
4808 except ValueError:
4809 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004810 UploadAllSquashed(options, orig_args)
4811 return 0
4812
Joanna Wangd75fc882023-03-01 21:53:34 +00004813 if options.cherry_pick_stacked:
4814 parser.error('--cherry-pick-stacked is not available for this workflow.')
4815
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004816 # cl.GetMostRecentPatchset uses cached information, and can return the last
4817 # patchset before upload. Calling it here makes it clear that it's the
4818 # last patchset before upload. Note that GetMostRecentPatchset will fail
4819 # if no CL has been uploaded yet.
4820 if options.retry_failed:
4821 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004822
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004823 ret = cl.CMDUpload(options, args, orig_args)
4824
4825 if options.retry_failed:
4826 if ret != 0:
4827 print('Upload failed, so --retry-failed has no effect.')
4828 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004829 builds, _ = _fetch_latest_builds(cl,
4830 DEFAULT_BUILDBUCKET_HOST,
4831 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004832 jobs = _filter_failed_for_retry(builds)
4833 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004834 print('No failed tryjobs, so --retry-failed has no effect.')
4835 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004836 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004837
4838 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004839
4840
Joanna Wang18de1f62023-01-21 01:24:24 +00004841def UploadAllSquashed(options, orig_args):
4842 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4843 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004844 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004845
Joanna Wangc710e2d2023-01-25 14:53:22 +00004846 # Create commits.
4847 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4848 if cherry_pick_current:
4849 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4850 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4851 uploads_by_cl.append((cls[0], new_upload))
4852 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004853 ordered_cls = list(reversed(cls))
4854
Joanna Wang6215dd02023-02-07 15:58:03 +00004855 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004856 # We can only support external changes when we're only uploading one
4857 # branch.
4858 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
4859 if parent is None:
4860 origin = '.'
4861 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004862
Joanna Wang7603f042023-03-01 22:17:36 +00004863 while origin == '.':
4864 # Search for cl's closest ancestor with a gerrit hash.
4865 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4866 if origin == '.':
4867 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4868
4869 # Support the `git merge` and `git pull` workflow.
4870 if upstream_branch in ['master', 'main']:
4871 parent = cl.GetCommonAncestorWithUpstream()
4872 else:
4873 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4874 upstream_branch,
4875 GERRIT_SQUASH_HASH_CONFIG_KEY)
4876 if parent:
4877 break
4878 branch = upstream_branch
4879 else:
4880 # Either the root of the tree is the cl's direct parent and the while
4881 # loop above only found empty branches between cl and the root of the
4882 # tree.
4883 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004884
Joanna Wangc710e2d2023-01-25 14:53:22 +00004885 for i, cl in enumerate(ordered_cls):
4886 # If we're in the middle of the stack, set end_commit to downstream's
4887 # direct ancestor.
4888 if i + 1 < len(ordered_cls):
4889 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4890 else:
4891 child_base_commit = None
4892 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004893 parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004894 end_commit=child_base_commit)
4895 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004896 parent = new_upload.commit_to_push
4897
4898 # Create refspec options
4899 cl, new_upload = uploads_by_cl[-1]
4900 refspec_opts = cl._GetRefSpecOptions(
4901 options,
4902 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004903 multi_change_upload=len(uploads_by_cl) > 1,
4904 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004905 refspec_suffix = ''
4906 if refspec_opts:
4907 refspec_suffix = '%' + ','.join(refspec_opts)
4908 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4909 refspec_suffix)
4910
4911 remote, remote_branch = cl.GetRemoteBranch()
4912 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4913 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4914 refspec_suffix)
4915
4916 # Git push
4917 git_push_metadata = {
4918 'gerrit_host':
4919 cl.GetGerritHost(),
4920 'title':
4921 options.title or '<untitled>',
4922 'change_id':
4923 git_footers.get_footer_change_id(new_upload.change_desc.description),
4924 'description':
4925 new_upload.change_desc.description,
4926 }
4927 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
4928 git_push_metadata)
4929
4930 # Post push updates
4931 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4932 change_numbers = [
4933 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4934 ]
4935
4936 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4937 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4938
4939 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004940
4941
4942def _UploadAllPrecheck(options, orig_args):
4943 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4944 """Checks the state of the tree and gives the user uploading options
4945
4946 Returns: A tuple of the ordered list of changes that have new commits
4947 since their last upload and a boolean of whether the user wants to
4948 cherry-pick and upload the current branch instead of uploading all cls.
4949 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004950 cl = Changelist()
4951 if cl.GetBranch() is None:
4952 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4953
Joanna Wang18de1f62023-01-21 01:24:24 +00004954 branch_ref = None
4955 cls = []
4956 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004957 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004958
4959 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4960
4961 while True:
4962 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4963 DieWithError(
4964 'More than %s branches in the stack have not been uploaded.\n'
4965 'Are your branches in a misconfigured state?\n'
4966 'If not, please upload some upstream changes first.' %
4967 (_MAX_STACKED_BRANCHES_UPLOAD))
4968
4969 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004970
Joanna Wang6215dd02023-02-07 15:58:03 +00004971 # Only add CL if it has anything to commit.
4972 base_commit = cl.GetCommonAncestorWithUpstream()
4973 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4974
4975 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4976 if diff:
4977 cls.append(cl)
4978 if (not first_pass and
4979 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4980 # We are mid-stack and the user must upload their upstream branches.
4981 must_upload_upstream = True
4982 elif first_pass: # The current branch has nothing to commit. Exit.
4983 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4984 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
4985 first_pass = False
4986
4987 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00004988 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00004989 branch_ref = upstream_branch_ref # set branch for next run.
4990
Joanna Wang6215dd02023-02-07 15:58:03 +00004991 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4992 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
4993 upstream_branch,
4994 LAST_UPLOAD_HASH_CONFIG_KEY)
4995
Joanna Wang18de1f62023-01-21 01:24:24 +00004996 # Case 1: We've reached the beginning of the tree.
4997 if origin != '.':
4998 break
4999
Joanna Wang18de1f62023-01-21 01:24:24 +00005000 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005001 # the user MUST upload them unless they are empty. Continue to
5002 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005003 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005004 continue
5005
Joanna Wang18de1f62023-01-21 01:24:24 +00005006 # Case 3: If upstream's last_upload == cl.base_commit we do
5007 # not need to upload any more upstreams from this point on.
5008 # (Even if there may be diverged branches higher up the tree)
5009 if base_commit == upstream_last_upload:
5010 break
5011
5012 # Case 4: If upstream's last_upload < cl.base_commit we are
5013 # uploading cl and upstream_cl.
5014 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005015 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005016 continue
5017
5018 # Case 5: If cl.base_commit < upstream's last_upload the user
5019 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005020 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005021 DieWithError(
5022 'At least one branch in the stack has diverged from its upstream '
5023 'branch and does not contain its upstream\'s last upload.\n'
5024 'Please rebase the stack with `git rebase-update` before uploading.')
5025
5026 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5027 # any relation to commits in the tree. Continue up the tree until we hit
5028 # the root.
5029
5030 # We assume all cls in the stack have the same auth requirements and only
5031 # check this once.
5032 cls[0].EnsureAuthenticated(force=options.force)
5033
5034 cherry_pick = False
5035 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005036 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005037 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005038 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005039 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005040 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005041 msg = ('At least one parent branch in `%s` has never been uploaded '
5042 'and must be uploaded before/with `%s`.\n' %
5043 (branches, cls[1].branch))
5044 if options.cherry_pick_stacked:
5045 DieWithError(msg)
5046 if not options.force:
5047 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005048 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005049 if options.cherry_pick_stacked:
5050 print('cherry-picking `%s` on %s\'s last upload' %
5051 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005052 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005053 elif not options.force:
5054 answer = gclient_utils.AskForData(
5055 '\n' + opt_message +
5056 'Press enter to update branches %s.\nOr type `n` to upload only '
5057 '`%s` cherry-picked on %s\'s last upload:' %
5058 (branches, cls[0].branch, cls[1].branch))
5059 if answer.lower() == 'n':
5060 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005061 return cls, cherry_pick
5062
5063
Francois Dorayd42c6812017-05-30 15:10:20 -04005064@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005065@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005066def CMDsplit(parser, args):
5067 """Splits a branch into smaller branches and uploads CLs.
5068
5069 Creates a branch and uploads a CL for each group of files modified in the
5070 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005071 comment, the string '$directory', is replaced with the directory containing
5072 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005073 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005074 parser.add_option('-d', '--description', dest='description_file',
5075 help='A text file containing a CL description in which '
5076 '$directory will be replaced by each CL\'s directory.')
5077 parser.add_option('-c', '--comment', dest='comment_file',
5078 help='A text file containing a CL comment.')
5079 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005080 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005081 help='List the files and reviewers for each CL that would '
5082 'be created, but don\'t create branches or CLs.')
5083 parser.add_option('--cq-dry-run', action='store_true',
5084 help='If set, will do a cq dry run for each uploaded CL. '
5085 'Please be careful when doing this; more than ~10 CLs '
5086 'has the potential to overload our build '
5087 'infrastructure. Try to upload these not during high '
5088 'load times (usually 11-3 Mountain View time). Email '
5089 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005090 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5091 default=True,
5092 help='Sends your change to the CQ after an approval. Only '
5093 'works on repos that have the Auto-Submit label '
5094 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005095 parser.add_option('--max-depth',
5096 type='int',
5097 default=0,
5098 help='The max depth to look for OWNERS files. Useful for '
5099 'controlling the granularity of the split CLs, e.g. '
5100 '--max-depth=1 will only split by top-level '
5101 'directory. Specifying a value less than 1 means no '
5102 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005103 options, _ = parser.parse_args(args)
5104
5105 if not options.description_file:
5106 parser.error('No --description flag specified.')
5107
5108 def WrappedCMDupload(args):
5109 return CMDupload(OptionParser(), args)
5110
Daniel Cheng403c44e2022-10-05 22:24:58 +00005111 return split_cl.SplitCl(options.description_file, options.comment_file,
5112 Changelist, WrappedCMDupload, options.dry_run,
5113 options.cq_dry_run, options.enable_auto_submit,
5114 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005115
5116
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005117@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005118@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005119def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005120 """DEPRECATED: Used to commit the current changelist via git-svn."""
5121 message = ('git-cl no longer supports committing to SVN repositories via '
5122 'git-svn. You probably want to use `git cl land` instead.')
5123 print(message)
5124 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005125
5126
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005127@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005128@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005129def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005130 """Commits the current changelist via git.
5131
5132 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5133 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005134 """
5135 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5136 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005137 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005138 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005139 parser.add_option('--parallel', action='store_true',
5140 help='Run all tests specified by input_api.RunTests in all '
5141 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005142 parser.add_option('--resultdb', action='store_true',
5143 help='Run presubmit checks in the ResultSink environment '
5144 'and send results to the ResultDB database.')
5145 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005146 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005147
Edward Lemur934836a2019-09-09 20:16:54 +00005148 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005149
Robert Iannucci2e73d432018-03-14 01:10:47 -07005150 if not cl.GetIssue():
5151 DieWithError('You must upload the change first to Gerrit.\n'
5152 ' If you would rather have `git cl land` upload '
5153 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005154 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5155 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005156
5157
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005158@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005159@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005160def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005161 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005162 parser.add_option('-b', dest='newbranch',
5163 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005164 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005165 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005166 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005167 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005168
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005169 group = optparse.OptionGroup(
5170 parser,
5171 'Options for continuing work on the current issue uploaded from a '
5172 'different clone (e.g. different machine). Must be used independently '
5173 'from the other options. No issue number should be specified, and the '
5174 'branch must have an issue number associated with it')
5175 group.add_option('--reapply', action='store_true', dest='reapply',
5176 help='Reset the branch and reapply the issue.\n'
5177 'CAUTION: This will undo any local changes in this '
5178 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005179
5180 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005181 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005182 parser.add_option_group(group)
5183
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005184 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005185
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005186 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005187 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005188 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005189 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005190 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005191
Edward Lemur934836a2019-09-09 20:16:54 +00005192 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005193 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005194 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005195
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005196 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005197 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005198 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005199
5200 RunGit(['reset', '--hard', upstream])
5201 if options.pull:
5202 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005203
Edward Lemur678a6842019-10-03 22:25:05 +00005204 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005205 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5206 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005207
5208 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005209 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005210
Edward Lemurf38bc172019-09-03 21:02:13 +00005211 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005212 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005213 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005214
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005215 # We don't want uncommitted changes mixed up with the patch.
5216 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005217 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005218
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005219 if options.newbranch:
5220 if options.force:
5221 RunGit(['branch', '-D', options.newbranch],
5222 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005223 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005224
Edward Lemur678a6842019-10-03 22:25:05 +00005225 cl = Changelist(
5226 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005227
Edward Lemur678a6842019-10-03 22:25:05 +00005228 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005229 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005230
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005231 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5232 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005233
5234
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005235def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005236 """Fetches the tree status and returns either 'open', 'closed',
5237 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005238 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005239 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005240 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005241 if status.find('closed') != -1 or status == '0':
5242 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005243
5244 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005245 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005246
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005247 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005248 return 'unset'
5249
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005250
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005251def GetTreeStatusReason():
5252 """Fetches the tree status from a json url and returns the message
5253 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005254 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005255 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005256 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005257 status = json.loads(connection.read())
5258 connection.close()
5259 return status['message']
5260
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005261
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005262@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005263def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005264 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005265 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005266 status = GetTreeStatus()
5267 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005268 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005269 return 2
5270
vapiera7fbd5a2016-06-16 09:17:49 -07005271 print('The tree is %s' % status)
5272 print()
5273 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005274 if status != 'open':
5275 return 1
5276 return 0
5277
5278
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005279@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005280def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005281 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5282 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005283 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005284 '-b', '--bot', action='append',
5285 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5286 'times to specify multiple builders. ex: '
5287 '"-b win_rel -b win_layout". See '
5288 'the try server waterfall for the builders name and the tests '
5289 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005290 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005291 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005292 help=('Buildbucket bucket to send the try requests. Format: '
5293 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005294 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005295 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005296 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005297 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005298 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005299 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005300 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005301 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005302 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005303 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005304 '-q',
5305 '--quick-run',
5306 action='store_true',
5307 default=False,
5308 help='trigger in quick run mode '
5309 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5310 'uick_run.md) (chromium only).')
5311 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005312 '--category', default='git_cl_try', help='Specify custom build category.')
5313 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005314 '--project',
5315 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005316 'in recipe to determine to which repository or directory to '
5317 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005318 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005319 '-p', '--property', dest='properties', action='append', default=[],
5320 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005321 'key2=value2 etc. The value will be treated as '
5322 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005323 'NOTE: using this may make your tryjob not usable for CQ, '
5324 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005325 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005326 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5327 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005328 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005329 parser.add_option(
5330 '-R', '--retry-failed', action='store_true', default=False,
5331 help='Retry failed jobs from the latest set of tryjobs. '
5332 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005333 parser.add_option(
5334 '-i', '--issue', type=int,
5335 help='Operate on this issue instead of the current branch\'s implicit '
5336 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005337 options, args = parser.parse_args(args)
5338
machenbach@chromium.org45453142015-09-15 08:45:22 +00005339 # Make sure that all properties are prop=value pairs.
5340 bad_params = [x for x in options.properties if '=' not in x]
5341 if bad_params:
5342 parser.error('Got properties with missing "=": %s' % bad_params)
5343
maruel@chromium.org15192402012-09-06 12:38:29 +00005344 if args:
5345 parser.error('Unknown arguments: %s' % args)
5346
Edward Lemur934836a2019-09-09 20:16:54 +00005347 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005348 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005349 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005350
Edward Lemurf38bc172019-09-03 21:02:13 +00005351 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005352 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005353
tandriie113dfd2016-10-11 10:20:12 -07005354 error_message = cl.CannotTriggerTryJobReason()
5355 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005356 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005357
Edward Lemur45768512020-03-02 19:03:14 +00005358 if options.bot:
5359 if options.retry_failed:
5360 parser.error('--bot is not compatible with --retry-failed.')
5361 if not options.bucket:
5362 parser.error('A bucket (e.g. "chromium/try") is required.')
5363
5364 triggered = [b for b in options.bot if 'triggered' in b]
5365 if triggered:
5366 parser.error(
5367 'Cannot schedule builds on triggered bots: %s.\n'
5368 'This type of bot requires an initial job from a parent (usually a '
5369 'builder). Schedule a job on the parent instead.\n' % triggered)
5370
5371 if options.bucket.startswith('.master'):
5372 parser.error('Buildbot masters are not supported.')
5373
5374 project, bucket = _parse_bucket(options.bucket)
5375 if project is None or bucket is None:
5376 parser.error('Invalid bucket: %s.' % options.bucket)
5377 jobs = sorted((project, bucket, bot) for bot in options.bot)
5378 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005379 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005380 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005381 if options.verbose:
5382 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005383 jobs = _filter_failed_for_retry(builds)
5384 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005385 print('There are no failed jobs in the latest set of jobs '
5386 '(patchset #%d), doing nothing.' % patchset)
5387 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005388 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005389 if num_builders > 10:
5390 confirm_or_exit('There are %d builders with failed builds.'
5391 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005392 elif options.quick_run:
5393 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5394 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005395 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005396 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005397 print('git cl try with no bots now defaults to CQ dry run.')
5398 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5399 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005400
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005401 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005402 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005403 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005404 except BuildbucketResponseException as ex:
5405 print('ERROR: %s' % ex)
5406 return 1
5407 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005408
5409
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005410@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005411def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005412 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005413 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005414 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005415 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005416 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005417 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005418 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005419 '--color', action='store_true', default=setup_color.IS_TTY,
5420 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005421 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005422 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5423 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005424 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005425 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005426 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005427 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005428 parser.add_option(
5429 '-i', '--issue', type=int,
5430 help='Operate on this issue instead of the current branch\'s implicit '
5431 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005432 options, args = parser.parse_args(args)
5433 if args:
5434 parser.error('Unrecognized args: %s' % ' '.join(args))
5435
Edward Lemur934836a2019-09-09 20:16:54 +00005436 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005437 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005438 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005439
tandrii221ab252016-10-06 08:12:04 -07005440 patchset = options.patchset
5441 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005442 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005443 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005444 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005445 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005446 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005447 cl.GetIssue())
5448
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005449 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005450 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005451 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005452 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005453 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005454 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005455 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005456 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005457 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005458 return 0
5459
5460
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005461@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005462@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005463def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005464 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005465 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005466 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005467 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005468
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005469 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005470 if args:
5471 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005472 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005473 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005474 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005475 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005476
5477 # Clear configured merge-base, if there is one.
5478 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005479 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005480 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005481 return 0
5482
5483
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005484@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005485def CMDweb(parser, args):
5486 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005487 parser.add_option('-p',
5488 '--print-only',
5489 action='store_true',
5490 dest='print_only',
5491 help='Only print the Gerrit URL, don\'t open it in the '
5492 'browser.')
5493 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005494 if args:
5495 parser.error('Unrecognized args: %s' % ' '.join(args))
5496
5497 issue_url = Changelist().GetIssueURL()
5498 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005499 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005500 return 1
5501
Orr Bernstein0b960582022-12-22 20:16:18 +00005502 if options.print_only:
5503 print(issue_url)
5504 return 0
5505
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005506 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005507 # allows us to hide the "Created new window in existing browser session."
5508 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005509 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005510 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005511 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005512 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005513 os.open(os.devnull, os.O_RDWR)
5514 try:
5515 webbrowser.open(issue_url)
5516 finally:
5517 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005518 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005519 return 0
5520
5521
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005522@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005523def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005524 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005525 parser.add_option('-d', '--dry-run', action='store_true',
5526 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005527 parser.add_option(
5528 '-q',
5529 '--quick-run',
5530 action='store_true',
5531 help='trigger in quick run mode '
5532 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5533 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005534 parser.add_option('-c', '--clear', action='store_true',
5535 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005536 parser.add_option(
5537 '-i', '--issue', type=int,
5538 help='Operate on this issue instead of the current branch\'s implicit '
5539 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005540 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005541 if args:
5542 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005543 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5544 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005545
Edward Lemur934836a2019-09-09 20:16:54 +00005546 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005547 if not cl.GetIssue():
5548 parser.error('Must upload the issue first.')
5549
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005550 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005551 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005552 elif options.quick_run:
5553 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005554 elif options.dry_run:
5555 state = _CQState.DRY_RUN
5556 else:
5557 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005558 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005559 return 0
5560
5561
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005562@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005563def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005564 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005565 parser.add_option(
5566 '-i', '--issue', type=int,
5567 help='Operate on this issue instead of the current branch\'s implicit '
5568 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005569 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005570 if args:
5571 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005572 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005573 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005574 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005575 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005576 cl.CloseIssue()
5577 return 0
5578
5579
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005580@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005581def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005582 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005583 parser.add_option(
5584 '--stat',
5585 action='store_true',
5586 dest='stat',
5587 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005588 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005589 if args:
5590 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005591
Edward Lemur934836a2019-09-09 20:16:54 +00005592 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005593 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005594 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005595 if not issue:
5596 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005597
Gavin Makbe2e9262022-11-08 23:41:55 +00005598 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005599 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005600 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005601 if not base:
5602 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5603 revision_info = detail['revisions'][detail['current_revision']]
5604 fetch_info = revision_info['fetch']['http']
5605 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5606 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005607
Aaron Gablea718c3e2017-08-28 17:47:28 -07005608 cmd = ['git', 'diff']
5609 if options.stat:
5610 cmd.append('--stat')
5611 cmd.append(base)
5612 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005613
5614 return 0
5615
5616
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005617@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005618def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005619 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005620 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005621 '--ignore-current',
5622 action='store_true',
5623 help='Ignore the CL\'s current reviewers and start from scratch.')
5624 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005625 '--ignore-self',
5626 action='store_true',
5627 help='Do not consider CL\'s author as an owners.')
5628 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005629 '--no-color',
5630 action='store_true',
5631 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005632 parser.add_option(
5633 '--batch',
5634 action='store_true',
5635 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005636 # TODO: Consider moving this to another command, since other
5637 # git-cl owners commands deal with owners for a given CL.
5638 parser.add_option(
5639 '--show-all',
5640 action='store_true',
5641 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005642 options, args = parser.parse_args(args)
5643
Edward Lemur934836a2019-09-09 20:16:54 +00005644 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005645 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005646
Yang Guo6e269a02019-06-26 11:17:02 +00005647 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005648 if len(args) == 0:
5649 print('No files specified for --show-all. Nothing to do.')
5650 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005651 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005652 for path in args:
5653 print('Owners for %s:' % path)
5654 print('\n'.join(
5655 ' - %s' % owner
5656 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005657 return 0
5658
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005659 if args:
5660 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005661 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005662 base_branch = args[0]
5663 else:
5664 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005665 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005666
Edward Lemur2c62b332020-03-12 22:12:33 +00005667 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005668
5669 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005670 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5671 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005672 return 0
5673
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005674 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005675 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005676 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005677 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005678 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005679 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005680 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005681
5682
Aiden Bennerc08566e2018-10-03 17:52:42 +00005683def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005684 """Generates a diff command."""
5685 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005686 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5687
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005688 if allow_prefix:
5689 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5690 # case that diff.noprefix is set in the user's git config.
5691 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5692 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005693 diff_cmd += ['--no-prefix']
5694
5695 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005696
5697 if args:
5698 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005699 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005700 diff_cmd.append(arg)
5701 else:
5702 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005703
5704 return diff_cmd
5705
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005706
Jamie Madill5e96ad12020-01-13 16:08:35 +00005707def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5708 """Runs clang-format-diff and sets a return value if necessary."""
5709
5710 if not clang_diff_files:
5711 return 0
5712
5713 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5714 # formatted. This is used to block during the presubmit.
5715 return_value = 0
5716
5717 # Locate the clang-format binary in the checkout
5718 try:
5719 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5720 except clang_format.NotFoundError as e:
5721 DieWithError(e)
5722
5723 if opts.full or settings.GetFormatFullByDefault():
5724 cmd = [clang_format_tool]
5725 if not opts.dry_run and not opts.diff:
5726 cmd.append('-i')
5727 if opts.dry_run:
5728 for diff_file in clang_diff_files:
5729 with open(diff_file, 'r') as myfile:
5730 code = myfile.read().replace('\r\n', '\n')
5731 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5732 stdout = stdout.replace('\r\n', '\n')
5733 if opts.diff:
5734 sys.stdout.write(stdout)
5735 if code != stdout:
5736 return_value = 2
5737 else:
5738 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5739 if opts.diff:
5740 sys.stdout.write(stdout)
5741 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005742 try:
5743 script = clang_format.FindClangFormatScriptInChromiumTree(
5744 'clang-format-diff.py')
5745 except clang_format.NotFoundError as e:
5746 DieWithError(e)
5747
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005748 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005749 if not opts.dry_run and not opts.diff:
5750 cmd.append('-i')
5751
5752 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005753 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005754
Edward Lesmes89624cd2020-04-06 17:51:56 +00005755 env = os.environ.copy()
5756 env['PATH'] = (
5757 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5758 stdout = RunCommand(
5759 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005760 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005761 if opts.diff:
5762 sys.stdout.write(stdout)
5763 if opts.dry_run and len(stdout) > 0:
5764 return_value = 2
5765
5766 return return_value
5767
5768
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005769def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5770 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5771 presubmit checks have failed (and returns 0 otherwise)."""
5772
5773 if not rust_diff_files:
5774 return 0
5775
5776 # Locate the rustfmt binary.
5777 try:
5778 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5779 except rustfmt.NotFoundError as e:
5780 DieWithError(e)
5781
5782 # TODO(crbug.com/1231317): Support formatting only the changed lines
5783 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5784 # https://github.com/emilio/rustfmt-format-diff
5785 cmd = [rustfmt_tool]
5786 if opts.dry_run:
5787 cmd.append('--check')
5788 cmd += rust_diff_files
5789 rustfmt_exitcode = subprocess2.call(cmd)
5790
5791 if opts.presubmit and rustfmt_exitcode != 0:
5792 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005793
5794 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005795
5796
Olivier Robin0a6b5442022-04-07 07:25:04 +00005797def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5798 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5799 that presubmit checks have failed (and returns 0 otherwise)."""
5800
5801 if not swift_diff_files:
5802 return 0
5803
5804 # Locate the swift-format binary.
5805 try:
5806 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5807 except swift_format.NotFoundError as e:
5808 DieWithError(e)
5809
5810 cmd = [swift_format_tool]
5811 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005812 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005813 else:
5814 cmd += ['format', '-i']
5815 cmd += swift_diff_files
5816 swift_format_exitcode = subprocess2.call(cmd)
5817
5818 if opts.presubmit and swift_format_exitcode != 0:
5819 return 2
5820
5821 return 0
5822
5823
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005824def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005825 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005826 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005827
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005828
enne@chromium.org555cfe42014-01-29 18:21:39 +00005829@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005830@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005831def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005832 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005833 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005834 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005835 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005836 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005837 parser.add_option('--full', action='store_true',
5838 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005839 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005840 parser.add_option('--dry-run', action='store_true',
5841 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005842 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005843 '--no-clang-format',
5844 dest='clang_format',
5845 action='store_false',
5846 default=True,
5847 help='Disables formatting of various file types using clang-format.')
5848 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005849 '--python',
5850 action='store_true',
5851 default=None,
5852 help='Enables python formatting on all python files.')
5853 parser.add_option(
5854 '--no-python',
5855 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005856 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005857 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005858 'If neither --python or --no-python are set, python files that have a '
5859 '.style.yapf file in an ancestor directory will be formatted. '
5860 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005861 parser.add_option(
5862 '--js',
5863 action='store_true',
5864 help='Format javascript code with clang-format. '
5865 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005866 parser.add_option('--diff', action='store_true',
5867 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005868 parser.add_option('--presubmit', action='store_true',
5869 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005870
5871 parser.add_option('--rust-fmt',
5872 dest='use_rust_fmt',
5873 action='store_true',
5874 default=rustfmt.IsRustfmtSupported(),
5875 help='Enables formatting of Rust file types using rustfmt.')
5876 parser.add_option(
5877 '--no-rust-fmt',
5878 dest='use_rust_fmt',
5879 action='store_false',
5880 help='Disables formatting of Rust file types using rustfmt.')
5881
Olivier Robin0a6b5442022-04-07 07:25:04 +00005882 parser.add_option(
5883 '--swift-format',
5884 dest='use_swift_format',
5885 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005886 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005887 help='Enables formatting of Swift file types using swift-format '
5888 '(macOS host only).')
5889 parser.add_option(
5890 '--no-swift-format',
5891 dest='use_swift_format',
5892 action='store_false',
5893 help='Disables formatting of Swift file types using swift-format.')
5894
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005895 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005896
Garrett Beaty91a6f332020-01-06 16:57:24 +00005897 if opts.python is not None and opts.no_python:
5898 raise parser.error('Cannot set both --python and --no-python')
5899 if opts.no_python:
5900 opts.python = False
5901
Daniel Chengc55eecf2016-12-30 03:11:02 -08005902 # Normalize any remaining args against the current path, so paths relative to
5903 # the current directory are still resolved as expected.
5904 args = [os.path.join(os.getcwd(), arg) for arg in args]
5905
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005906 # git diff generates paths against the root of the repository. Change
5907 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005908 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005909 if rel_base_path:
5910 os.chdir(rel_base_path)
5911
digit@chromium.org29e47272013-05-17 17:01:46 +00005912 # Grab the merge-base commit, i.e. the upstream commit of the current
5913 # branch when it was created or the last time it was rebased. This is
5914 # to cover the case where the user may have called "git fetch origin",
5915 # moving the origin branch to a newer commit, but hasn't rebased yet.
5916 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005917 upstream_branch = opts.upstream
5918 if not upstream_branch:
5919 cl = Changelist()
5920 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005921 if upstream_branch:
5922 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5923 upstream_commit = upstream_commit.strip()
5924
5925 if not upstream_commit:
5926 DieWithError('Could not find base commit for this branch. '
5927 'Are you in detached state?')
5928
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005929 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5930 diff_output = RunGit(changed_files_cmd)
5931 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005932 # Filter out files deleted by this CL
5933 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005934
Andreas Haas417d89c2020-02-06 10:24:27 +00005935 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005936 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005937
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005938 clang_diff_files = []
5939 if opts.clang_format:
5940 clang_diff_files = [
5941 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5942 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005943 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005944 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005945 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005946 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005947
Edward Lesmes50da7702020-03-30 19:23:43 +00005948 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005949
Jamie Madill5e96ad12020-01-13 16:08:35 +00005950 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5951 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005952
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005953 if opts.use_rust_fmt:
5954 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5955 upstream_commit)
5956 if rust_fmt_return_value == 2:
5957 return_value = 2
5958
Olivier Robin0a6b5442022-04-07 07:25:04 +00005959 if opts.use_swift_format:
5960 if sys.platform != 'darwin':
5961 DieWithError('swift-format is only supported on macOS.')
5962 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5963 upstream_commit)
5964 if swift_format_return_value == 2:
5965 return_value = 2
5966
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005967 # Similar code to above, but using yapf on .py files rather than clang-format
5968 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005969 py_explicitly_disabled = opts.python is not None and not opts.python
5970 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005971 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5972 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005973
Aiden Bennerc08566e2018-10-03 17:52:42 +00005974 # Used for caching.
5975 yapf_configs = {}
5976 for f in python_diff_files:
5977 # Find the yapf style config for the current file, defaults to depot
5978 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005979 _FindYapfConfigFile(f, yapf_configs, top_dir)
5980
5981 # Turn on python formatting by default if a yapf config is specified.
5982 # This breaks in the case of this repo though since the specified
5983 # style file is also the global default.
5984 if opts.python is None:
5985 filtered_py_files = []
5986 for f in python_diff_files:
5987 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5988 filtered_py_files.append(f)
5989 else:
5990 filtered_py_files = python_diff_files
5991
5992 # Note: yapf still seems to fix indentation of the entire file
5993 # even if line ranges are specified.
5994 # See https://github.com/google/yapf/issues/499
5995 if not opts.full and filtered_py_files:
5996 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5997
Brian Sheedyb4307d52019-12-02 19:18:17 +00005998 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5999 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6000 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006001
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006002 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006003 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6004 # Default to pep8 if not .style.yapf is found.
6005 if not yapf_style:
6006 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006007
Peter Wend9399922020-06-17 17:33:49 +00006008 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006009 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006010 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006011 else:
6012 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006013
6014 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006015
6016 has_formattable_lines = False
6017 if not opts.full:
6018 # Only run yapf over changed line ranges.
6019 for diff_start, diff_len in py_line_diffs[f]:
6020 diff_end = diff_start + diff_len - 1
6021 # Yapf errors out if diff_end < diff_start but this
6022 # is a valid line range diff for a removal.
6023 if diff_end >= diff_start:
6024 has_formattable_lines = True
6025 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6026 # If all line diffs were removals we have nothing to format.
6027 if not has_formattable_lines:
6028 continue
6029
6030 if opts.diff or opts.dry_run:
6031 cmd += ['--diff']
6032 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006033 stdout = RunCommand(cmd,
6034 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006035 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006036 cwd=top_dir,
6037 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006038 if opts.diff:
6039 sys.stdout.write(stdout)
6040 elif len(stdout) > 0:
6041 return_value = 2
6042 else:
6043 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006044 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006045
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006046 # Format GN build files. Always run on full build files for canonical form.
6047 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006048 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006049 if opts.dry_run or opts.diff:
6050 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006051 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006052 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006053 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006054 cwd=top_dir)
6055 if opts.dry_run and gn_ret == 2:
6056 return_value = 2 # Not formatted.
6057 elif opts.diff and gn_ret == 2:
6058 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006059 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006060 elif gn_ret != 0:
6061 # For non-dry run cases (and non-2 return values for dry-run), a
6062 # nonzero error code indicates a failure, probably because the file
6063 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006064 DieWithError('gn format failed on ' + gn_diff_file +
6065 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006066
Ilya Shermane081cbe2017-08-15 17:51:04 -07006067 # Skip the metrics formatting from the global presubmit hook. These files have
6068 # a separate presubmit hook that issues an error if the files need formatting,
6069 # whereas the top-level presubmit script merely issues a warning. Formatting
6070 # these files is somewhat slow, so it's important not to duplicate the work.
6071 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006072 for diff_xml in GetDiffXMLs(diff_files):
6073 xml_dir = GetMetricsDir(diff_xml)
6074 if not xml_dir:
6075 continue
6076
Ilya Shermane081cbe2017-08-15 17:51:04 -07006077 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006078 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006079 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006080
6081 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6082 # command as histograms/pretty_print.py now needs a relative path argument
6083 # after splitting the histograms into multiple directories.
6084 # For example, in tools/metrics/ukm, pretty-print could be run using:
6085 # $ python pretty_print.py
6086 # But in tools/metrics/histogrmas, pretty-print should be run with an
6087 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006088 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006089 # $ python pretty_print.py enums.xml
6090
Weilun Shib92c4b72020-08-27 17:45:11 +00006091 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006092 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006093 cmd.append(diff_xml)
6094
Ilya Shermane081cbe2017-08-15 17:51:04 -07006095 if opts.dry_run or opts.diff:
6096 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006097
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006098 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6099 # `shell` param and instead replace `'vpython'` with
6100 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006101 stdout = RunCommand(cmd,
6102 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006103 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006104 if opts.diff:
6105 sys.stdout.write(stdout)
6106 if opts.dry_run and stdout:
6107 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006108
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006109 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006110
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006111
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006112def GetDiffXMLs(diff_files):
6113 return [
6114 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6115 ]
6116
6117
6118def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006119 metrics_xml_dirs = [
6120 os.path.join('tools', 'metrics', 'actions'),
6121 os.path.join('tools', 'metrics', 'histograms'),
6122 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006123 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006124 os.path.join('tools', 'metrics', 'ukm'),
6125 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006126 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006127 if diff_xml.startswith(xml_dir):
6128 return xml_dir
6129 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006130
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006131
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006132@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006133@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006134def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006135 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006136 _, args = parser.parse_args(args)
6137
6138 if len(args) != 1:
6139 parser.print_help()
6140 return 1
6141
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006142 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006143 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006144 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006145
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006146 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006147
Edward Lemur52969c92020-02-06 18:15:28 +00006148 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006149 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006150 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006151
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006152 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006153 for key, issue in [x.split() for x in output.splitlines()]:
6154 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006155 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006156
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006157 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006158 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006159 return 1
6160 if len(branches) == 1:
6161 RunGit(['checkout', branches[0]])
6162 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006163 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006164 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006165 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006166 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006167 try:
6168 RunGit(['checkout', branches[int(which)]])
6169 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006170 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006171 return 1
6172
6173 return 0
6174
6175
maruel@chromium.org29404b52014-09-08 22:58:00 +00006176def CMDlol(parser, args):
6177 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006178 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006179 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6180 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6181 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006182 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006183 return 0
6184
6185
Josip Sokcevic0399e172022-03-21 23:11:51 +00006186def CMDversion(parser, args):
Josip Sokcevic0399e172022-03-21 23:11:51 +00006187 print(utils.depot_tools_version())
6188
6189
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006190class OptionParser(optparse.OptionParser):
6191 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006192
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006193 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006194 optparse.OptionParser.__init__(
6195 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006196 self.add_option(
6197 '-v', '--verbose', action='count', default=0,
6198 help='Use 2 times for more debugging info')
6199
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006200 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006201 try:
6202 return self._parse_args(args)
6203 finally:
6204 # Regardless of success or failure of args parsing, we want to report
6205 # metrics, but only after logging has been initialized (if parsing
6206 # succeeded).
6207 global settings
6208 settings = Settings()
6209
Edward Lesmes9c349062021-05-06 20:02:39 +00006210 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006211 # GetViewVCUrl ultimately calls logging method.
6212 project_url = settings.GetViewVCUrl().strip('/+')
6213 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6214 metrics.collector.add('project_urls', [project_url])
6215
6216 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006217 # Create an optparse.Values object that will store only the actual passed
6218 # options, without the defaults.
6219 actual_options = optparse.Values()
6220 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6221 # Create an optparse.Values object with the default options.
6222 options = optparse.Values(self.get_default_values().__dict__)
6223 # Update it with the options passed by the user.
6224 options._update_careful(actual_options.__dict__)
6225 # Store the options passed by the user in an _actual_options attribute.
6226 # We store only the keys, and not the values, since the values can contain
6227 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006228 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006229
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006230 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006231 logging.basicConfig(
6232 level=levels[min(options.verbose, len(levels) - 1)],
6233 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6234 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006235
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006236 return options, args
6237
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006238
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006239def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006240 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006241 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006242 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006243 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006244
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006245 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006246 dispatcher = subcommand.CommandDispatcher(__name__)
6247 try:
6248 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006249 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006250 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006251 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006252 if e.code != 500:
6253 raise
6254 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006255 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006256 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006257 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006258
6259
6260if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006261 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6262 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006263 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006264 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006265 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006266 sys.exit(main(sys.argv[1:]))