blob: 3fc335412e23846adcdaf165c7e5211fcf064f53 [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
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000048import rustfmt
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000049import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040050import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000051import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000052import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000053import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000054import watchlists
55
Josip Sokcevic688adfe2023-03-01 22:46:12 +000056from lib import change, scm, utils
Edward Lemur79d4f992019-11-11 23:49:02 +000057from third_party import six
58from six.moves import urllib
59
60
61if sys.version_info.major == 3:
62 basestring = (str,) # pylint: disable=redefined-builtin
63
Edward Lemurb9830242019-10-30 22:19:20 +000064
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
Edward Lemur0f58ae42019-04-30 17:24:12 +000067# Traces for git push will be stored in a traces directory inside the
68# depot_tools checkout.
69DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
70TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000071PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000072
73# When collecting traces, Git hashes will be reduced to 6 characters to reduce
74# the size after compression.
75GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
76# Used to redact the cookies from the gitcookies file.
77GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
78
Edward Lemurd4d1ba42019-09-20 21:46:37 +000079MAX_ATTEMPTS = 3
80
Edward Lemur1b52d872019-05-09 21:12:12 +000081# The maximum number of traces we will keep. Multiplied by 3 since we store
82# 3 files per trace.
83MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000084# Message to be displayed to the user to inform where to find the traces for a
85# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000086TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000087'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000088'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000089' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'Copies of your gitcookies file and git config have been recorded at:\n'
91' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000092# Format of the message to be stored as part of the traces to give developers a
93# better context when they go through traces.
94TRACES_README_FORMAT = (
95'Date: %(now)s\n'
96'\n'
97'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
98'Title: %(title)s\n'
99'\n'
100'%(description)s\n'
101'\n'
102'Execution time: %(execution_time)s\n'
103'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000104
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000112DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
113DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
114
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000115DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
116
thestig@chromium.org44202a22014-03-11 19:22:18 +0000117# Valid extensions for files we want to lint.
118DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
119DEFAULT_LINT_IGNORE_REGEX = r"$^"
120
Aiden Bennerc08566e2018-10-03 17:52:42 +0000121# File name for yapf style config files.
122YAPF_CONFIG_FILENAME = '.style.yapf'
123
Edward Lesmes50da7702020-03-30 19:23:43 +0000124# The issue, patchset and codereview server are stored on git config for each
125# branch under branch.<branch-name>.<config-key>.
126ISSUE_CONFIG_KEY = 'gerritissue'
127PATCHSET_CONFIG_KEY = 'gerritpatchset'
128CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000129# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
130# you make to Gerrit. Instead, it creates a new commit object that contains all
131# changes you've made, diffed against a parent/merge base.
132# This is the hash of the new squashed commit and you can find this on Gerrit.
133GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
134# This is the latest uploaded local commit hash.
135LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000136
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000137# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000138Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000139
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000140# Initialized in main()
141settings = None
142
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100143# Used by tests/git_cl_test.py to add extra logging.
144# Inside the weirdly failing test, add this:
145# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700146# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100147_IS_BEING_TESTED = False
148
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000149_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000150
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000151_KNOWN_GERRIT_TO_SHORT_URLS = {
152 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
153 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
154}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000155assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
156 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000157
158
Joanna Wang18de1f62023-01-21 01:24:24 +0000159# Maximum number of branches in a stack that can be traversed and uploaded
160# at once. Picked arbitrarily.
161_MAX_STACKED_BRANCHES_UPLOAD = 20
162
163
Joanna Wang5051ffe2023-03-01 22:24:07 +0000164# Repo prefixes that are enrolled in the stacked changes dogfood.
165DOGFOOD_STACKED_CHANGES_REPOS = [
166 'chromium.googlesource.com/infra/',
167 'chrome-internal.googlesource.com/infra/'
168]
169
170
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000171class GitPushError(Exception):
172 pass
173
174
Christopher Lamf732cd52017-01-24 12:40:11 +1100175def DieWithError(message, change_desc=None):
176 if change_desc:
177 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000178 print('\n ** Content of CL description **\n' +
179 '='*72 + '\n' +
180 change_desc.description + '\n' +
181 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100182
vapiera7fbd5a2016-06-16 09:17:49 -0700183 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000184 sys.exit(1)
185
186
Christopher Lamf732cd52017-01-24 12:40:11 +1100187def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000188 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000189 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000190 with open(backup_path, 'wb') as backup_file:
191 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100192
193
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000194def GetNoGitPagerEnv():
195 env = os.environ.copy()
196 # 'cat' is a magical git string that disables pagers on all platforms.
197 env['GIT_PAGER'] = 'cat'
198 return env
199
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000200
bsep@chromium.org627d9002016-04-29 00:00:52 +0000201def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000202 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000203 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
204 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000205 except subprocess2.CalledProcessError as e:
206 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000207 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000208 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
209 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000210 out = e.stdout.decode('utf-8', 'replace')
211 if e.stderr:
212 out += e.stderr.decode('utf-8', 'replace')
213 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000214
215
216def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000217 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000218 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000219
220
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000221def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000222 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700223 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000224 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700225 else:
226 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000227 try:
tandrii5d48c322016-08-18 16:19:37 -0700228 (out, _), code = subprocess2.communicate(['git'] + args,
229 env=GetNoGitPagerEnv(),
230 stdout=subprocess2.PIPE,
231 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000232 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700233 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900234 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000235 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000236
237
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000238def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000239 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000240 return RunGitWithCode(args, suppress_stderr=True)[1]
241
242
tandrii2a16b952016-10-19 07:09:44 -0700243def time_sleep(seconds):
244 # Use this so that it can be mocked in tests without interfering with python
245 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700246 return time.sleep(seconds)
247
248
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000249def time_time():
250 # Use this so that it can be mocked in tests without interfering with python
251 # system machinery.
252 return time.time()
253
254
Edward Lemur1b52d872019-05-09 21:12:12 +0000255def datetime_now():
256 # Use this so that it can be mocked in tests without interfering with python
257 # system machinery.
258 return datetime.datetime.now()
259
260
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100261def confirm_or_exit(prefix='', action='confirm'):
262 """Asks user to press enter to continue or press Ctrl+C to abort."""
263 if not prefix or prefix.endswith('\n'):
264 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100265 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100266 mid = ' Press'
267 elif prefix.endswith(' '):
268 mid = 'press'
269 else:
270 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000271 gclient_utils.AskForData(
272 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100273
274
275def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000276 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000277 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100278 while True:
279 if 'yes'.startswith(result):
280 return True
281 if 'no'.startswith(result):
282 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000283 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100284
285
machenbach@chromium.org45453142015-09-15 08:45:22 +0000286def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000287 prop_list = getattr(options, 'properties', [])
288 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000289 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000290 try:
291 properties[key] = json.loads(val)
292 except ValueError:
293 pass # If a value couldn't be evaluated, treat it as a string.
294 return properties
295
296
Edward Lemur4c707a22019-09-24 21:13:43 +0000297def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000298 """Calls a buildbucket v2 method and returns the parsed json response."""
299 headers = {
300 'Accept': 'application/json',
301 'Content-Type': 'application/json',
302 }
303 request = json.dumps(request)
304 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
305
306 logging.info('POST %s with %s' % (url, request))
307
308 attempts = 1
309 time_to_sleep = 1
310 while True:
311 response, content = http.request(url, 'POST', body=request, headers=headers)
312 if response.status == 200:
313 return json.loads(content[4:])
314 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
315 msg = '%s error when calling POST %s with %s: %s' % (
316 response.status, url, request, content)
317 raise BuildbucketResponseException(msg)
318 logging.debug(
319 '%s error when calling POST %s with %s. '
320 'Sleeping for %d seconds and retrying...' % (
321 response.status, url, request, time_to_sleep))
322 time.sleep(time_to_sleep)
323 time_to_sleep *= 2
324 attempts += 1
325
326 assert False, 'unreachable'
327
328
Edward Lemur6215c792019-10-03 21:59:05 +0000329def _parse_bucket(raw_bucket):
330 legacy = True
331 project = bucket = None
332 if '/' in raw_bucket:
333 legacy = False
334 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000335 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000336 elif raw_bucket.startswith('luci.'):
337 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000338 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000339 elif '.' in raw_bucket:
340 project = raw_bucket.split('.')[0]
341 bucket = raw_bucket
342 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000343 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000344 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
345 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000346
347
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000348def _canonical_git_googlesource_host(host):
349 """Normalizes Gerrit hosts (with '-review') to Git host."""
350 assert host.endswith(_GOOGLESOURCE)
351 # Prefix doesn't include '.' at the end.
352 prefix = host[:-(1 + len(_GOOGLESOURCE))]
353 if prefix.endswith('-review'):
354 prefix = prefix[:-len('-review')]
355 return prefix + '.' + _GOOGLESOURCE
356
357
358def _canonical_gerrit_googlesource_host(host):
359 git_host = _canonical_git_googlesource_host(host)
360 prefix = git_host.split('.', 1)[0]
361 return prefix + '-review.' + _GOOGLESOURCE
362
363
364def _get_counterpart_host(host):
365 assert host.endswith(_GOOGLESOURCE)
366 git = _canonical_git_googlesource_host(host)
367 gerrit = _canonical_gerrit_googlesource_host(git)
368 return git if gerrit == host else gerrit
369
370
Quinten Yearsley777660f2020-03-04 23:37:06 +0000371def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000372 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700373
374 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000375 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000376 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700377 options: Command-line options.
378 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000379 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000380 for project, bucket, builder in jobs:
381 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000382 print('To see results here, run: git cl try-results')
383 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700384
Quinten Yearsley777660f2020-03-04 23:37:06 +0000385 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000386 if not requests:
387 return
388
Edward Lemur5b929a42019-10-21 17:57:39 +0000389 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000390 http.force_exception_to_status_code = True
391
392 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000393 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
394 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000395
396 errors = [
397 ' ' + response['error']['message']
398 for response in batch_response.get('responses', [])
399 if 'error' in response
400 ]
401 if errors:
402 raise BuildbucketResponseException(
403 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
404
405
Quinten Yearsley777660f2020-03-04 23:37:06 +0000406def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000407 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000408 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000409 shared_properties = {
410 'category': options.ensure_value('category', 'git_cl_try')
411 }
412 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000413 shared_properties['clobber'] = True
414 shared_properties.update(_get_properties_from_options(options) or {})
415
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000416 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000417 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000418 shared_tags.append({'key': 'retry_failed',
419 'value': '1'})
420
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000421 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000422 for (project, bucket, builder) in jobs:
423 properties = shared_properties.copy()
424 if 'presubmit' in builder.lower():
425 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000426
Edward Lemur45768512020-03-02 19:03:14 +0000427 requests.append({
428 'scheduleBuild': {
429 'requestId': str(uuid.uuid4()),
430 'builder': {
431 'project': getattr(options, 'project', None) or project,
432 'bucket': bucket,
433 'builder': builder,
434 },
435 'gerritChanges': gerrit_changes,
436 'properties': properties,
437 'tags': [
438 {'key': 'builder', 'value': builder},
439 ] + shared_tags,
440 }
441 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000442
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000443 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000444 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000445 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000446 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000447 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000448 'id': options.revision,
449 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000450 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000451
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000452 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000453
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000454
Quinten Yearsley777660f2020-03-04 23:37:06 +0000455def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000456 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000457
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000458 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000459 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000460 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000461 request = {
462 'predicate': {
463 'gerritChanges': [changelist.GetGerritChange(patchset)],
464 },
465 'fields': ','.join('builds.*.' + field for field in fields),
466 }
tandrii221ab252016-10-06 08:12:04 -0700467
Edward Lemur5b929a42019-10-21 17:57:39 +0000468 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000469 if authenticator.has_cached_credentials():
470 http = authenticator.authorize(httplib2.Http())
471 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700472 print('Warning: Some results might be missing because %s' %
473 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000474 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000475 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000476 http.force_exception_to_status_code = True
477
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000478 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
479 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000480
Edward Lemur45768512020-03-02 19:03:14 +0000481
Edward Lemur5b929a42019-10-21 17:57:39 +0000482def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000483 """Fetches builds from the latest patchset that has builds (within
484 the last few patchsets).
485
486 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000487 changelist (Changelist): The CL to fetch builds for
488 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000489 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
490 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000491 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000492 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
493 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000494 """
495 assert buildbucket_host
496 assert changelist.GetIssue(), 'CL must be uploaded first'
497 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000498 if latest_patchset is None:
499 assert changelist.GetMostRecentPatchset()
500 ps = changelist.GetMostRecentPatchset()
501 else:
502 assert latest_patchset > 0, latest_patchset
503 ps = latest_patchset
504
Quinten Yearsley983111f2019-09-26 17:18:48 +0000505 min_ps = max(1, ps - 5)
506 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000507 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000508 if len(builds):
509 return builds, ps
510 ps -= 1
511 return [], 0
512
513
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000514def _filter_failed_for_retry(all_builds):
515 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000516
517 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000518 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000519 i.e. a list of buildbucket.v2.Builds which includes status and builder
520 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000521
522 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000523 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000524 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000525 """
Edward Lemur45768512020-03-02 19:03:14 +0000526 grouped = {}
527 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000528 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000529 key = (builder['project'], builder['bucket'], builder['builder'])
530 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000531
Edward Lemur45768512020-03-02 19:03:14 +0000532 jobs = []
533 for (project, bucket, builder), builds in grouped.items():
534 if 'triggered' in builder:
535 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
536 'from a parent. Please schedule a manual job for the parent '
537 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000538 continue
539 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
540 # Don't retry if any are running.
541 continue
Edward Lemur45768512020-03-02 19:03:14 +0000542 # If builder had several builds, retry only if the last one failed.
543 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
544 # build, but in case of retrying failed jobs retrying a flaky one makes
545 # sense.
546 builds = sorted(builds, key=lambda b: b['createTime'])
547 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
548 continue
549 # Don't retry experimental build previously triggered by CQ.
550 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
551 for t in builds[-1]['tags']):
552 continue
553 jobs.append((project, bucket, builder))
554
555 # Sort the jobs to make testing easier.
556 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000557
558
Quinten Yearsley777660f2020-03-04 23:37:06 +0000559def _print_tryjobs(options, builds):
560 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000561 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000562 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000563 return
564
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000565 longest_builder = max(len(b['builder']['builder']) for b in builds)
566 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000568 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
569 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000570
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000571 builds_by_status = {}
572 for b in builds:
573 builds_by_status.setdefault(b['status'], []).append({
574 'id': b['id'],
575 'name': name_fmt.format(
576 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
577 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000578
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000579 sort_key = lambda b: (b['name'], b['id'])
580
581 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000582 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000583 if not builds:
584 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000586 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000587 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000588 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000589 else:
590 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
591
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000592 print(colorize(title))
593 for b in sorted(builds, key=sort_key):
594 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595
596 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000597 print_builds(
598 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
599 print_builds(
600 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
601 color=Fore.MAGENTA)
602 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
603 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
604 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000605 print_builds('Started:', builds_by_status.pop('STARTED', []),
606 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000607 print_builds(
608 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000609 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000610 print_builds(
611 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000612 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000613
614
Aiden Bennerc08566e2018-10-03 17:52:42 +0000615def _ComputeDiffLineRanges(files, upstream_commit):
616 """Gets the changed line ranges for each file since upstream_commit.
617
618 Parses a git diff on provided files and returns a dict that maps a file name
619 to an ordered list of range tuples in the form (start_line, count).
620 Ranges are in the same format as a git diff.
621 """
622 # If files is empty then diff_output will be a full diff.
623 if len(files) == 0:
624 return {}
625
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000626 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000627 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000628 diff_output = RunGit(diff_cmd)
629
630 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
631 # 2 capture groups
632 # 0 == fname of diff file
633 # 1 == 'diff_start,diff_count' or 'diff_start'
634 # will match each of
635 # diff --git a/foo.foo b/foo.py
636 # @@ -12,2 +14,3 @@
637 # @@ -12,2 +17 @@
638 # running re.findall on the above string with pattern will give
639 # [('foo.py', ''), ('', '14,3'), ('', '17')]
640
641 curr_file = None
642 line_diffs = {}
643 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
644 if match[0] != '':
645 # Will match the second filename in diff --git a/a.py b/b.py.
646 curr_file = match[0]
647 line_diffs[curr_file] = []
648 else:
649 # Matches +14,3
650 if ',' in match[1]:
651 diff_start, diff_count = match[1].split(',')
652 else:
653 # Single line changes are of the form +12 instead of +12,1.
654 diff_start = match[1]
655 diff_count = 1
656
657 diff_start = int(diff_start)
658 diff_count = int(diff_count)
659
660 # If diff_count == 0 this is a removal we can ignore.
661 line_diffs[curr_file].append((diff_start, diff_count))
662
663 return line_diffs
664
665
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000666def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000667 """Checks if a yapf file is in any parent directory of fpath until top_dir.
668
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000669 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000670 is found returns None. Uses yapf_config_cache as a cache for previously found
671 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000672 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000673 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000674 # Return result if we've already computed it.
675 if fpath in yapf_config_cache:
676 return yapf_config_cache[fpath]
677
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000678 parent_dir = os.path.dirname(fpath)
679 if os.path.isfile(fpath):
680 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000681 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000682 # Otherwise fpath is a directory
683 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
684 if os.path.isfile(yapf_file):
685 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000686 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000687 # If we're at the top level directory, or if we're at root
688 # there is no provided style.
689 ret = None
690 else:
691 # Otherwise recurse on the current directory.
692 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000693 yapf_config_cache[fpath] = ret
694 return ret
695
696
Brian Sheedyb4307d52019-12-02 19:18:17 +0000697def _GetYapfIgnorePatterns(top_dir):
698 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000699
700 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
701 but this functionality appears to break when explicitly passing files to
702 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000703 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000704 the .yapfignore file should be in the directory that yapf is invoked from,
705 which we assume to be the top level directory in this case.
706
707 Args:
708 top_dir: The top level directory for the repository being formatted.
709
710 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000711 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000712 """
713 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000714 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000715 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000716 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000717
Anthony Politoc64e3902021-04-30 21:55:25 +0000718 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
719 stripped_line = line.strip()
720 # Comments and blank lines should be ignored.
721 if stripped_line.startswith('#') or stripped_line == '':
722 continue
723 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000724 return ignore_patterns
725
726
727def _FilterYapfIgnoredFiles(filepaths, patterns):
728 """Filters out any filepaths that match any of the given patterns.
729
730 Args:
731 filepaths: An iterable of strings containing filepaths to filter.
732 patterns: An iterable of strings containing fnmatch patterns to filter on.
733
734 Returns:
735 A list of strings containing all the elements of |filepaths| that did not
736 match any of the patterns in |patterns|.
737 """
738 # Not inlined so that tests can use the same implementation.
739 return [f for f in filepaths
740 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000741
742
Aaron Gable13101a62018-02-09 13:20:41 -0800743def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000744 """Prints statistics about the change to the user."""
745 # --no-ext-diff is broken in some versions of Git, so try to work around
746 # this by overriding the environment (but there is still a problem if the
747 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000748 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000749 if 'GIT_EXTERNAL_DIFF' in env:
750 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000751
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000752 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800753 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000754 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000755
756
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000757class BuildbucketResponseException(Exception):
758 pass
759
760
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000761class Settings(object):
762 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000764 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000765 self.tree_status_url = None
766 self.viewvc_url = None
767 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000768 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000769 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000770 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000771 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000772 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000773 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000774
Edward Lemur26964072020-02-19 19:18:51 +0000775 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000776 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000777 if self.updated:
778 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000779
Edward Lemur26964072020-02-19 19:18:51 +0000780 # The only value that actually changes the behavior is
781 # autoupdate = "false". Everything else means "true".
782 autoupdate = (
783 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
784
785 cr_settings_file = FindCodereviewSettingsFile()
786 if autoupdate != 'false' and cr_settings_file:
787 LoadCodereviewSettingsFromFile(cr_settings_file)
788 cr_settings_file.close()
789
790 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000791
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000792 @staticmethod
793 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000794 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000795
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000796 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000797 if self.root is None:
798 self.root = os.path.abspath(self.GetRelativeRoot())
799 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000801 def GetTreeStatusUrl(self, error_ok=False):
802 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000803 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
804 if self.tree_status_url is None and not error_ok:
805 DieWithError(
806 'You must configure your tree status URL by running '
807 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000808 return self.tree_status_url
809
810 def GetViewVCUrl(self):
811 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000812 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000813 return self.viewvc_url
814
rmistry@google.com90752582014-01-14 21:04:50 +0000815 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000816 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000817
rmistry@google.com5626a922015-02-26 14:03:30 +0000818 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000819 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000820 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000821 return run_post_upload_hook == "True"
822
Joanna Wangc8f23e22023-01-19 21:18:10 +0000823 def GetDefaultCCList(self):
824 return self._GetConfig('rietveld.cc')
825
Dirk Pranke6f0df682021-06-25 00:42:33 +0000826 def GetUsePython3(self):
827 return self._GetConfig('rietveld.use-python3')
828
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000829 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000830 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000831 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000832 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
833 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000834 # Default is squash now (http://crbug.com/611892#c23).
835 self.squash_gerrit_uploads = self._GetConfig(
836 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000837 return self.squash_gerrit_uploads
838
Edward Lesmes4de54132020-05-05 19:41:33 +0000839 def GetSquashGerritUploadsOverride(self):
840 """Return True or False if codereview.settings should be overridden.
841
842 Returns None if no override has been defined.
843 """
844 # See also http://crbug.com/611892#c23
845 result = self._GetConfig('gerrit.override-squash-uploads').lower()
846 if result == 'true':
847 return True
848 if result == 'false':
849 return False
850 return None
851
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000852 def GetIsGerrit(self):
853 """Return True if gerrit.host is set."""
854 if self.is_gerrit is None:
855 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
856 return self.is_gerrit
857
tandrii@chromium.org28253532016-04-14 13:46:56 +0000858 def GetGerritSkipEnsureAuthenticated(self):
859 """Return True if EnsureAuthenticated should not be done for Gerrit
860 uploads."""
861 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000862 self.gerrit_skip_ensure_authenticated = self._GetConfig(
863 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000864 return self.gerrit_skip_ensure_authenticated
865
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000866 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000867 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000868 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000869 # Git requires single quotes for paths with spaces. We need to replace
870 # them with double quotes for Windows to treat such paths as a single
871 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000872 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000873 return self.git_editor or None
874
thestig@chromium.org44202a22014-03-11 19:22:18 +0000875 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000876 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000877
878 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000879 return self._GetConfig(
880 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000881
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000882 def GetFormatFullByDefault(self):
883 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000884 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000885 result = (
886 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
887 error_ok=True).strip())
888 self.format_full_by_default = (result == 'true')
889 return self.format_full_by_default
890
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000891 def IsStatusCommitOrderByDate(self):
892 if self.is_status_commit_order_by_date is None:
893 result = (RunGit(['config', '--bool', 'cl.date-order'],
894 error_ok=True).strip())
895 self.is_status_commit_order_by_date = (result == 'true')
896 return self.is_status_commit_order_by_date
897
Edward Lemur26964072020-02-19 19:18:51 +0000898 def _GetConfig(self, key, default=''):
899 self._LazyUpdateIfNeeded()
900 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000901
902
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000903class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000904 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000905 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000906 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000907 DRY_RUN = 'dry_run'
908 COMMIT = 'commit'
909
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000910 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000911
912
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000913class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000914 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000915 self.issue = issue
916 self.patchset = patchset
917 self.hostname = hostname
918
919 @property
920 def valid(self):
921 return self.issue is not None
922
923
Edward Lemurf38bc172019-09-03 21:02:13 +0000924def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000925 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
926 fail_result = _ParsedIssueNumberArgument()
927
Edward Lemur678a6842019-10-03 22:25:05 +0000928 if isinstance(arg, int):
929 return _ParsedIssueNumberArgument(issue=arg)
930 if not isinstance(arg, basestring):
931 return fail_result
932
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000933 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000934 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700935
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000936 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000937 if not url.startswith('http'):
938 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000939 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
940 if url.startswith(short_url):
941 url = gerrit_url + url[len(short_url):]
942 break
943
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000944 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000945 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000946 except ValueError:
947 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200948
Alex Turner30ae6372022-01-04 02:32:52 +0000949 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
950 # URL.
951 if not arg.startswith('http') and '.' not in parsed_url.netloc:
952 return fail_result
953
Edward Lemur678a6842019-10-03 22:25:05 +0000954 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
955 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
956 # Short urls like https://domain/<issue_number> can be used, but don't allow
957 # specifying the patchset (you'd 404), but we allow that here.
958 if parsed_url.path == '/':
959 part = parsed_url.fragment
960 else:
961 part = parsed_url.path
962
963 match = re.match(
964 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
965 if not match:
966 return fail_result
967
968 issue = int(match.group('issue'))
969 patchset = match.group('patchset')
970 return _ParsedIssueNumberArgument(
971 issue=issue,
972 patchset=int(patchset) if patchset else None,
973 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000974
975
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000976def _create_description_from_log(args):
977 """Pulls out the commit log to use as a base for the CL description."""
978 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000979 if len(args) == 1 and args[0] == None:
980 # Handle the case where None is passed as the branch.
981 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000982 if len(args) == 1 and not args[0].endswith('.'):
983 log_args = [args[0] + '..']
984 elif len(args) == 1 and args[0].endswith('...'):
985 log_args = [args[0][:-1]]
986 elif len(args) == 2:
987 log_args = [args[0] + '..' + args[1]]
988 else:
989 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000990 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000991
992
Aaron Gablea45ee112016-11-22 15:14:38 -0800993class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700994 def __init__(self, issue, url):
995 self.issue = issue
996 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800997 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700998
999 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001000 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001001 self.issue, self.url)
1002
1003
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001004_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001005 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001006 # TODO(tandrii): these two aren't known in Gerrit.
1007 'approval', 'disapproval'])
1008
1009
Joanna Wang6215dd02023-02-07 15:58:03 +00001010# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001011_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001012 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001013 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001014])
1015
1016
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001017class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001018 """Changelist works with one changelist in local branch.
1019
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001020 Notes:
1021 * Not safe for concurrent multi-{thread,process} use.
1022 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001023 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024 """
1025
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001026 def __init__(self,
1027 branchref=None,
1028 issue=None,
1029 codereview_host=None,
1030 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001031 """Create a new ChangeList instance.
1032
Edward Lemurf38bc172019-09-03 21:02:13 +00001033 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001034 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001035 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001036 global settings
1037 if not settings:
1038 # Happens when git_cl.py is used as a utility library.
1039 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001040
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 self.branchref = branchref
1042 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001043 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001044 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001045 else:
1046 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001047 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001048 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001049 self.lookedup_issue = False
1050 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001051 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001052 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001053 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001054 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001055 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001056 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001057 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001058
Edward Lemur125d60a2019-09-13 18:25:41 +00001059 # Lazily cached values.
1060 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1061 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001062 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001063 # Map from change number (issue) to its detail cache.
1064 self._detail_cache = {}
1065
1066 if codereview_host is not None:
1067 assert not codereview_host.startswith('https://'), codereview_host
1068 self._gerrit_host = codereview_host
1069 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001070
Edward Lesmese1576912021-02-16 21:53:34 +00001071 @property
1072 def owners_client(self):
1073 if self._owners_client is None:
1074 remote, remote_branch = self.GetRemoteBranch()
1075 branch = GetTargetRef(remote, remote_branch, None)
1076 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001077 host=self.GetGerritHost(),
1078 project=self.GetGerritProject(),
1079 branch=branch)
1080 return self._owners_client
1081
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001082 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001083 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001084
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001085 The return value is a string suitable for passing to git cl with the --cc
1086 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001087 """
1088 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001089 base_cc = settings.GetDefaultCCList()
1090 more_cc = ','.join(self.more_cc)
1091 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001092 return self.cc
1093
Daniel Cheng7227d212017-11-17 08:12:37 -08001094 def ExtendCC(self, more_cc):
1095 """Extends the list of users to cc on this CL based on the changed files."""
1096 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001097
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001098 def GetCommitDate(self):
1099 """Returns the commit date as provided in the constructor"""
1100 return self.commit_date
1101
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001103 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001104 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001105 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001106 if not branchref:
1107 return None
1108 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001109 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001110 return self.branch
1111
1112 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001113 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001114 self.GetBranch() # Poke the lazy loader.
1115 return self.branchref
1116
Edward Lemur85153282020-02-14 22:06:29 +00001117 def _GitGetBranchConfigValue(self, key, default=None):
1118 return scm.GIT.GetBranchConfig(
1119 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001120
Edward Lemur85153282020-02-14 22:06:29 +00001121 def _GitSetBranchConfigValue(self, key, value):
1122 action = 'set %s to %r' % (key, value)
1123 if not value:
1124 action = 'unset %s' % key
1125 assert self.GetBranch(), 'a branch is needed to ' + action
1126 return scm.GIT.SetBranchConfig(
1127 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001128
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001129 @staticmethod
1130 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001131 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001132 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001133 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001134 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1135 settings.GetRoot(), branch)
1136 if not remote or not upstream_branch:
1137 DieWithError(
1138 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001139 'Verify this branch is set up to track another \n'
1140 '(via the --track argument to "git checkout -b ..."). \n'
1141 'or pass complete "git diff"-style arguments if supported, like\n'
1142 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001143
1144 return remote, upstream_branch
1145
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001146 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001147 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001148 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001149 DieWithError('The upstream for the current branch (%s) does not exist '
1150 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001151 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001152 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001153
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001154 def GetUpstreamBranch(self):
1155 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001156 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001157 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001158 upstream_branch = upstream_branch.replace('refs/heads/',
1159 'refs/remotes/%s/' % remote)
1160 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1161 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001162 self.upstream_branch = upstream_branch
1163 return self.upstream_branch
1164
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001166 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 remote, branch = None, self.GetBranch()
1168 seen_branches = set()
1169 while branch not in seen_branches:
1170 seen_branches.add(branch)
1171 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001172 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 if remote != '.' or branch.startswith('refs/remotes'):
1174 break
1175 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001176 remotes = RunGit(['remote'], error_ok=True).split()
1177 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001179 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001180 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001181 logging.warning('Could not determine which remote this change is '
1182 'associated with, so defaulting to "%s".' %
1183 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001184 else:
Gavin Make6a62332020-12-04 21:57:10 +00001185 logging.warning('Could not determine which remote this change is '
1186 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001187 branch = 'HEAD'
1188 if branch.startswith('refs/remotes'):
1189 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001190 elif branch.startswith('refs/branch-heads/'):
1191 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001192 else:
1193 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001194 return self._remote
1195
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001196 def GetRemoteUrl(self):
1197 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1198
1199 Returns None if there is no remote.
1200 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001201 is_cached, value = self._cached_remote_url
1202 if is_cached:
1203 return value
1204
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001205 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001206 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001207
Edward Lemur298f2cf2019-02-22 21:40:39 +00001208 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001209 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001210 if host:
1211 self._cached_remote_url = (True, url)
1212 return url
1213
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001214 # If it cannot be parsed as an url, assume it is a local directory,
1215 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001216 logging.warning('"%s" doesn\'t appear to point to a git host. '
1217 'Interpreting it as a local directory.', url)
1218 if not os.path.isdir(url):
1219 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001220 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1221 'but it doesn\'t exist.',
1222 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001223 return None
1224
1225 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001226 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001227
Edward Lemur79d4f992019-11-11 23:49:02 +00001228 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001229 if not host:
1230 logging.error(
1231 'Remote "%(remote)s" for branch "%(branch)s" points to '
1232 '"%(cache_path)s", but it is misconfigured.\n'
1233 '"%(cache_path)s" must be a git repo and must have a remote named '
1234 '"%(remote)s" pointing to the git host.', {
1235 'remote': remote,
1236 'cache_path': cache_path,
1237 'branch': self.GetBranch()})
1238 return None
1239
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001240 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001241 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001243 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001244 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001245 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001246 if self.GetBranch():
1247 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001248 if self.issue is not None:
1249 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001250 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001251 return self.issue
1252
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001253 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001254 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001255 issue = self.GetIssue()
1256 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001257 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001258 server = self.GetCodereviewServer()
1259 if short:
1260 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1261 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001262
Dirk Pranke6f0df682021-06-25 00:42:33 +00001263 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001264 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001265
Edward Lemur6c6827c2020-02-06 21:15:18 +00001266 def FetchDescription(self, pretty=False):
1267 assert self.GetIssue(), 'issue is required to query Gerrit'
1268
Edward Lemur9aa1a962020-02-25 00:58:38 +00001269 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001270 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1271 current_rev = data['current_revision']
1272 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001273
1274 if not pretty:
1275 return self.description
1276
1277 # Set width to 72 columns + 2 space indent.
1278 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1279 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1280 lines = self.description.splitlines()
1281 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001282
1283 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001284 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001285 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001286 if self.GetBranch():
1287 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001288 if self.patchset is not None:
1289 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001290 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001291 return self.patchset
1292
Edward Lemur9aa1a962020-02-25 00:58:38 +00001293 def GetAuthor(self):
1294 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1295
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001296 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001297 """Set this branch's patchset. If patchset=0, clears the patchset."""
1298 assert self.GetBranch()
1299 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001300 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001301 else:
1302 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001303 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001304
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001305 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001306 """Set this branch's issue. If issue isn't given, clears the issue."""
1307 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001308 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001309 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001310 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001311 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001312 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001313 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001314 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001315 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001316 else:
tandrii5d48c322016-08-18 16:19:37 -07001317 # Reset all of these just to be clean.
1318 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001319 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001320 ISSUE_CONFIG_KEY,
1321 PATCHSET_CONFIG_KEY,
1322 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001323 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001324 ]
tandrii5d48c322016-08-18 16:19:37 -07001325 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001326 try:
1327 self._GitSetBranchConfigValue(prop, None)
1328 except subprocess2.CalledProcessError:
1329 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001330 msg = RunGit(['log', '-1', '--format=%B']).strip()
1331 if msg and git_footers.get_footer_change_id(msg):
1332 print('WARNING: The change patched into this branch has a Change-Id. '
1333 'Removing it.')
1334 RunGit(['commit', '--amend', '-m',
1335 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001336 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001337 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001338 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001339
Joanna Wangb46232e2023-01-21 01:58:46 +00001340 def GetAffectedFiles(self, upstream, end_commit=None):
1341 # type: (str, Optional[str]) -> Sequence[str]
1342 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001343 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001344 return [
1345 f for _, f in scm.GIT.CaptureStatus(
1346 settings.GetRoot(), upstream, end_commit=end_commit)
1347 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001348 except subprocess2.CalledProcessError:
1349 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001350 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001351 'This branch probably doesn\'t exist anymore. To reset the\n'
1352 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001353 ' git branch --set-upstream-to origin/main %s\n'
1354 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001355 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001356
dsansomee2d6fd92016-09-08 00:10:47 -07001357 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001358 assert self.GetIssue(), 'issue is required to update description'
1359
1360 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001361 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001362 if not force:
1363 confirm_or_exit(
1364 'The description cannot be modified while the issue has a pending '
1365 'unpublished edit. Either publish the edit in the Gerrit web UI '
1366 'or delete it.\n\n', action='delete the unpublished edit')
1367
1368 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001369 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001370 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001371 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001372 description, notify='NONE')
1373
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001374 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001375
Edward Lemur75526302020-02-27 22:31:05 +00001376 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001377 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001378 '--root', settings.GetRoot(),
1379 '--upstream', upstream,
1380 ]
1381
1382 args.extend(['--verbose'] * verbose)
1383
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001384 remote, remote_branch = self.GetRemoteBranch()
1385 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001386 if settings.GetIsGerrit():
1387 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1388 args.extend(['--gerrit_project', self.GetGerritProject()])
1389 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001390
Edward Lemur99df04e2020-03-05 19:39:43 +00001391 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001392 issue = self.GetIssue()
1393 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001394 if author:
1395 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001396 if issue:
1397 args.extend(['--issue', str(issue)])
1398 if patchset:
1399 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001400
Edward Lemur75526302020-02-27 22:31:05 +00001401 return args
1402
Josip Sokcevic017544d2022-03-31 23:47:53 +00001403 def RunHook(self,
1404 committing,
1405 may_prompt,
1406 verbose,
1407 parallel,
1408 upstream,
1409 description,
1410 all_files,
1411 files=None,
1412 resultdb=False,
1413 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001414 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1415 args = self._GetCommonPresubmitArgs(verbose, upstream)
1416 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001417 if may_prompt:
1418 args.append('--may_prompt')
1419 if parallel:
1420 args.append('--parallel')
1421 if all_files:
1422 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001423 if files:
1424 args.extend(files.split(';'))
1425 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001426 if files or all_files:
1427 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001428
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001429 if resultdb and not realm:
1430 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1431 # it is not required to pass the realm flag
1432 print('Note: ResultDB reporting will NOT be performed because --realm'
1433 ' was not specified. To enable ResultDB, please run the command'
1434 ' again with the --realm argument to specify the LUCI realm.')
1435
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001436 py3_results = self._RunPresubmit(args,
1437 description,
1438 use_python3=True,
1439 resultdb=resultdb,
1440 realm=realm)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001441 if py3_results.get('skipped_presubmits', 1) == 0:
1442 print('No more presubmits to run - skipping Python 2 presubmits.')
1443 return py3_results
1444
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001445 py2_results = self._RunPresubmit(args,
1446 description,
1447 use_python3=False,
1448 resultdb=resultdb,
1449 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001450 return self._MergePresubmitResults(py2_results, py3_results)
1451
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001452 def _RunPresubmit(self,
1453 args,
1454 description,
1455 use_python3,
1456 resultdb=None,
1457 realm=None):
1458 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1459 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001460 args = args[:]
1461 vpython = 'vpython3' if use_python3 else 'vpython'
1462
Edward Lemur227d5102020-02-25 23:45:35 +00001463 with gclient_utils.temporary_file() as description_file:
1464 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001465 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001466 args.extend(['--json_output', json_output])
1467 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001468 if self.GetUsePython3():
1469 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001470 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001471 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001472 if resultdb and realm:
1473 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001474
1475 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001476 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001477
Edward Lemur227d5102020-02-25 23:45:35 +00001478 metrics.collector.add_repeated('sub_commands', {
1479 'command': 'presubmit',
1480 'execution_time': time_time() - start,
1481 'exit_code': exit_code,
1482 })
1483
1484 if exit_code:
1485 sys.exit(exit_code)
1486
1487 json_results = gclient_utils.FileRead(json_output)
1488 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001489
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001490 def _MergePresubmitResults(self, py2_results, py3_results):
1491 return {
1492 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1493 py3_results.get('more_cc', []))),
1494 'errors': (
1495 py2_results.get('errors', []) + py3_results.get('errors', [])),
1496 'notifications': (
1497 py2_results.get('notifications', []) +
1498 py3_results.get('notifications', [])),
1499 'warnings': (
1500 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1501 }
1502
Brian Sheedy7326ca22022-11-02 18:36:17 +00001503 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001504 args = self._GetCommonPresubmitArgs(verbose, upstream)
1505 args.append('--post_upload')
1506
1507 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001508 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001509 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001510 if not py3_only:
1511 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001512 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1513 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001514 if not py3_only:
1515 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001516 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001517
Edward Lemur5a644f82020-03-18 16:44:57 +00001518 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001519 # type: (optparse.Values, Sequence[str], Sequence[str]
1520 # ) -> ChangeDescription
1521 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001522 if self.GetIssue():
1523 description = self.FetchDescription()
1524 elif options.message:
1525 description = options.message
1526 else:
1527 description = _create_description_from_log(git_diff_args)
1528 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001529 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001530
Edward Lemur5a644f82020-03-18 16:44:57 +00001531 bug = options.bug
1532 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001533 if not self.GetIssue():
1534 # Extract bug number from branch name, but only if issue is being created.
1535 # It must start with bug or fix, followed by _ or - and number.
1536 # Optionally, it may contain _ or - after number with arbitrary text.
1537 # Examples:
1538 # bug-123
1539 # bug_123
1540 # fix-123
1541 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001542 branch = self.GetBranch()
1543 if branch is not None:
1544 match = re.match(
1545 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1546 if not bug and not fixed and match:
1547 if match.group('type') == 'bug':
1548 bug = match.group('bugnum')
1549 else:
1550 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001551
1552 change_description = ChangeDescription(description, bug, fixed)
1553
Joanna Wang39811b12023-01-20 23:09:48 +00001554 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001555 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001556 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001557 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001558 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001559 missing_files = [
1560 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001561 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001562 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001563 owners = self.owners_client.SuggestOwners(
1564 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001565 assert isinstance(options.reviewers, list), options.reviewers
1566 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001567
Edward Lemur5a644f82020-03-18 16:44:57 +00001568 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001569 if options.reviewers:
1570 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001571
1572 return change_description
1573
Joanna Wanga1abbed2023-01-24 01:41:05 +00001574 def _GetTitleForUpload(self, options, multi_change_upload=False):
1575 # type: (optparse.Values, Optional[bool]) -> str
1576
1577 # Getting titles for multipl commits is not supported so we return the
1578 # default.
1579 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001580 return options.title
1581
1582 # On first upload, patchset title is always this string, while options.title
1583 # gets converted to first line of message.
1584 if not self.GetIssue():
1585 return 'Initial upload'
1586
1587 # When uploading subsequent patchsets, options.message is taken as the title
1588 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001589 if options.message:
1590 return options.message.strip()
1591
1592 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001593 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001594 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001595 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001596 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001597
1598 # Use the default title if the user confirms the default with a 'y'.
1599 if user_title.lower() == 'y':
1600 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001601 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001602
Joanna Wang562481d2023-01-26 21:57:14 +00001603 def _GetRefSpecOptions(self,
1604 options,
1605 change_desc,
1606 multi_change_upload=False,
1607 dogfood_path=False):
1608 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1609 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001610
1611 # Extra options that can be specified at push time. Doc:
1612 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1613 refspec_opts = []
1614
1615 # By default, new changes are started in WIP mode, and subsequent patchsets
1616 # don't send email. At any time, passing --send-mail or --send-email will
1617 # mark the change ready and send email for that particular patch.
1618 if options.send_mail:
1619 refspec_opts.append('ready')
1620 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001621 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001622 refspec_opts.append('wip')
1623 else:
1624 refspec_opts.append('notify=NONE')
1625
1626 # TODO(tandrii): options.message should be posted as a comment if
1627 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1628 # to do it.
1629
1630 # Set options.title in case user was prompted in _GetTitleForUpload and
1631 # _CMDUploadChange needs to be called again.
1632 options.title = self._GetTitleForUpload(
1633 options, multi_change_upload=multi_change_upload)
1634
1635 if options.title:
1636 # Punctuation and whitespace in |title| must be percent-encoded.
1637 refspec_opts.append('m=' +
1638 gerrit_util.PercentEncodeForGitRef(options.title))
1639
1640 if options.private:
1641 refspec_opts.append('private')
1642
1643 if options.topic:
1644 # Documentation on Gerrit topics is here:
1645 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1646 refspec_opts.append('topic=%s' % options.topic)
1647
1648 if options.enable_auto_submit:
1649 refspec_opts.append('l=Auto-Submit+1')
1650 if options.set_bot_commit:
1651 refspec_opts.append('l=Bot-Commit+1')
1652 if options.use_commit_queue:
1653 refspec_opts.append('l=Commit-Queue+2')
1654 elif options.cq_dry_run:
1655 refspec_opts.append('l=Commit-Queue+1')
1656 elif options.cq_quick_run:
1657 refspec_opts.append('l=Commit-Queue+1')
1658 refspec_opts.append('l=Quick-Run+1')
1659
1660 if change_desc.get_reviewers(tbr_only=True):
1661 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1662 self.GetGerritProject())
1663 refspec_opts.append('l=Code-Review+%s' % score)
1664
Joanna Wang40497912023-01-24 21:18:16 +00001665 # Gerrit sorts hashtags, so order is not important.
1666 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1667 # We check GetIssue because we only add hashtags from the
1668 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001669 # TODO(b/265929888): When we fully launch the new path:
1670 # 1) remove fetching hashtags from description alltogether
1671 # 2) Or use descrtiption hashtags for:
1672 # `not (self.GetIssue() and multi_change_upload)`
1673 # 3) Or enabled change description tags for multi and single changes
1674 # by adding them post `git push`.
1675 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001676 hashtags.update(change_desc.get_hash_tags())
1677 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001678
1679 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001680 # branch/change.
1681 return refspec_opts
1682
Joanna Wang6215dd02023-02-07 15:58:03 +00001683 def PrepareSquashedCommit(self, options, parent, end_commit=None):
1684 # type: (optparse.Values, str, Optional[str]) -> _NewUpload()
Joanna Wangb88a4342023-01-24 01:28:22 +00001685 """Create a squashed commit to upload."""
Joanna Wangb88a4342023-01-24 01:28:22 +00001686
1687 if end_commit is None:
1688 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1689
1690 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1691 end_commit)
1692 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1693 with gclient_utils.temporary_file() as desc_tempfile:
1694 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1695 commit_to_push = RunGit(
1696 ['commit-tree', latest_tree, '-p', parent, '-F',
1697 desc_tempfile]).strip()
1698
Joanna Wang7603f042023-03-01 22:17:36 +00001699 # Gerrit may or may not update fast enough to return the correct patchset
1700 # number after we push. Get the pre-upload patchset and increment later.
1701 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001702 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001703 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001704
Joanna Wang6215dd02023-02-07 15:58:03 +00001705 def PrepareCherryPickSquashedCommit(self, options, parent):
1706 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001707 """Create a commit cherry-picked on parent to push."""
1708
Joanna Wang6215dd02023-02-07 15:58:03 +00001709 # The `parent` is what we will cherry-pick on top of.
1710 # The `cherry_pick_base` is the beginning range of what
1711 # we are cherry-picking.
1712 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1713 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001714 self.branchref)
1715
1716 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1717 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1718 with gclient_utils.temporary_file() as desc_tempfile:
1719 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001720 commit_to_cp = RunGit([
1721 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1722 desc_tempfile
1723 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001724
Joanna Wang6215dd02023-02-07 15:58:03 +00001725 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001726 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1727 if ret:
1728 RunGit(['cherry-pick', '--abort'])
1729 RunGit(['checkout', '-q', self.branch])
1730 DieWithError('Could not cleanly cherry-pick')
1731
Joanna Wang6215dd02023-02-07 15:58:03 +00001732 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001733 RunGit(['checkout', '-q', self.branch])
1734
Joanna Wang7603f042023-03-01 22:17:36 +00001735 # Gerrit may or may not update fast enough to return the correct patchset
1736 # number after we push. Get the pre-upload patchset and increment later.
1737 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001738 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001739 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001740
Joanna Wangb46232e2023-01-21 01:58:46 +00001741 def _PrepareChange(self, options, parent, end_commit):
1742 # type: (optparse.Values, str, str) ->
1743 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1744 """Prepares the change to be uploaded."""
1745 self.EnsureCanUploadPatchset(options.force)
1746
1747 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1748 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1749 files)
1750
1751 watchlist = watchlists.Watchlists(settings.GetRoot())
1752 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1753 if not options.bypass_hooks:
1754 hook_results = self.RunHook(committing=False,
1755 may_prompt=not options.force,
1756 verbose=options.verbose,
1757 parallel=options.parallel,
1758 upstream=parent,
1759 description=change_desc.description,
1760 all_files=False)
1761 self.ExtendCC(hook_results['more_cc'])
1762
1763 # Update the change description and ensure we have a Change Id.
1764 if self.GetIssue():
1765 if options.edit_description:
1766 change_desc.prompt()
1767 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1768 change_id = change_detail['change_id']
1769 change_desc.ensure_change_id(change_id)
1770
Joanna Wangb46232e2023-01-21 01:58:46 +00001771 else: # No change issue. First time uploading
1772 if not options.force and not options.message_file:
1773 change_desc.prompt()
1774
1775 # Check if user added a change_id in the descripiton.
1776 change_ids = git_footers.get_footer_change_id(change_desc.description)
1777 if len(change_ids) == 1:
1778 change_id = change_ids[0]
1779 else:
1780 change_id = GenerateGerritChangeId(change_desc.description)
1781 change_desc.ensure_change_id(change_id)
1782
1783 if options.preserve_tryjobs:
1784 change_desc.set_preserve_tryjobs()
1785
1786 SaveDescriptionBackup(change_desc)
1787
1788 # Add ccs
1789 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001790 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001791 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001792 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001793 ccs = self.GetCCList().split(',')
1794 if len(ccs) > 100:
1795 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1796 'process/lsc/lsc_workflow.md')
1797 print('WARNING: This will auto-CC %s users.' % len(ccs))
1798 print('LSC may be more appropriate: %s' % lsc)
1799 print('You can also use the --no-autocc flag to disable auto-CC.')
1800 confirm_or_exit(action='continue')
1801
1802 # Add ccs from the --cc flag.
1803 if options.cc:
1804 ccs.extend(options.cc)
1805
1806 ccs = [email.strip() for email in ccs if email.strip()]
1807 if change_desc.get_cced():
1808 ccs.extend(change_desc.get_cced())
1809
1810 return change_desc.get_reviewers(), ccs, change_desc
1811
Joanna Wang40497912023-01-24 21:18:16 +00001812 def PostUploadUpdates(self, options, new_upload, change_number):
1813 # type: (optparse.Values, _NewUpload, change_number) -> None
1814 """Makes necessary post upload changes to the local and remote cl."""
1815 if not self.GetIssue():
1816 self.SetIssue(change_number)
1817
Joanna Wang7603f042023-03-01 22:17:36 +00001818 self.SetPatchset(new_upload.prev_patchset + 1)
1819
Joanna Wang40497912023-01-24 21:18:16 +00001820 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1821 new_upload.commit_to_push)
1822 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1823 new_upload.new_last_uploaded_commit)
1824
1825 if settings.GetRunPostUploadHook():
1826 self.RunPostUploadHook(options.verbose, new_upload.parent,
1827 new_upload.change_desc.description,
1828 options.no_python2_post_upload_hooks)
1829
1830 if new_upload.reviewers or new_upload.ccs:
1831 gerrit_util.AddReviewers(self.GetGerritHost(),
1832 self._GerritChangeIdentifier(),
1833 reviewers=new_upload.reviewers,
1834 ccs=new_upload.ccs,
1835 notify=bool(options.send_mail))
1836
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001837 def CMDUpload(self, options, git_diff_args, orig_args):
1838 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001839 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001840 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001841 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001842 else:
1843 if self.GetBranch() is None:
1844 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1845
1846 # Default to diffing against common ancestor of upstream branch
1847 base_branch = self.GetCommonAncestorWithUpstream()
1848 git_diff_args = [base_branch, 'HEAD']
1849
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001850 # Fast best-effort checks to abort before running potentially expensive
1851 # hooks if uploading is likely to fail anyway. Passing these checks does
1852 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001853 self.EnsureAuthenticated(force=options.force)
1854 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001855
1856 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001857 watchlist = watchlists.Watchlists(settings.GetRoot())
1858 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001859 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001860 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001861
Edward Lemur5a644f82020-03-18 16:44:57 +00001862 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001863 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001864 hook_results = self.RunHook(committing=False,
1865 may_prompt=not options.force,
1866 verbose=options.verbose,
1867 parallel=options.parallel,
1868 upstream=base_branch,
1869 description=change_desc.description,
1870 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001871 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001872
Aaron Gable13101a62018-02-09 13:20:41 -08001873 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001874 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001875 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001876 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001877 if self.GetBranch() is not None:
1878 self._GitSetBranchConfigValue(
1879 LAST_UPLOAD_HASH_CONFIG_KEY,
1880 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001881 # Run post upload hooks, if specified.
1882 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001883 self.RunPostUploadHook(options.verbose, base_branch,
1884 change_desc.description,
1885 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001886
1887 # Upload all dependencies if specified.
1888 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001889 print()
1890 print('--dependencies has been specified.')
1891 print('All dependent local branches will be re-uploaded.')
1892 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001893 # Remove the dependencies flag from args so that we do not end up in a
1894 # loop.
1895 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001896 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001897 return ret
1898
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001899 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001900 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001901
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001902 Issue must have been already uploaded and known. Optionally allows for
1903 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001904 """
1905 assert new_state in _CQState.ALL_STATES
1906 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001907 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001908 vote_map = {
1909 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001910 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001911 _CQState.DRY_RUN: 1,
1912 _CQState.COMMIT: 2,
1913 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001914 if new_state == _CQState.QUICK_RUN:
1915 labels = {
1916 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1917 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1918 }
1919 else:
1920 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001921 notify = False if new_state == _CQState.DRY_RUN else None
1922 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001923 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001924 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001925 return 0
1926 except KeyboardInterrupt:
1927 raise
1928 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001929 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001930 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001931 ' * Your project has no CQ,\n'
1932 ' * You don\'t have permission to change the CQ state,\n'
1933 ' * There\'s a bug in this code (see stack trace below).\n'
1934 'Consider specifying which bots to trigger manually or asking your '
1935 'project owners for permissions or contacting Chrome Infra at:\n'
1936 'https://www.chromium.org/infra\n\n' %
1937 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001938 # Still raise exception so that stack trace is printed.
1939 raise
1940
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001941 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001942 # Lazy load of configs.
1943 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001944 if self._gerrit_host and '.' not in self._gerrit_host:
1945 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1946 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001947 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001948 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001949 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001950 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001951 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1952 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001953 return self._gerrit_host
1954
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001955 def _GetGitHost(self):
1956 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001957 remote_url = self.GetRemoteUrl()
1958 if not remote_url:
1959 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001960 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001961
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001962 def GetCodereviewServer(self):
1963 if not self._gerrit_server:
1964 # If we're on a branch then get the server potentially associated
1965 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001966 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001967 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001968 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001969 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001970 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001971 if not self._gerrit_server:
1972 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1973 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001974 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001975 parts[0] = parts[0] + '-review'
1976 self._gerrit_host = '.'.join(parts)
1977 self._gerrit_server = 'https://%s' % self._gerrit_host
1978 return self._gerrit_server
1979
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001980 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001981 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001982 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001983 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001984 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001985 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001986 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001987 if project.endswith('.git'):
1988 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001989 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1990 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1991 # gitiles/git-over-https protocol. E.g.,
1992 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1993 # as
1994 # https://chromium.googlesource.com/v8/v8
1995 if project.startswith('a/'):
1996 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001997 return project
1998
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001999 def _GerritChangeIdentifier(self):
2000 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2001
2002 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002003 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002004 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002005 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002006 if project:
2007 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2008 # Fall back on still unique, but less efficient change number.
2009 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002010
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002011 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002012 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002013 if settings.GetGerritSkipEnsureAuthenticated():
2014 # For projects with unusual authentication schemes.
2015 # See http://crbug.com/603378.
2016 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002017
2018 # Check presence of cookies only if using cookies-based auth method.
2019 cookie_auth = gerrit_util.Authenticator.get()
2020 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002021 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002022
Florian Mayerae510e82020-01-30 21:04:48 +00002023 remote_url = self.GetRemoteUrl()
2024 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002025 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002026 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002027 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2028 logging.warning(
2029 'Ignoring branch %(branch)s with non-https/sso remote '
2030 '%(remote)s', {
2031 'branch': self.branch,
2032 'remote': self.GetRemoteUrl()
2033 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002034 return
2035
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002036 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002037 self.GetCodereviewServer()
2038 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002039 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002040
2041 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2042 git_auth = cookie_auth.get_auth_header(git_host)
2043 if gerrit_auth and git_auth:
2044 if gerrit_auth == git_auth:
2045 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002046 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002047 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002048 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002049 ' %s\n'
2050 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002051 ' Consider running the following command:\n'
2052 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002053 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002054 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002055 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002056 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002057 cookie_auth.get_new_password_message(git_host)))
2058 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002059 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002060 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002061
2062 missing = (
2063 ([] if gerrit_auth else [self._gerrit_host]) +
2064 ([] if git_auth else [git_host]))
2065 DieWithError('Credentials for the following hosts are required:\n'
2066 ' %s\n'
2067 'These are read from %s (or legacy %s)\n'
2068 '%s' % (
2069 '\n '.join(missing),
2070 cookie_auth.get_gitcookies_path(),
2071 cookie_auth.get_netrc_path(),
2072 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002073
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002074 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002075 if not self.GetIssue():
2076 return
2077
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002078 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002079 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002080 DieWithError(
2081 'Change %s has been abandoned, new uploads are not allowed' %
2082 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002083 if status == 'MERGED':
2084 answer = gclient_utils.AskForData(
2085 'Change %s has been submitted, new uploads are not allowed. '
2086 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2087 ).lower()
2088 if answer not in ('y', ''):
2089 DieWithError('New uploads are not allowed.')
2090 self.SetIssue()
2091 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002092
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002093 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2094 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2095 # Apparently this check is not very important? Otherwise get_auth_email
2096 # could have been added to other implementations of Authenticator.
2097 cookies_auth = gerrit_util.Authenticator.get()
2098 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002099 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002100
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002101 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002102 if self.GetIssueOwner() == cookies_user:
2103 return
2104 logging.debug('change %s owner is %s, cookies user is %s',
2105 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002106 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002107 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002108 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002109 if details['email'] == self.GetIssueOwner():
2110 return
2111 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002112 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002113 'as %s.\n'
2114 'Uploading may fail due to lack of permissions.' %
2115 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2116 confirm_or_exit(action='upload')
2117
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002118 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002119 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002120 or CQ status, assuming adherence to a common workflow.
2121
2122 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002123 * 'error' - error from review tool (including deleted issues)
2124 * 'unsent' - no reviewers added
2125 * 'waiting' - waiting for review
2126 * 'reply' - waiting for uploader to reply to review
2127 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002128 * 'dry-run' - dry-running in the CQ
2129 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002130 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002131 """
2132 if not self.GetIssue():
2133 return None
2134
2135 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002136 data = self._GetChangeDetail([
2137 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002138 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002139 return 'error'
2140
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002141 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002142 return 'closed'
2143
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002144 cq_label = data['labels'].get('Commit-Queue', {})
2145 max_cq_vote = 0
2146 for vote in cq_label.get('all', []):
2147 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2148 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002149 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002150 if max_cq_vote == 1:
2151 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002152
Aaron Gable9ab38c62017-04-06 14:36:33 -07002153 if data['labels'].get('Code-Review', {}).get('approved'):
2154 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002155
2156 if not data.get('reviewers', {}).get('REVIEWER', []):
2157 return 'unsent'
2158
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002159 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002160 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002161 while messages:
2162 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002163 if (m.get('tag', '').startswith('autogenerated:cq') or
2164 m.get('tag', '').startswith('autogenerated:cv')):
2165 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002166 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002167 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002168 # Most recent message was by owner.
2169 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002170
2171 # Some reply from non-owner.
2172 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002173
2174 # Somehow there are no messages even though there are reviewers.
2175 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002176
Gavin Mak4e5e3992022-11-14 22:40:12 +00002177 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002178 if not self.GetIssue():
2179 return None
2180
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002181 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002182 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002183 if update:
2184 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002185 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002186
Gavin Makf35a9eb2022-11-17 18:34:36 +00002187 def _IsPatchsetRangeSignificant(self, lower, upper):
2188 """Returns True if the inclusive range of patchsets contains any reworks or
2189 rebases."""
2190 if not self.GetIssue():
2191 return False
2192
2193 data = self._GetChangeDetail(['ALL_REVISIONS'])
2194 ps_kind = {}
2195 for rev_info in data.get('revisions', {}).values():
2196 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2197
2198 for ps in range(lower, upper + 1):
2199 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2200 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2201 return True
2202 return False
2203
Gavin Make61ccc52020-11-13 00:12:57 +00002204 def GetMostRecentDryRunPatchset(self):
2205 """Get patchsets equivalent to the most recent patchset and return
2206 the patchset with the latest dry run. If none have been dry run, return
2207 the latest patchset."""
2208 if not self.GetIssue():
2209 return None
2210
2211 data = self._GetChangeDetail(['ALL_REVISIONS'])
2212 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002213 dry_run = {int(m['_revision_number'])
2214 for m in data.get('messages', [])
2215 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002216
2217 for revision_info in sorted(data.get('revisions', {}).values(),
2218 key=lambda c: c['_number'], reverse=True):
2219 if revision_info['_number'] in dry_run:
2220 patchset = revision_info['_number']
2221 break
2222 if revision_info.get('kind', '') not in \
2223 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2224 break
2225 self.SetPatchset(patchset)
2226 return patchset
2227
Aaron Gable636b13f2017-07-14 10:42:48 -07002228 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002229 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002230 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002231 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002232
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002233 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002234 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002235 # CURRENT_REVISION is included to get the latest patchset so that
2236 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002237 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002238 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2239 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002240 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002241 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002242 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002243 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002244
2245 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002246 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002247 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002248 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002249 line_comments = file_comments.setdefault(path, [])
2250 line_comments.extend(
2251 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002252
2253 # Build dictionary of file comments for easy access and sorting later.
2254 # {author+date: {path: {patchset: {line: url+message}}}}
2255 comments = collections.defaultdict(
2256 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002257
2258 server = self.GetCodereviewServer()
2259 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2260 # /c/ is automatically added by short URL server.
2261 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2262 self.GetIssue())
2263 else:
2264 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2265
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002266 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002267 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002268 tag = comment.get('tag', '')
2269 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002270 continue
2271 key = (comment['author']['email'], comment['updated'])
2272 if comment.get('side', 'REVISION') == 'PARENT':
2273 patchset = 'Base'
2274 else:
2275 patchset = 'PS%d' % comment['patch_set']
2276 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002277 url = ('%s/%s/%s#%s%s' %
2278 (url_prefix, comment['patch_set'], path,
2279 'b' if comment.get('side') == 'PARENT' else '',
2280 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002281 comments[key][path][patchset][line] = (url, comment['message'])
2282
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002283 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002284 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002285 summary = self._BuildCommentSummary(msg, comments, readable)
2286 if summary:
2287 summaries.append(summary)
2288 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002289
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002290 @staticmethod
2291 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002292 if 'email' not in msg['author']:
2293 # Some bot accounts may not have an email associated.
2294 return None
2295
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002296 key = (msg['author']['email'], msg['date'])
2297 # Don't bother showing autogenerated messages that don't have associated
2298 # file or line comments. this will filter out most autogenerated
2299 # messages, but will keep robot comments like those from Tricium.
2300 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2301 if is_autogenerated and not comments.get(key):
2302 return None
2303 message = msg['message']
2304 # Gerrit spits out nanoseconds.
2305 assert len(msg['date'].split('.')[-1]) == 9
2306 date = datetime.datetime.strptime(msg['date'][:-3],
2307 '%Y-%m-%d %H:%M:%S.%f')
2308 if key in comments:
2309 message += '\n'
2310 for path, patchsets in sorted(comments.get(key, {}).items()):
2311 if readable:
2312 message += '\n%s' % path
2313 for patchset, lines in sorted(patchsets.items()):
2314 for line, (url, content) in sorted(lines.items()):
2315 if line:
2316 line_str = 'Line %d' % line
2317 path_str = '%s:%d:' % (path, line)
2318 else:
2319 line_str = 'File comment'
2320 path_str = '%s:0:' % path
2321 if readable:
2322 message += '\n %s, %s: %s' % (patchset, line_str, url)
2323 message += '\n %s\n' % content
2324 else:
2325 message += '\n%s ' % path_str
2326 message += '\n%s\n' % content
2327
2328 return _CommentSummary(
2329 date=date,
2330 message=message,
2331 sender=msg['author']['email'],
2332 autogenerated=is_autogenerated,
2333 # These could be inferred from the text messages and correlated with
2334 # Code-Review label maximum, however this is not reliable.
2335 # Leaving as is until the need arises.
2336 approval=False,
2337 disapproval=False,
2338 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002339
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002340 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002341 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002342 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002343
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002344 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002345 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002346 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002347
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002348 def _GetChangeDetail(self, options=None):
2349 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002350 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002351 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002352
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002353 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002354 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002355 options.append('CURRENT_COMMIT')
2356
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002357 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002358 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002359 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002360
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002361 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2362 # Assumption: data fetched before with extra options is suitable
2363 # for return for a smaller set of options.
2364 # For example, if we cached data for
2365 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2366 # and request is for options=[CURRENT_REVISION],
2367 # THEN we can return prior cached data.
2368 if options_set.issubset(cached_options_set):
2369 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002370
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002371 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002372 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002373 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002374 except gerrit_util.GerritError as e:
2375 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002376 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002377 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002378
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002379 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002380 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002381
Gavin Mak4e5e3992022-11-14 22:40:12 +00002382 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002383 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002384 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002385 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2386 self._GerritChangeIdentifier(),
2387 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002388 except gerrit_util.GerritError as e:
2389 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002390 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002391 raise
agable32978d92016-11-01 12:55:02 -07002392 return data
2393
Karen Qian40c19422019-03-13 21:28:29 +00002394 def _IsCqConfigured(self):
2395 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002396 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002397
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002398 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002399 if git_common.is_dirty_git_tree('land'):
2400 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002401
tandriid60367b2016-06-22 05:25:12 -07002402 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002403 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002404 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002405 'which can test and land changes for you. '
2406 'Are you sure you wish to bypass it?\n',
2407 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002408 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002409 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002410 # Note: git diff outputs nothing if there is no diff.
2411 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002412 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002413 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002414 if detail['current_revision'] == last_upload:
2415 differs = False
2416 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002417 print('WARNING: Local branch contents differ from latest uploaded '
2418 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002419 if differs:
2420 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002421 confirm_or_exit(
2422 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2423 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002424 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002425 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002426 upstream = self.GetCommonAncestorWithUpstream()
2427 if self.GetIssue():
2428 description = self.FetchDescription()
2429 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002430 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002431 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002432 committing=True,
2433 may_prompt=not force,
2434 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002435 parallel=parallel,
2436 upstream=upstream,
2437 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002438 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002439 resultdb=resultdb,
2440 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002441
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002442 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002443 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002444 links = self._GetChangeCommit().get('web_links', [])
2445 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002446 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002447 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002448 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002449 return 0
2450
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002451 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2452 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002453 assert parsed_issue_arg.valid
2454
Edward Lemur125d60a2019-09-13 18:25:41 +00002455 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002456
2457 if parsed_issue_arg.hostname:
2458 self._gerrit_host = parsed_issue_arg.hostname
2459 self._gerrit_server = 'https://%s' % self._gerrit_host
2460
tandriic2405f52016-10-10 08:13:15 -07002461 try:
2462 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002463 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002464 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002465
2466 if not parsed_issue_arg.patchset:
2467 # Use current revision by default.
2468 revision_info = detail['revisions'][detail['current_revision']]
2469 patchset = int(revision_info['_number'])
2470 else:
2471 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002472 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002473 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2474 break
2475 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002476 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002477 (parsed_issue_arg.patchset, self.GetIssue()))
2478
Edward Lemur125d60a2019-09-13 18:25:41 +00002479 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002480 if remote_url.endswith('.git'):
2481 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002482 remote_url = remote_url.rstrip('/')
2483
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002484 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002485 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002486
2487 if remote_url != fetch_info['url']:
2488 DieWithError('Trying to patch a change from %s but this repo appears '
2489 'to be %s.' % (fetch_info['url'], remote_url))
2490
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002491 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002492
Joanna Wangc023a632023-01-26 17:59:25 +00002493 # Set issue immediately in case the cherry-pick fails, which happens
2494 # when resolving conflicts.
2495 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002496 self.SetIssue(parsed_issue_arg.issue)
2497
Aaron Gable62619a32017-06-16 08:22:09 -07002498 if force:
2499 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2500 print('Checked out commit for change %i patchset %i locally' %
2501 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002502 elif nocommit:
2503 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2504 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002505 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002506 RunGit(['cherry-pick', 'FETCH_HEAD'])
2507 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002508 (parsed_issue_arg.issue, patchset))
2509 print('Note: this created a local commit which does not have '
2510 'the same hash as the one uploaded for review. This will make '
2511 'uploading changes based on top of this branch difficult.\n'
2512 'If you want to do that, use "git cl patch --force" instead.')
2513
Stefan Zagerd08043c2017-10-12 12:07:02 -07002514 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002515 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002516 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002517 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2518 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002519 else:
2520 print('WARNING: You are in detached HEAD state.\n'
2521 'The patch has been applied to your checkout, but you will not be '
2522 'able to upload a new patch set to the gerrit issue.\n'
2523 'Try using the \'-b\' option if you would like to work on a '
2524 'branch and/or upload a new patch set.')
2525
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002526 return 0
2527
Joanna Wang18de1f62023-01-21 01:24:24 +00002528 @staticmethod
2529 def _GerritCommitMsgHookCheck(offer_removal):
2530 # type: (bool) -> None
2531 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002532 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2533 if not os.path.exists(hook):
2534 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002535 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2536 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002537 data = gclient_utils.FileRead(hook)
2538 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2539 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002540 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002541 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002542 'and may interfere with it in subtle ways.\n'
2543 'We recommend you remove the commit-msg hook.')
2544 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002545 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002546 gclient_utils.rm_file_or_tree(hook)
2547 print('Gerrit commit-msg hook removed.')
2548 else:
2549 print('OK, will keep Gerrit commit-msg hook in place.')
2550
Edward Lemur1b52d872019-05-09 21:12:12 +00002551 def _CleanUpOldTraces(self):
2552 """Keep only the last |MAX_TRACES| traces."""
2553 try:
2554 traces = sorted([
2555 os.path.join(TRACES_DIR, f)
2556 for f in os.listdir(TRACES_DIR)
2557 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2558 and not f.startswith('tmp'))
2559 ])
2560 traces_to_delete = traces[:-MAX_TRACES]
2561 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002562 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002563 except OSError:
2564 print('WARNING: Failed to remove old git traces from\n'
2565 ' %s'
2566 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002567
Edward Lemur5737f022019-05-17 01:24:00 +00002568 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002569 """Zip and write the git push traces stored in traces_dir."""
2570 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002571 traces_zip = trace_name + '-traces'
2572 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002573 # Create a temporary dir to store git config and gitcookies in. It will be
2574 # compressed and stored next to the traces.
2575 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002576 git_info_zip = trace_name + '-git-info'
2577
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002578 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002579
Edward Lemur1b52d872019-05-09 21:12:12 +00002580 git_push_metadata['trace_name'] = trace_name
2581 gclient_utils.FileWrite(
2582 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2583
2584 # Keep only the first 6 characters of the git hashes on the packet
2585 # trace. This greatly decreases size after compression.
2586 packet_traces = os.path.join(traces_dir, 'trace-packet')
2587 if os.path.isfile(packet_traces):
2588 contents = gclient_utils.FileRead(packet_traces)
2589 gclient_utils.FileWrite(
2590 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2591 shutil.make_archive(traces_zip, 'zip', traces_dir)
2592
2593 # Collect and compress the git config and gitcookies.
2594 git_config = RunGit(['config', '-l'])
2595 gclient_utils.FileWrite(
2596 os.path.join(git_info_dir, 'git-config'),
2597 git_config)
2598
2599 cookie_auth = gerrit_util.Authenticator.get()
2600 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2601 gitcookies_path = cookie_auth.get_gitcookies_path()
2602 if os.path.isfile(gitcookies_path):
2603 gitcookies = gclient_utils.FileRead(gitcookies_path)
2604 gclient_utils.FileWrite(
2605 os.path.join(git_info_dir, 'gitcookies'),
2606 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2607 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2608
Edward Lemur1b52d872019-05-09 21:12:12 +00002609 gclient_utils.rmtree(git_info_dir)
2610
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002611 def _RunGitPushWithTraces(self,
2612 refspec,
2613 refspec_opts,
2614 git_push_metadata,
2615 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002616 """Run git push and collect the traces resulting from the execution."""
2617 # Create a temporary directory to store traces in. Traces will be compressed
2618 # and stored in a 'traces' dir inside depot_tools.
2619 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002620 trace_name = os.path.join(
2621 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002622
2623 env = os.environ.copy()
2624 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2625 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002626 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002627 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2628 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2629 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2630
2631 try:
2632 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002633 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002634 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002635 push_cmd = ['git', 'push', remote_url, refspec]
2636 if git_push_options:
2637 for opt in git_push_options:
2638 push_cmd.extend(['-o', opt])
2639
Edward Lemur0f58ae42019-04-30 17:24:12 +00002640 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002641 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002642 env=env,
2643 print_stdout=True,
2644 # Flush after every line: useful for seeing progress when running as
2645 # recipe.
2646 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002647 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002648 except subprocess2.CalledProcessError as e:
2649 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002650 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002651 raise GitPushError(
2652 'Failed to create a change, very likely due to blocked keyword. '
2653 'Please examine output above for the reason of the failure.\n'
2654 'If this is a false positive, you can try to bypass blocked '
2655 'keyword by using push option '
2656 '-o uploadvalidator~skip, e.g.:\n'
2657 'git cl upload -o uploadvalidator~skip\n\n'
2658 'If git-cl is not working correctly, file a bug under the '
2659 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002660 if 'git push -o nokeycheck' in str(e.stdout):
2661 raise GitPushError(
2662 'Failed to create a change, very likely due to a private key being '
2663 'detected. Please examine output above for the reason of the '
2664 'failure.\n'
2665 'If this is a false positive, you can try to bypass private key '
2666 'detection by using push option '
2667 '-o nokeycheck, e.g.:\n'
2668 'git cl upload -o nokeycheck\n\n'
2669 'If git-cl is not working correctly, file a bug under the '
2670 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002671
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002672 raise GitPushError(
2673 'Failed to create a change. Please examine output above for the '
2674 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002675 'For emergencies, Googlers can escalate to '
2676 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002677 'Hint: run command below to diagnose common Git/Gerrit '
2678 'credential problems:\n'
2679 ' git cl creds-check\n'
2680 '\n'
2681 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2682 'component including the files below.\n'
2683 'Review the files before upload, since they might contain sensitive '
2684 'information.\n'
2685 'Set the Restrict-View-Google label so that they are not publicly '
2686 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002687 finally:
2688 execution_time = time_time() - before_push
2689 metrics.collector.add_repeated('sub_commands', {
2690 'command': 'git push',
2691 'execution_time': execution_time,
2692 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002693 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002694 })
2695
Edward Lemur1b52d872019-05-09 21:12:12 +00002696 git_push_metadata['execution_time'] = execution_time
2697 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002698 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002699
Edward Lemur1b52d872019-05-09 21:12:12 +00002700 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002701 gclient_utils.rmtree(traces_dir)
2702
2703 return push_stdout
2704
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002705 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2706 change_desc):
2707 """Upload the current branch to Gerrit, retry if new remote HEAD is
2708 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002709 remote, remote_branch = self.GetRemoteBranch()
2710 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2711
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002712 try:
2713 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002714 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002715 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002716 # Repository might be in the middle of transition to main branch as
2717 # default, and uploads to old default might be blocked.
2718 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002719 DieWithError(str(e), change_desc)
2720
Josip Sokcevicb631a882021-01-06 18:18:10 +00002721 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2722 self.GetGerritProject())
2723 if project_head == branch:
2724 DieWithError(str(e), change_desc)
2725 branch = project_head
2726
2727 print("WARNING: Fetching remote state and retrying upload to default "
2728 "branch...")
2729 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002730 options.edit_description = False
2731 options.force = True
2732 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002733 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2734 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002735 except GitPushError as e:
2736 DieWithError(str(e), change_desc)
2737
2738 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002739 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002740 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002741 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002742 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002743 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002744 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002745 # User requested to change description
2746 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002747 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002748 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2749 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002750 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002751
2752 # Check if changes outside of this workspace have been uploaded.
2753 current_rev = change_detail['current_revision']
2754 last_uploaded_rev = self._GitGetBranchConfigValue(
2755 GERRIT_SQUASH_HASH_CONFIG_KEY)
2756 if last_uploaded_rev and current_rev != last_uploaded_rev:
2757 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002758 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002759 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002760 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002761 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002762 if len(change_ids) == 1:
2763 change_id = change_ids[0]
2764 else:
2765 change_id = GenerateGerritChangeId(change_desc.description)
2766 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002767
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002768 if options.preserve_tryjobs:
2769 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002770
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002771 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002772 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002773 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002774 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002775 with gclient_utils.temporary_file() as desc_tempfile:
2776 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2777 ref_to_push = RunGit(
2778 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002779 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002780 if options.no_add_changeid:
2781 pass
2782 else: # adding Change-Ids is okay.
2783 if not git_footers.get_footer_change_id(change_desc.description):
2784 DownloadGerritHook(False)
2785 change_desc.set_description(
2786 self._AddChangeIdToCommitMessage(change_desc.description,
2787 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002788 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002789 # For no-squash mode, we assume the remote called "origin" is the one we
2790 # want. It is not worthwhile to support different workflows for
2791 # no-squash mode.
2792 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002793 # attempt to extract the changeid from the current description
2794 # fail informatively if not possible.
2795 change_id_candidates = git_footers.get_footer_change_id(
2796 change_desc.description)
2797 if not change_id_candidates:
2798 DieWithError("Unable to extract change-id from message.")
2799 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002800
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002801 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002802 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2803 ref_to_push)]).splitlines()
2804 if len(commits) > 1:
2805 print('WARNING: This will upload %d commits. Run the following command '
2806 'to see which commits will be uploaded: ' % len(commits))
2807 print('git log %s..%s' % (parent, ref_to_push))
2808 print('You can also use `git squash-branch` to squash these into a '
2809 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002810 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002811
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002812 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002813 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002814 # Add default, watchlist, presubmit ccs if this is the initial upload
2815 # and CL is not private and auto-ccing has not been disabled.
2816 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002817 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002818 if len(cc) > 100:
2819 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2820 'process/lsc/lsc_workflow.md')
2821 print('WARNING: This will auto-CC %s users.' % len(cc))
2822 print('LSC may be more appropriate: %s' % lsc)
2823 print('You can also use the --no-autocc flag to disable auto-CC.')
2824 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002825 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002826 if options.cc:
2827 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002828 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002829 if change_desc.get_cced():
2830 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002831 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002832 valid_accounts = set(reviewers + cc)
2833 # TODO(crbug/877717): relax this for all hosts.
2834 else:
2835 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002836 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002837 logging.info('accounts %s are recognized, %s invalid',
2838 sorted(valid_accounts),
2839 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002840
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002841 # Extra options that can be specified at push time. Doc:
2842 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002843 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002844
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002845 for r in sorted(reviewers):
2846 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002847 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002848 reviewers.remove(r)
2849 else:
2850 # TODO(tandrii): this should probably be a hard failure.
2851 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2852 % r)
2853 for c in sorted(cc):
2854 # refspec option will be rejected if cc doesn't correspond to an
2855 # account, even though REST call to add such arbitrary cc may succeed.
2856 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002857 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002858 cc.remove(c)
2859
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002860 refspec_suffix = ''
2861 if refspec_opts:
2862 refspec_suffix = '%' + ','.join(refspec_opts)
2863 assert ' ' not in refspec_suffix, (
2864 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2865 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002866
Edward Lemur1b52d872019-05-09 21:12:12 +00002867 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002868 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002869 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002870 'change_id': change_id,
2871 'description': change_desc.description,
2872 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002873
Gavin Mak4e5e3992022-11-14 22:40:12 +00002874 # Gerrit may or may not update fast enough to return the correct patchset
2875 # number after we push. Get the pre-upload patchset and increment later.
2876 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2877
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002878 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002879 git_push_metadata,
2880 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002881
2882 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002883 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002884 change_numbers = [m.group(1)
2885 for m in map(regex.match, push_stdout.splitlines())
2886 if m]
2887 if len(change_numbers) != 1:
2888 DieWithError(
2889 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002890 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002891 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002892 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002893 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002894
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002895 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002896 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002897 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002898 gerrit_util.AddReviewers(self.GetGerritHost(),
2899 self._GerritChangeIdentifier(),
2900 reviewers,
2901 cc,
2902 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002903
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002904 return 0
2905
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002906 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2907 change_desc):
2908 """Computes parent of the generated commit to be uploaded to Gerrit.
2909
2910 Returns revision or a ref name.
2911 """
2912 if custom_cl_base:
2913 # Try to avoid creating additional unintended CLs when uploading, unless
2914 # user wants to take this risk.
2915 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2916 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2917 local_ref_of_target_remote])
2918 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002919 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002920 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2921 'If you proceed with upload, more than 1 CL may be created by '
2922 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2923 'If you are certain that specified base `%s` has already been '
2924 'uploaded to Gerrit as another CL, you may proceed.\n' %
2925 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2926 if not force:
2927 confirm_or_exit(
2928 'Do you take responsibility for cleaning up potential mess '
2929 'resulting from proceeding with upload?',
2930 action='upload')
2931 return custom_cl_base
2932
Aaron Gablef97e33d2017-03-30 15:44:27 -07002933 if remote != '.':
2934 return self.GetCommonAncestorWithUpstream()
2935
2936 # If our upstream branch is local, we base our squashed commit on its
2937 # squashed version.
2938 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2939
Aaron Gablef97e33d2017-03-30 15:44:27 -07002940 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002941 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002942 if upstream_branch_name == 'main':
2943 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002944
2945 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002946 # TODO(tandrii): consider checking parent change in Gerrit and using its
2947 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2948 # the tree hash of the parent branch. The upside is less likely bogus
2949 # requests to reupload parent change just because it's uploadhash is
2950 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002951 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2952 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002953 # Verify that the upstream branch has been uploaded too, otherwise
2954 # Gerrit will create additional CLs when uploading.
2955 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2956 RunGitSilent(['rev-parse', parent + ':'])):
2957 DieWithError(
2958 '\nUpload upstream branch %s first.\n'
2959 'It is likely that this branch has been rebased since its last '
2960 'upload, so you just need to upload it again.\n'
2961 '(If you uploaded it with --no-squash, then branch dependencies '
2962 'are not supported, and you should reupload with --squash.)'
2963 % upstream_branch_name,
2964 change_desc)
2965 return parent
2966
Gavin Mak4e5e3992022-11-14 22:40:12 +00002967 def _UpdateWithExternalChanges(self):
2968 """Updates workspace with external changes.
2969
2970 Returns the commit hash that should be used as the merge base on upload.
2971 """
2972 local_ps = self.GetPatchset()
2973 if local_ps is None:
2974 return
2975
2976 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002977 if external_ps is None or local_ps == external_ps or \
2978 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002979 return
2980
2981 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002982 if num_changes > 1:
2983 change_words = 'changes were'
2984 else:
2985 change_words = 'change was'
2986 print('\n%d external %s published to %s:\n' %
2987 (num_changes, change_words, self.GetIssueURL(short=True)))
2988
2989 # Print an overview of external changes.
2990 ps_to_commit = {}
2991 ps_to_info = {}
2992 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2993 for commit_id, revision_info in revisions.get('revisions', {}).items():
2994 ps_num = revision_info['_number']
2995 ps_to_commit[ps_num] = commit_id
2996 ps_to_info[ps_num] = revision_info
2997
2998 for ps in range(external_ps, local_ps, -1):
2999 commit = ps_to_commit[ps][:8]
3000 desc = ps_to_info[ps].get('description', '')
3001 print('Patchset %d [%s] %s' % (ps, commit, desc))
3002
3003 if not ask_for_explicit_yes('\nUploading as-is will override them. '
3004 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003005 return
3006
3007 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3008 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3009 external_base = external_parent['commit']
3010
3011 branch = git_common.current_branch()
3012 local_base = self.GetCommonAncestorWithUpstream()
3013 if local_base != external_base:
3014 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3015 (local_base, external_base))
3016 if git_common.upstream(branch):
3017 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3018 'to make these the same.')
3019 print('No upstream branch set. Consider setting it and using '
3020 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3021
3022 # Fetch Gerrit's CL base if it doesn't exist locally.
3023 remote, _ = self.GetRemoteBranch()
3024 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3025 RunGitSilent(['fetch', remote, external_base])
3026
3027 # Get the diff between local_ps and external_ps.
3028 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003029 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003030 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3031 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3032 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3033 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3034 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3035
3036 # Diff can be empty in the case of trivial rebases.
3037 if not diff:
3038 return external_base
3039
3040 # Apply the diff.
3041 with gclient_utils.temporary_file() as diff_tempfile:
3042 gclient_utils.FileWrite(diff_tempfile, diff)
3043 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3044 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3045 if not clean_patch:
3046 # Normally patchset is set after upload. But because we exit, that never
3047 # happens. Updating here makes sure that subsequent uploads don't need
3048 # to fetch/apply the same diff again.
3049 self.SetPatchset(external_ps)
3050 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3051 'conflicts and reupload.')
3052
3053 message = 'Incorporate external changes from '
3054 if num_changes == 1:
3055 message += 'patchset %d' % external_ps
3056 else:
3057 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3058 RunGitSilent(['commit', '-am', message])
3059 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3060 # patchset title instead of this 'Incorporate' message.
3061 return external_base
3062
Edward Lemura12175c2020-03-09 16:58:26 +00003063 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003064 """Re-commits using the current message, assumes the commit hook is in
3065 place.
3066 """
Edward Lemura12175c2020-03-09 16:58:26 +00003067 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003068 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003069 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003070 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003071 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003072
3073 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003074
tandriie113dfd2016-10-11 10:20:12 -07003075 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003076 try:
3077 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003078 except GerritChangeNotExists:
3079 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003080
3081 if data['status'] in ('ABANDONED', 'MERGED'):
3082 return 'CL %s is closed' % self.GetIssue()
3083
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003084 def GetGerritChange(self, patchset=None):
3085 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003086 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003087 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003088 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003089 data = self._GetChangeDetail(['ALL_REVISIONS'])
3090
3091 assert host and issue and patchset, 'CL must be uploaded first'
3092
3093 has_patchset = any(
3094 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003095 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003096 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003097 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003098 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003099
tandrii8c5a3532016-11-04 07:52:02 -07003100 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003101 'host': host,
3102 'change': issue,
3103 'project': data['project'],
3104 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003105 }
tandriie113dfd2016-10-11 10:20:12 -07003106
tandriide281ae2016-10-12 06:02:30 -07003107 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003108 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003109
Edward Lemur707d70b2018-02-07 00:50:14 +01003110 def GetReviewers(self):
3111 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003112 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003113
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003114
Lei Zhang8a0efc12020-08-05 19:58:45 +00003115def _get_bug_line_values(default_project_prefix, bugs):
3116 """Given default_project_prefix and comma separated list of bugs, yields bug
3117 line values.
tandriif9aefb72016-07-01 09:06:51 -07003118
3119 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003120 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003121 * string, which is left as is.
3122
3123 This function may produce more than one line, because bugdroid expects one
3124 project per line.
3125
Lei Zhang8a0efc12020-08-05 19:58:45 +00003126 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003127 ['v8:123', 'chromium:789']
3128 """
3129 default_bugs = []
3130 others = []
3131 for bug in bugs.split(','):
3132 bug = bug.strip()
3133 if bug:
3134 try:
3135 default_bugs.append(int(bug))
3136 except ValueError:
3137 others.append(bug)
3138
3139 if default_bugs:
3140 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003141 if default_project_prefix:
3142 if not default_project_prefix.endswith(':'):
3143 default_project_prefix += ':'
3144 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003145 else:
3146 yield default_bugs
3147 for other in sorted(others):
3148 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3149 yield other
3150
3151
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003152class ChangeDescription(object):
3153 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003154 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003155 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003156 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003157 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003158 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003159 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3160 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003161 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003162 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003163
Dan Beamd8b04ca2019-10-10 21:23:26 +00003164 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003165 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003166 if bug:
3167 regexp = re.compile(self.BUG_LINE)
3168 prefix = settings.GetBugPrefix()
3169 if not any((regexp.match(line) for line in self._description_lines)):
3170 values = list(_get_bug_line_values(prefix, bug))
3171 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003172 if fixed:
3173 regexp = re.compile(self.FIXED_LINE)
3174 prefix = settings.GetBugPrefix()
3175 if not any((regexp.match(line) for line in self._description_lines)):
3176 values = list(_get_bug_line_values(prefix, fixed))
3177 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003178
agable@chromium.org42c20792013-09-12 17:34:49 +00003179 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003180 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003181 return '\n'.join(self._description_lines)
3182
3183 def set_description(self, desc):
3184 if isinstance(desc, basestring):
3185 lines = desc.splitlines()
3186 else:
3187 lines = [line.rstrip() for line in desc]
3188 while lines and not lines[0]:
3189 lines.pop(0)
3190 while lines and not lines[-1]:
3191 lines.pop(-1)
3192 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003193
Edward Lemur5a644f82020-03-18 16:44:57 +00003194 def ensure_change_id(self, change_id):
3195 description = self.description
3196 footer_change_ids = git_footers.get_footer_change_id(description)
3197 # Make sure that the Change-Id in the description matches the given one.
3198 if footer_change_ids != [change_id]:
3199 if footer_change_ids:
3200 # Remove any existing Change-Id footers since they don't match the
3201 # expected change_id footer.
3202 description = git_footers.remove_footer(description, 'Change-Id')
3203 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3204 'if you want to set a new one.')
3205 # Add the expected Change-Id footer.
3206 description = git_footers.add_footer_change_id(description, change_id)
3207 self.set_description(description)
3208
Joanna Wang39811b12023-01-20 23:09:48 +00003209 def update_reviewers(self, reviewers):
3210 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003211
3212 Args:
3213 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003214 """
Joanna Wang39811b12023-01-20 23:09:48 +00003215 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003216 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003217
3218 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003219
Joanna Wang39811b12023-01-20 23:09:48 +00003220 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003221 regexp = re.compile(self.R_LINE)
3222 matches = [regexp.match(line) for line in self._description_lines]
3223 new_desc = [l for i, l in enumerate(self._description_lines)
3224 if not matches[i]]
3225 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003226
Joanna Wang39811b12023-01-20 23:09:48 +00003227 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003228
Joanna Wang39811b12023-01-20 23:09:48 +00003229 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003230 for match in matches:
3231 if not match:
3232 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003233 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003234
Joanna Wang39811b12023-01-20 23:09:48 +00003235 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003236
3237 # Put the new lines in the description where the old first R= line was.
3238 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3239 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003240 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003241 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003242 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003243
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003244 def set_preserve_tryjobs(self):
3245 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3246 footers = git_footers.parse_footers(self.description)
3247 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3248 if v.lower() == 'true':
3249 return
3250 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3251
Anthony Polito8b955342019-09-24 19:01:36 +00003252 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003253 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003254 self.set_description([
3255 '# Enter a description of the change.',
3256 '# This will be displayed on the codereview site.',
3257 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003258 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003259 '--------------------',
3260 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003261 bug_regexp = re.compile(self.BUG_LINE)
3262 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003263 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003264 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003265
Dan Beamd8b04ca2019-10-10 21:23:26 +00003266 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003267 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003268
Bruce Dawsonfc487042020-10-27 19:11:37 +00003269 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003270 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003271 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003272 if not content:
3273 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003274 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003275
Bruce Dawson2377b012018-01-11 16:46:49 -08003276 # Strip off comments and default inserted "Bug:" line.
3277 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003278 (line.startswith('#') or
3279 line.rstrip() == "Bug:" or
3280 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003281 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003282 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003283 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003284
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003285 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003286 """Adds a footer line to the description.
3287
3288 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3289 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3290 that Gerrit footers are always at the end.
3291 """
3292 parsed_footer_line = git_footers.parse_footer(line)
3293 if parsed_footer_line:
3294 # Line is a gerrit footer in the form: Footer-Key: any value.
3295 # Thus, must be appended observing Gerrit footer rules.
3296 self.set_description(
3297 git_footers.add_footer(self.description,
3298 key=parsed_footer_line[0],
3299 value=parsed_footer_line[1]))
3300 return
3301
3302 if not self._description_lines:
3303 self._description_lines.append(line)
3304 return
3305
3306 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3307 if gerrit_footers:
3308 # git_footers.split_footers ensures that there is an empty line before
3309 # actual (gerrit) footers, if any. We have to keep it that way.
3310 assert top_lines and top_lines[-1] == ''
3311 top_lines, separator = top_lines[:-1], top_lines[-1:]
3312 else:
3313 separator = [] # No need for separator if there are no gerrit_footers.
3314
3315 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic688adfe2023-03-01 22:46:12 +00003316 if (not change.Change.TAG_LINE_RE.match(prev_line)
3317 or not change.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003318 top_lines.append('')
3319 top_lines.append(line)
3320 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003321
tandrii99a72f22016-08-17 14:33:24 -07003322 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003323 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003324 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003325 reviewers = [match.group(2).strip()
3326 for match in matches
3327 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003328 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003329
bradnelsond975b302016-10-23 12:20:23 -07003330 def get_cced(self):
3331 """Retrieves the list of reviewers."""
3332 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3333 cced = [match.group(2).strip() for match in matches if match]
3334 return cleanup_list(cced)
3335
Nodir Turakulov23b82142017-11-16 11:04:25 -08003336 def get_hash_tags(self):
3337 """Extracts and sanitizes a list of Gerrit hashtags."""
3338 subject = (self._description_lines or ('',))[0]
3339 subject = re.sub(
3340 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3341
3342 tags = []
3343 start = 0
3344 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3345 while True:
3346 m = bracket_exp.match(subject, start)
3347 if not m:
3348 break
3349 tags.append(self.sanitize_hash_tag(m.group(1)))
3350 start = m.end()
3351
3352 if not tags:
3353 # Try "Tag: " prefix.
3354 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3355 if m:
3356 tags.append(self.sanitize_hash_tag(m.group(1)))
3357 return tags
3358
3359 @classmethod
3360 def sanitize_hash_tag(cls, tag):
3361 """Returns a sanitized Gerrit hash tag.
3362
3363 A sanitized hashtag can be used as a git push refspec parameter value.
3364 """
3365 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3366
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003367
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003368def FindCodereviewSettingsFile(filename='codereview.settings'):
3369 """Finds the given file starting in the cwd and going up.
3370
3371 Only looks up to the top of the repository unless an
3372 'inherit-review-settings-ok' file exists in the root of the repository.
3373 """
3374 inherit_ok_file = 'inherit-review-settings-ok'
3375 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003376 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003377 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003378 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003379 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003380 if os.path.isfile(os.path.join(cwd, filename)):
3381 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003382 if cwd == root:
3383 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003384 parent_dir = os.path.dirname(cwd)
3385 if parent_dir == cwd:
3386 # We hit the system root directory.
3387 break
3388 cwd = parent_dir
3389 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003390
3391
3392def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003393 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003394 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003395
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003396 def SetProperty(name, setting, unset_error_ok=False):
3397 fullname = 'rietveld.' + name
3398 if setting in keyvals:
3399 RunGit(['config', fullname, keyvals[setting]])
3400 else:
3401 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3402
tandrii48df5812016-10-17 03:55:37 -07003403 if not keyvals.get('GERRIT_HOST', False):
3404 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003405 # Only server setting is required. Other settings can be absent.
3406 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003407 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003408 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3409 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003410 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003411 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3412 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003413 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3414 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003415 SetProperty(
3416 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003417 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003418
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003419 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003420 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003421
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003422 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003423 RunGit(['config', 'gerrit.squash-uploads',
3424 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003425
tandrii@chromium.org28253532016-04-14 13:46:56 +00003426 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003427 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003428 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3429
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003430 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003431 # should be of the form
3432 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3433 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003434 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3435 keyvals['ORIGIN_URL_CONFIG']])
3436
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003437
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003438def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003439 """Downloads a network object to a local file, like urllib.urlretrieve.
3440
3441 This is necessary because urllib is broken for SSL connections via a proxy.
3442 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003443 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003444 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003445
3446
ukai@chromium.org712d6102013-11-27 00:52:58 +00003447def hasSheBang(fname):
3448 """Checks fname is a #! script."""
3449 with open(fname) as f:
3450 return f.read(2).startswith('#!')
3451
3452
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003453def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003454 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003455
3456 Args:
3457 force: True to update hooks. False to install hooks if not present.
3458 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003459 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003460 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3461 if not os.access(dst, os.X_OK):
3462 if os.path.exists(dst):
3463 if not force:
3464 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003465 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003466 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003467 if not hasSheBang(dst):
3468 DieWithError('Not a script: %s\n'
3469 'You need to download from\n%s\n'
3470 'into .git/hooks/commit-msg and '
3471 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003472 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3473 except Exception:
3474 if os.path.exists(dst):
3475 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003476 DieWithError('\nFailed to download hooks.\n'
3477 'You need to download from\n%s\n'
3478 'into .git/hooks/commit-msg and '
3479 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003480
3481
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003482class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003483 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003484
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003485 def __init__(self):
3486 # Cached list of [host, identity, source], where source is either
3487 # .gitcookies or .netrc.
3488 self._all_hosts = None
3489
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003490 def ensure_configured_gitcookies(self):
3491 """Runs checks and suggests fixes to make git use .gitcookies from default
3492 path."""
3493 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3494 configured_path = RunGitSilent(
3495 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003496 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003497 if configured_path:
3498 self._ensure_default_gitcookies_path(configured_path, default)
3499 else:
3500 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003501
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003502 @staticmethod
3503 def _ensure_default_gitcookies_path(configured_path, default_path):
3504 assert configured_path
3505 if configured_path == default_path:
3506 print('git is already configured to use your .gitcookies from %s' %
3507 configured_path)
3508 return
3509
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003510 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003511 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3512 (configured_path, default_path))
3513
3514 if not os.path.exists(configured_path):
3515 print('However, your configured .gitcookies file is missing.')
3516 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3517 action='reconfigure')
3518 RunGit(['config', '--global', 'http.cookiefile', default_path])
3519 return
3520
3521 if os.path.exists(default_path):
3522 print('WARNING: default .gitcookies file already exists %s' %
3523 default_path)
3524 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3525 default_path)
3526
3527 confirm_or_exit('Move existing .gitcookies to default location?',
3528 action='move')
3529 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003530 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003531 print('Moved and reconfigured git to use .gitcookies from %s' %
3532 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003533
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003534 @staticmethod
3535 def _configure_gitcookies_path(default_path):
3536 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3537 if os.path.exists(netrc_path):
3538 print('You seem to be using outdated .netrc for git credentials: %s' %
3539 netrc_path)
3540 print('This tool will guide you through setting up recommended '
3541 '.gitcookies store for git credentials.\n'
3542 '\n'
3543 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3544 ' git config --global --unset http.cookiefile\n'
3545 ' mv %s %s.backup\n\n' % (default_path, default_path))
3546 confirm_or_exit(action='setup .gitcookies')
3547 RunGit(['config', '--global', 'http.cookiefile', default_path])
3548 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003549
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003550 def get_hosts_with_creds(self, include_netrc=False):
3551 if self._all_hosts is None:
3552 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003553 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3554 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3555 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3556 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003557
3558 if include_netrc:
3559 return self._all_hosts
3560 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3561
3562 def print_current_creds(self, include_netrc=False):
3563 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3564 if not hosts:
3565 print('No Git/Gerrit credentials found')
3566 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003567 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003568 header = [('Host', 'User', 'Which file'),
3569 ['=' * l for l in lengths]]
3570 for row in (header + hosts):
3571 print('\t'.join((('%%+%ds' % l) % s)
3572 for l, s in zip(lengths, row)))
3573
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003574 @staticmethod
3575 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003576 """Parses identity "git-<username>.domain" into <username> and domain."""
3577 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003578 # distinguishable from sub-domains. But we do know typical domains:
3579 if identity.endswith('.chromium.org'):
3580 domain = 'chromium.org'
3581 username = identity[:-len('.chromium.org')]
3582 else:
3583 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003584 if username.startswith('git-'):
3585 username = username[len('git-'):]
3586 return username, domain
3587
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003588 def has_generic_host(self):
3589 """Returns whether generic .googlesource.com has been configured.
3590
3591 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3592 """
3593 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003594 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003595 return True
3596 return False
3597
3598 def _get_git_gerrit_identity_pairs(self):
3599 """Returns map from canonic host to pair of identities (Git, Gerrit).
3600
3601 One of identities might be None, meaning not configured.
3602 """
3603 host_to_identity_pairs = {}
3604 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003605 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003606 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3607 idx = 0 if canonical == host else 1
3608 pair[idx] = identity
3609 return host_to_identity_pairs
3610
3611 def get_partially_configured_hosts(self):
3612 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003613 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003614 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003615 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003616
3617 def get_conflicting_hosts(self):
3618 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003619 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003620 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003621 if None not in (i1, i2) and i1 != i2)
3622
3623 def get_duplicated_hosts(self):
3624 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003625 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003626
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003627
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003628 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003629 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003630 hosts = sorted(hosts)
3631 assert hosts
3632 if extra_column_func is None:
3633 extras = [''] * len(hosts)
3634 else:
3635 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003636 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3637 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003638 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003639 lines.append(tmpl % he)
3640 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003641
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003642 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003643 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003644 yield ('.googlesource.com wildcard record detected',
3645 ['Chrome Infrastructure team recommends to list full host names '
3646 'explicitly.'],
3647 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003648
3649 dups = self.get_duplicated_hosts()
3650 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003651 yield ('The following hosts were defined twice',
3652 self._format_hosts(dups),
3653 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003654
3655 partial = self.get_partially_configured_hosts()
3656 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003657 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3658 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003659 self._format_hosts(
3660 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3661 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003662
3663 conflicting = self.get_conflicting_hosts()
3664 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003665 yield ('The following Git hosts have differing credentials from their '
3666 'Gerrit counterparts',
3667 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3668 tuple(self._get_git_gerrit_identity_pairs()[host])),
3669 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003670
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003671 def find_and_report_problems(self):
3672 """Returns True if there was at least one problem, else False."""
3673 found = False
3674 bad_hosts = set()
3675 for title, sublines, hosts in self._find_problems():
3676 if not found:
3677 found = True
3678 print('\n\n.gitcookies problem report:\n')
3679 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003680 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003681 if sublines:
3682 print()
3683 print(' %s' % '\n '.join(sublines))
3684 print()
3685
3686 if bad_hosts:
3687 assert found
3688 print(' You can manually remove corresponding lines in your %s file and '
3689 'visit the following URLs with correct account to generate '
3690 'correct credential lines:\n' %
3691 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003692 print(' %s' % '\n '.join(
3693 sorted(
3694 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3695 _canonical_git_googlesource_host(host))
3696 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003697 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003698
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003699
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003700@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003701def CMDcreds_check(parser, args):
3702 """Checks credentials and suggests changes."""
3703 _, _ = parser.parse_args(args)
3704
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003705 # Code below checks .gitcookies. Abort if using something else.
3706 authn = gerrit_util.Authenticator.get()
3707 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003708 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003709 'This command is not designed for bot environment. It checks '
3710 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003711 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3712 if isinstance(authn, gerrit_util.GceAuthenticator):
3713 message += (
3714 '\n'
3715 'If you need to run this on GCE or a cloudtop instance, '
3716 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3717 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003718
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003719 checker = _GitCookiesChecker()
3720 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003721
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003722 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003723 checker.print_current_creds(include_netrc=True)
3724
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003725 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003726 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003727 return 0
3728 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003729
3730
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003731@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003732def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003733 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003734 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003735 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003736 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003737 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003738 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003739 return RunGit(['config', 'branch.%s.base-url' % branch],
3740 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003741
3742 print('Setting base-url to %s' % args[0])
3743 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3744 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003745
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003746
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003747def color_for_status(status):
3748 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003749 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003750 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003751 'unsent': BOLD + Fore.YELLOW,
3752 'waiting': BOLD + Fore.RED,
3753 'reply': BOLD + Fore.YELLOW,
3754 'not lgtm': BOLD + Fore.RED,
3755 'lgtm': BOLD + Fore.GREEN,
3756 'commit': BOLD + Fore.MAGENTA,
3757 'closed': BOLD + Fore.CYAN,
3758 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003759 }.get(status, Fore.WHITE)
3760
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003761
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003762def get_cl_statuses(changes, fine_grained, max_processes=None):
3763 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003764
3765 If fine_grained is true, this will fetch CL statuses from the server.
3766 Otherwise, simply indicate if there's a matching url for the given branches.
3767
3768 If max_processes is specified, it is used as the maximum number of processes
3769 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3770 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003771
3772 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003773 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003774 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003775 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003776
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003777 if not fine_grained:
3778 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003779 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003780 for cl in changes:
3781 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003782 return
3783
3784 # First, sort out authentication issues.
3785 logging.debug('ensuring credentials exist')
3786 for cl in changes:
3787 cl.EnsureAuthenticated(force=False, refresh=True)
3788
3789 def fetch(cl):
3790 try:
3791 return (cl, cl.GetStatus())
3792 except:
3793 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003794 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003795 raise
3796
3797 threads_count = len(changes)
3798 if max_processes:
3799 threads_count = max(1, min(threads_count, max_processes))
3800 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3801
Edward Lemur61bf4172020-02-24 23:22:37 +00003802 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003803 fetched_cls = set()
3804 try:
3805 it = pool.imap_unordered(fetch, changes).__iter__()
3806 while True:
3807 try:
3808 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003809 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003810 break
3811 fetched_cls.add(cl)
3812 yield cl, status
3813 finally:
3814 pool.close()
3815
3816 # Add any branches that failed to fetch.
3817 for cl in set(changes) - fetched_cls:
3818 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003819
rmistry@google.com2dd99862015-06-22 12:22:18 +00003820
Jose Lopes3863fc52020-04-07 17:00:25 +00003821def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003822 """Uploads CLs of local branches that are dependents of the current branch.
3823
3824 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003825
3826 test1 -> test2.1 -> test3.1
3827 -> test3.2
3828 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003829
3830 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3831 run on the dependent branches in this order:
3832 test2.1, test3.1, test3.2, test2.2, test3.3
3833
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003834 Note: This function does not rebase your local dependent branches. Use it
3835 when you make a change to the parent branch that will not conflict
3836 with its dependent branches, and you would like their dependencies
3837 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003838 """
3839 if git_common.is_dirty_git_tree('upload-branch-deps'):
3840 return 1
3841
3842 root_branch = cl.GetBranch()
3843 if root_branch is None:
3844 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3845 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003846 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003847 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3848 'patchset dependencies without an uploaded CL.')
3849
3850 branches = RunGit(['for-each-ref',
3851 '--format=%(refname:short) %(upstream:short)',
3852 'refs/heads'])
3853 if not branches:
3854 print('No local branches found.')
3855 return 0
3856
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003857 # Create a dictionary of all local branches to the branches that are
3858 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003859 tracked_to_dependents = collections.defaultdict(list)
3860 for b in branches.splitlines():
3861 tokens = b.split()
3862 if len(tokens) == 2:
3863 branch_name, tracked = tokens
3864 tracked_to_dependents[tracked].append(branch_name)
3865
vapiera7fbd5a2016-06-16 09:17:49 -07003866 print()
3867 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003868 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003869
rmistry@google.com2dd99862015-06-22 12:22:18 +00003870 def traverse_dependents_preorder(branch, padding=''):
3871 dependents_to_process = tracked_to_dependents.get(branch, [])
3872 padding += ' '
3873 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003874 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003875 dependents.append(dependent)
3876 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003877
rmistry@google.com2dd99862015-06-22 12:22:18 +00003878 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003879 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003880
3881 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003882 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003883 return 0
3884
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885 # Record all dependents that failed to upload.
3886 failures = {}
3887 # Go through all dependents, checkout the branch and upload.
3888 try:
3889 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003890 print()
3891 print('--------------------------------------')
3892 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003893 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003894 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003895 try:
3896 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003897 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003898 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003899 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003900 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003901 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003902 finally:
3903 # Swap back to the original root branch.
3904 RunGit(['checkout', '-q', root_branch])
3905
vapiera7fbd5a2016-06-16 09:17:49 -07003906 print()
3907 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003908 for dependent_branch in dependents:
3909 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003910 print(' %s : %s' % (dependent_branch, upload_status))
3911 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003912
3913 return 0
3914
3915
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003916def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003917 """Given a proposed tag name, returns a tag name that is guaranteed to be
3918 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3919 or 'foo-3', and so on."""
3920
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003921 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003922 for suffix_num in itertools.count(1):
3923 if suffix_num == 1:
3924 to_check = proposed_tag
3925 else:
3926 to_check = '%s-%d' % (proposed_tag, suffix_num)
3927
3928 if to_check not in existing_tags:
3929 return to_check
3930
3931
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003932@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003933def CMDarchive(parser, args):
3934 """Archives and deletes branches associated with closed changelists."""
3935 parser.add_option(
3936 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003937 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003938 parser.add_option(
3939 '-f', '--force', action='store_true',
3940 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003941 parser.add_option(
3942 '-d', '--dry-run', action='store_true',
3943 help='Skip the branch tagging and removal steps.')
3944 parser.add_option(
3945 '-t', '--notags', action='store_true',
3946 help='Do not tag archived branches. '
3947 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003948 parser.add_option(
3949 '-p',
3950 '--pattern',
3951 default='git-cl-archived-{issue}-{branch}',
3952 help='Format string for archive tags. '
3953 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003954
kmarshall3bff56b2016-06-06 18:31:47 -07003955 options, args = parser.parse_args(args)
3956 if args:
3957 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003958
3959 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3960 if not branches:
3961 return 0
3962
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003963 tags = RunGit(['for-each-ref', '--format=%(refname)',
3964 'refs/tags']).splitlines() or []
3965 tags = [t.split('/')[-1] for t in tags]
3966
vapiera7fbd5a2016-06-16 09:17:49 -07003967 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003968 changes = [Changelist(branchref=b)
3969 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003970 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3971 statuses = get_cl_statuses(changes,
3972 fine_grained=True,
3973 max_processes=options.maxjobs)
3974 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003975 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3976 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003977 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003978 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003979 proposal.sort()
3980
3981 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003982 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003983 return 0
3984
Edward Lemur85153282020-02-14 22:06:29 +00003985 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003986
vapiera7fbd5a2016-06-16 09:17:49 -07003987 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003988 if options.notags:
3989 for next_item in proposal:
3990 print(' ' + next_item[0])
3991 else:
3992 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3993 for next_item in proposal:
3994 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003995
kmarshall9249e012016-08-23 12:02:16 -07003996 # Quit now on precondition failure or if instructed by the user, either
3997 # via an interactive prompt or by command line flags.
3998 if options.dry_run:
3999 print('\nNo changes were made (dry run).\n')
4000 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004001
4002 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004003 print('You are currently on a branch \'%s\' which is associated with a '
4004 'closed codereview issue, so archive cannot proceed. Please '
4005 'checkout another branch and run this command again.' %
4006 current_branch)
4007 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004008
4009 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004010 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004011 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004012 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004013 return 1
4014
4015 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004016 if not options.notags:
4017 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004018
4019 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4020 # Clean up the tag if we failed to delete the branch.
4021 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004022
vapiera7fbd5a2016-06-16 09:17:49 -07004023 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004024
4025 return 0
4026
4027
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004028@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004029def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004030 """Show status of changelists.
4031
4032 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004033 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004034 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004035 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004036 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004037 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004038 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004039 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004040
4041 Also see 'git cl comments'.
4042 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004043 parser.add_option(
4044 '--no-branch-color',
4045 action='store_true',
4046 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004047 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004048 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004049 parser.add_option('-f', '--fast', action='store_true',
4050 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004051 parser.add_option(
4052 '-j', '--maxjobs', action='store', type=int,
4053 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004054 parser.add_option(
4055 '-i', '--issue', type=int,
4056 help='Operate on this issue instead of the current branch\'s implicit '
4057 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004058 parser.add_option('-d',
4059 '--date-order',
4060 action='store_true',
4061 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004062 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004063 if args:
4064 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004065
iannuccie53c9352016-08-17 14:40:40 -07004066 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004067 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004068
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004069 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004070 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004071 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004072 if cl.GetIssue():
4073 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004074 elif options.field == 'id':
4075 issueid = cl.GetIssue()
4076 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004077 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004078 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004079 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004080 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004081 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004082 elif options.field == 'status':
4083 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004084 elif options.field == 'url':
4085 url = cl.GetIssueURL()
4086 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004087 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004088 return 0
4089
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004090 branches = RunGit([
4091 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4092 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004093 if not branches:
4094 print('No local branch found.')
4095 return 0
4096
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004097 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004098 Changelist(branchref=b, commit_date=ct)
4099 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4100 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004101 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004102 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004103 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004104 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004105
Edward Lemur85153282020-02-14 22:06:29 +00004106 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004107
4108 def FormatBranchName(branch, colorize=False):
4109 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4110 an asterisk when it is the current branch."""
4111
4112 asterisk = ""
4113 color = Fore.RESET
4114 if branch == current_branch:
4115 asterisk = "* "
4116 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004117 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004118
4119 if colorize:
4120 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004121 return asterisk + branch_name
4122
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004123 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004124
4125 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004126
4127 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004128 sorted_changes = sorted(changes,
4129 key=lambda c: c.GetCommitDate(),
4130 reverse=True)
4131 else:
4132 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4133 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004134 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004135 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004136 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004137 branch_statuses[c.GetBranch()] = status
4138 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004139 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004140 if url and (not status or status == 'error'):
4141 # The issue probably doesn't exist anymore.
4142 url += ' (broken)'
4143
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004144 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004145 # Turn off bold as well as colors.
4146 END = '\033[0m'
4147 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004148 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004149 color = ''
4150 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004151 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004152
Alan Cuttera3be9a52019-03-04 18:50:33 +00004153 branch_display = FormatBranchName(branch)
4154 padding = ' ' * (alignment - len(branch_display))
4155 if not options.no_branch_color:
4156 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004157
Alan Cuttera3be9a52019-03-04 18:50:33 +00004158 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4159 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004160
vapiera7fbd5a2016-06-16 09:17:49 -07004161 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004162 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004163 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004164 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004165 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004166 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004167 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004168 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004169 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004170 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004171 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004172 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004173 return 0
4174
4175
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004176def colorize_CMDstatus_doc():
4177 """To be called once in main() to add colors to git cl status help."""
4178 colors = [i for i in dir(Fore) if i[0].isupper()]
4179
4180 def colorize_line(line):
4181 for color in colors:
4182 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004183 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004184 indent = len(line) - len(line.lstrip(' ')) + 1
4185 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4186 return line
4187
4188 lines = CMDstatus.__doc__.splitlines()
4189 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4190
4191
phajdan.jre328cf92016-08-22 04:12:17 -07004192def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004193 if path == '-':
4194 json.dump(contents, sys.stdout)
4195 else:
4196 with open(path, 'w') as f:
4197 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004198
4199
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004200@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004201@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004202def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004203 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004204
4205 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004206 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004207 parser.add_option('-r', '--reverse', action='store_true',
4208 help='Lookup the branch(es) for the specified issues. If '
4209 'no issues are specified, all branches with mapped '
4210 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004211 parser.add_option('--json',
4212 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004213 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004214
dnj@chromium.org406c4402015-03-03 17:22:28 +00004215 if options.reverse:
4216 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004217 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004218 # Reverse issue lookup.
4219 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004220
4221 git_config = {}
4222 for config in RunGit(['config', '--get-regexp',
4223 r'branch\..*issue']).splitlines():
4224 name, _space, val = config.partition(' ')
4225 git_config[name] = val
4226
dnj@chromium.org406c4402015-03-03 17:22:28 +00004227 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004228 issue = git_config.get(
4229 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004230 if issue:
4231 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004232 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004233 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004234 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004235 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004236 try:
4237 issue_num = int(issue)
4238 except ValueError:
4239 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004240 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004241 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004242 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004243 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004244 if options.json:
4245 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004246 return 0
4247
4248 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004249 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004250 if not issue.valid:
4251 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4252 'or no argument to list it.\n'
4253 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004254 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004255 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004256 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004257 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004258 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4259 if options.json:
4260 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004261 'gerrit_host': cl.GetGerritHost(),
4262 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004263 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004264 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004265 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004266 return 0
4267
4268
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004269@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004270def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004271 """Shows or posts review comments for any changelist."""
4272 parser.add_option('-a', '--add-comment', dest='comment',
4273 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004274 parser.add_option('-p', '--publish', action='store_true',
4275 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004276 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004277 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004278 parser.add_option('-m', '--machine-readable', dest='readable',
4279 action='store_false', default=True,
4280 help='output comments in a format compatible with '
4281 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004282 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004283 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004284 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004285
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004286 issue = None
4287 if options.issue:
4288 try:
4289 issue = int(options.issue)
4290 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004291 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004292
Edward Lemur934836a2019-09-09 20:16:54 +00004293 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004294
4295 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004296 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004297 return 0
4298
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004299 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4300 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004301 for comment in summary:
4302 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004303 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004304 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004305 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004306 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004307 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004308 elif comment.autogenerated:
4309 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004310 else:
4311 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004312 print('\n%s%s %s%s\n%s' % (
4313 color,
4314 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4315 comment.sender,
4316 Fore.RESET,
4317 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4318
smut@google.comc85ac942015-09-15 16:34:43 +00004319 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004320 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004321 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004322 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4323 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004324 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004325 return 0
4326
4327
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004328@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004329@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004330def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004331 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004332 parser.add_option('-d', '--display', action='store_true',
4333 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004334 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004335 help='New description to set for this issue (- for stdin, '
4336 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004337 parser.add_option('-f', '--force', action='store_true',
4338 help='Delete any unpublished Gerrit edits for this issue '
4339 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004340
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004341 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004342
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004343 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004344 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004345 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004346 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004347 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004348
Edward Lemur934836a2019-09-09 20:16:54 +00004349 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004350 if target_issue_arg:
4351 kwargs['issue'] = target_issue_arg.issue
4352 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004353
4354 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004355 if not cl.GetIssue():
4356 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004357
Edward Lemur678a6842019-10-03 22:25:05 +00004358 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004359 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004360
Edward Lemur6c6827c2020-02-06 21:15:18 +00004361 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004362
smut@google.com34fb6b12015-07-13 20:03:26 +00004363 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004364 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004365 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004366
4367 if options.new_description:
4368 text = options.new_description
4369 if text == '-':
4370 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004371 elif text == '+':
4372 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004373 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004374
4375 description.set_description(text)
4376 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004377 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004378 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004379 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004380 return 0
4381
4382
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004383@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004384def CMDlint(parser, args):
4385 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004386 parser.add_option('--filter', action='append', metavar='-x,+y',
4387 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004388 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004389
4390 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004391 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004392 try:
4393 import cpplint
4394 import cpplint_chromium
4395 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004396 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004397 return 1
4398
4399 # Change the current working directory before calling lint so that it
4400 # shows the correct base.
4401 previous_cwd = os.getcwd()
4402 os.chdir(settings.GetRoot())
4403 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004404 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004405 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004406 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004407 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004408 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004409
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004410 # Process cpplint arguments, if any.
4411 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4412 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004413 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004414
Lei Zhang379d1ad2020-07-15 19:40:06 +00004415 include_regex = re.compile(settings.GetLintRegex())
4416 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004417 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4418 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004419 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004420 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004421 continue
4422
4423 if ignore_regex.match(filename):
4424 print('Ignoring file %s' % filename)
4425 continue
4426
4427 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4428 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004429 finally:
4430 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004431 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004432 if cpplint._cpplint_state.error_count != 0:
4433 return 1
4434 return 0
4435
4436
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004437@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004438def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004439 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004440 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004441 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004442 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004443 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004444 parser.add_option('--all', action='store_true',
4445 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004446 parser.add_option('--files',
4447 nargs=1,
4448 help='Semicolon-separated list of files to be marked as '
4449 'modified when executing presubmit or post-upload hooks. '
4450 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004451 parser.add_option('--parallel', action='store_true',
4452 help='Run all tests specified by input_api.RunTests in all '
4453 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004454 parser.add_option('--resultdb', action='store_true',
4455 help='Run presubmit checks in the ResultSink environment '
4456 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004457 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004458 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004459
sbc@chromium.org71437c02015-04-09 19:29:40 +00004460 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004461 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004462 return 1
4463
Edward Lemur934836a2019-09-09 20:16:54 +00004464 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004465 if args:
4466 base_branch = args[0]
4467 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004468 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004469 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004470
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004471 start = time.time()
4472 try:
4473 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4474 description = cl.FetchDescription()
4475 else:
4476 description = _create_description_from_log([base_branch])
4477 except Exception as e:
4478 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004479 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004480 elapsed = time.time() - start
4481 if elapsed > 5:
4482 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004483
Bruce Dawson13acea32022-05-03 22:13:08 +00004484 if not base_branch:
4485 if not options.force:
4486 print('use --force to check even when not on a branch.')
4487 return 1
4488 base_branch = 'HEAD'
4489
Josip Sokcevic017544d2022-03-31 23:47:53 +00004490 cl.RunHook(committing=not options.upload,
4491 may_prompt=False,
4492 verbose=options.verbose,
4493 parallel=options.parallel,
4494 upstream=base_branch,
4495 description=description,
4496 all_files=options.all,
4497 files=options.files,
4498 resultdb=options.resultdb,
4499 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004500 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004501
4502
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004503def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004504 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004505
4506 Works the same way as
4507 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4508 but can be called on demand on all platforms.
4509
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004510 The basic idea is to generate git hash of a state of the tree, original
4511 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004512 """
4513 lines = []
4514 tree_hash = RunGitSilent(['write-tree'])
4515 lines.append('tree %s' % tree_hash.strip())
4516 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4517 if code == 0:
4518 lines.append('parent %s' % parent.strip())
4519 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4520 lines.append('author %s' % author.strip())
4521 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4522 lines.append('committer %s' % committer.strip())
4523 lines.append('')
4524 # Note: Gerrit's commit-hook actually cleans message of some lines and
4525 # whitespace. This code is not doing this, but it clearly won't decrease
4526 # entropy.
4527 lines.append(message)
4528 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004529 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004530 return 'I%s' % change_hash.strip()
4531
4532
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004533def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004534 """Computes the remote branch ref to use for the CL.
4535
4536 Args:
4537 remote (str): The git remote for the CL.
4538 remote_branch (str): The git remote branch for the CL.
4539 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004540 """
4541 if not (remote and remote_branch):
4542 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004543
wittman@chromium.org455dc922015-01-26 20:15:50 +00004544 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004545 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004546 # refs, which are then translated into the remote full symbolic refs
4547 # below.
4548 if '/' not in target_branch:
4549 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4550 else:
4551 prefix_replacements = (
4552 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4553 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4554 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4555 )
4556 match = None
4557 for regex, replacement in prefix_replacements:
4558 match = re.search(regex, target_branch)
4559 if match:
4560 remote_branch = target_branch.replace(match.group(0), replacement)
4561 break
4562 if not match:
4563 # This is a branch path but not one we recognize; use as-is.
4564 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004565 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004566 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004567 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004568 # Handle the refs that need to land in different refs.
4569 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004570
wittman@chromium.org455dc922015-01-26 20:15:50 +00004571 # Create the true path to the remote branch.
4572 # Does the following translation:
4573 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004574 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004575 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4576 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4577 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4578 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4579 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4580 'refs/heads/')
4581 elif remote_branch.startswith('refs/remotes/branch-heads'):
4582 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004583
wittman@chromium.org455dc922015-01-26 20:15:50 +00004584 return remote_branch
4585
4586
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004587def cleanup_list(l):
4588 """Fixes a list so that comma separated items are put as individual items.
4589
4590 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4591 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4592 """
4593 items = sum((i.split(',') for i in l), [])
4594 stripped_items = (i.strip() for i in items)
4595 return sorted(filter(None, stripped_items))
4596
4597
Aaron Gable4db38df2017-11-03 14:59:07 -07004598@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004599@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004600def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004601 """Uploads the current changelist to codereview.
4602
4603 Can skip dependency patchset uploads for a branch by running:
4604 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004605 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004606 git config --unset branch.branch_name.skip-deps-uploads
4607 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004608
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004609 If the name of the checked out branch starts with "bug-" or "fix-" followed
4610 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004611 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004612
4613 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004614 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004615 [git-cl] add support for hashtags
4616 Foo bar: implement foo
4617 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004618 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004619 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4620 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004621 parser.add_option('--bypass-watchlists', action='store_true',
4622 dest='bypass_watchlists',
4623 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004624 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004625 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004626 parser.add_option('--message', '-m', dest='message',
4627 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004628 parser.add_option('-b', '--bug',
4629 help='pre-populate the bug number(s) for this issue. '
4630 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004631 parser.add_option('--message-file', dest='message_file',
4632 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004633 parser.add_option('--title', '-t', dest='title',
4634 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004635 parser.add_option('-T', '--skip-title', action='store_true',
4636 dest='skip_title',
4637 help='Use the most recent commit message as the title of '
4638 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004639 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004640 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004641 help='reviewer email addresses')
4642 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004643 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004644 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004645 parser.add_option('--hashtag', dest='hashtags',
4646 action='append', default=[],
4647 help=('Gerrit hashtag for new CL; '
4648 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004649 parser.add_option('-s',
4650 '--send-mail',
4651 '--send-email',
4652 dest='send_mail',
4653 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004654 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004655 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004656 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004657 metavar='TARGET',
4658 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004659 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004660 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004661 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004662 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004663 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004664 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004665 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004666 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4667 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004668 parser.add_option('-c',
4669 '--use-commit-queue',
4670 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004671 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004672 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004673 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004674 parser.add_option('-d', '--cq-dry-run',
4675 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004676 help='Send the patchset to do a CQ dry run right after '
4677 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004678 parser.add_option(
4679 '-q',
4680 '--cq-quick-run',
4681 action='store_true',
4682 default=False,
4683 help='Send the patchset to do a CQ quick run right after '
4684 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4685 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004686 parser.add_option('--set-bot-commit', action='store_true',
4687 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004688 parser.add_option('--preserve-tryjobs', action='store_true',
4689 help='instruct the CQ to let tryjobs running even after '
4690 'new patchsets are uploaded instead of canceling '
4691 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004692 parser.add_option('--dependencies', action='store_true',
4693 help='Uploads CLs of all the local branches that depend on '
4694 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004695 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4696 help='Sends your change to the CQ after an approval. Only '
4697 'works on repos that have the Auto-Submit label '
4698 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004699 parser.add_option('--parallel', action='store_true',
4700 help='Run all tests specified by input_api.RunTests in all '
4701 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004702 parser.add_option('--no-autocc', action='store_true',
4703 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004704 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004705 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004706 parser.add_option('-R', '--retry-failed', action='store_true',
4707 help='Retry failed tryjobs from old patchset immediately '
4708 'after uploading new patchset. Cannot be used with '
4709 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004710 parser.add_option('--fixed', '-x',
4711 help='List of bugs that will be commented on and marked '
4712 'fixed (pre-populates "Fixed:" tag). Same format as '
4713 '-b option / "Bug:" tag. If fixing several issues, '
4714 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004715 parser.add_option('--edit-description', action='store_true', default=False,
4716 help='Modify description before upload. Cannot be used '
4717 'with --force. It is a noop when --no-squash is set '
4718 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004719 parser.add_option('--git-completion-helper', action="store_true",
4720 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004721 parser.add_option('-o',
4722 '--push-options',
4723 action='append',
4724 default=[],
4725 help='Transmit the given string to the server when '
4726 'performing git push (pass-through). See git-push '
4727 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004728 parser.add_option('--no-add-changeid',
4729 action='store_true',
4730 dest='no_add_changeid',
4731 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004732 parser.add_option('--no-python2-post-upload-hooks',
4733 action='store_true',
4734 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004735 parser.add_option('--cherry-pick-stacked',
4736 '--cp',
4737 dest='cherry_pick_stacked',
4738 action='store_true',
4739 help='If parent branch has un-uploaded updates, '
4740 'automatically skip parent branches and just upload '
4741 'the current branch cherry-pick on its parent\'s last '
4742 'uploaded commit. Allows users to skip the potential '
4743 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004744 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004745
rmistry@google.com2dd99862015-06-22 12:22:18 +00004746 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004747 (options, args) = parser.parse_args(args)
4748
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004749 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004750 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4751 if opt.help != optparse.SUPPRESS_HELP))
4752 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004753
sbc@chromium.org71437c02015-04-09 19:29:40 +00004754 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004755 return 1
4756
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004757 options.reviewers = cleanup_list(options.reviewers)
4758 options.cc = cleanup_list(options.cc)
4759
Josipe827b0f2020-01-30 00:07:20 +00004760 if options.edit_description and options.force:
4761 parser.error('Only one of --force and --edit-description allowed')
4762
tandriib80458a2016-06-23 12:20:07 -07004763 if options.message_file:
4764 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004765 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004766 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004767
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004768 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004769 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004770 options.use_commit_queue,
4771 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004772 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4773 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004774
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004775 if options.skip_title and options.title:
4776 parser.error('Only one of --title and --skip-title allowed.')
4777
Aaron Gableedbc4132017-09-11 13:22:28 -07004778 if options.use_commit_queue:
4779 options.send_mail = True
4780
Edward Lesmes0dd54822020-03-26 18:24:25 +00004781 if options.squash is None:
4782 # Load default for user, repo, squash=true, in this order.
4783 options.squash = settings.GetSquashGerritUploads()
4784
Joanna Wang5051ffe2023-03-01 22:24:07 +00004785 cl = Changelist(branchref=options.target_branch)
4786
4787 # Warm change details cache now to avoid RPCs later, reducing latency for
4788 # developers.
4789 if cl.GetIssue():
4790 cl._GetChangeDetail(
4791 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4792
4793 if options.retry_failed and not cl.GetIssue():
4794 print('No previous patchsets, so --retry-failed has no effect.')
4795 options.retry_failed = False
4796
4797 remote = cl.GetRemoteUrl()
4798 dogfood_stacked_changes = (os.environ.get('DOGFOOD_STACKED_CHANGES')
4799 not in ['1', '0']
4800 and any(repo in remote
4801 for repo in DOGFOOD_STACKED_CHANGES_REPOS))
4802
4803 if dogfood_stacked_changes:
4804 print('This repo has been enrolled in the stacked changes dogfood. '
4805 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4806 'File bugs at https://bit.ly/3Y6opoI')
4807
4808 if options.squash and (dogfood_stacked_changes
4809 or os.environ.get('DOGFOOD_STACKED_CHANGES') == '1'):
Joanna Wangdd12deb2023-01-26 20:43:28 +00004810 if options.dependencies:
4811 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004812
Joanna Wangd75fc882023-03-01 21:53:34 +00004813 if options.cherry_pick_stacked:
4814 try:
4815 orig_args.remove('--cherry-pick-stacked')
4816 except ValueError:
4817 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004818 UploadAllSquashed(options, orig_args)
4819 return 0
4820
Joanna Wangd75fc882023-03-01 21:53:34 +00004821 if options.cherry_pick_stacked:
4822 parser.error('--cherry-pick-stacked is not available for this workflow.')
4823
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004824 # cl.GetMostRecentPatchset uses cached information, and can return the last
4825 # patchset before upload. Calling it here makes it clear that it's the
4826 # last patchset before upload. Note that GetMostRecentPatchset will fail
4827 # if no CL has been uploaded yet.
4828 if options.retry_failed:
4829 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004830
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004831 ret = cl.CMDUpload(options, args, orig_args)
4832
4833 if options.retry_failed:
4834 if ret != 0:
4835 print('Upload failed, so --retry-failed has no effect.')
4836 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004837 builds, _ = _fetch_latest_builds(cl,
4838 DEFAULT_BUILDBUCKET_HOST,
4839 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004840 jobs = _filter_failed_for_retry(builds)
4841 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004842 print('No failed tryjobs, so --retry-failed has no effect.')
4843 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004844 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004845
4846 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004847
4848
Joanna Wang18de1f62023-01-21 01:24:24 +00004849def UploadAllSquashed(options, orig_args):
4850 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4851 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004852 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004853
Joanna Wangc710e2d2023-01-25 14:53:22 +00004854 # Create commits.
4855 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4856 if cherry_pick_current:
4857 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4858 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4859 uploads_by_cl.append((cls[0], new_upload))
4860 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004861 ordered_cls = list(reversed(cls))
4862
Joanna Wang6215dd02023-02-07 15:58:03 +00004863 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004864 # We can only support external changes when we're only uploading one
4865 # branch.
4866 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
4867 if parent is None:
4868 origin = '.'
4869 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004870
Joanna Wang7603f042023-03-01 22:17:36 +00004871 while origin == '.':
4872 # Search for cl's closest ancestor with a gerrit hash.
4873 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4874 if origin == '.':
4875 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4876
4877 # Support the `git merge` and `git pull` workflow.
4878 if upstream_branch in ['master', 'main']:
4879 parent = cl.GetCommonAncestorWithUpstream()
4880 else:
4881 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4882 upstream_branch,
4883 GERRIT_SQUASH_HASH_CONFIG_KEY)
4884 if parent:
4885 break
4886 branch = upstream_branch
4887 else:
4888 # Either the root of the tree is the cl's direct parent and the while
4889 # loop above only found empty branches between cl and the root of the
4890 # tree.
4891 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004892
Joanna Wangc710e2d2023-01-25 14:53:22 +00004893 for i, cl in enumerate(ordered_cls):
4894 # If we're in the middle of the stack, set end_commit to downstream's
4895 # direct ancestor.
4896 if i + 1 < len(ordered_cls):
4897 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4898 else:
4899 child_base_commit = None
4900 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004901 parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004902 end_commit=child_base_commit)
4903 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004904 parent = new_upload.commit_to_push
4905
4906 # Create refspec options
4907 cl, new_upload = uploads_by_cl[-1]
4908 refspec_opts = cl._GetRefSpecOptions(
4909 options,
4910 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004911 multi_change_upload=len(uploads_by_cl) > 1,
4912 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004913 refspec_suffix = ''
4914 if refspec_opts:
4915 refspec_suffix = '%' + ','.join(refspec_opts)
4916 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4917 refspec_suffix)
4918
4919 remote, remote_branch = cl.GetRemoteBranch()
4920 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4921 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4922 refspec_suffix)
4923
4924 # Git push
4925 git_push_metadata = {
4926 'gerrit_host':
4927 cl.GetGerritHost(),
4928 'title':
4929 options.title or '<untitled>',
4930 'change_id':
4931 git_footers.get_footer_change_id(new_upload.change_desc.description),
4932 'description':
4933 new_upload.change_desc.description,
4934 }
4935 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
4936 git_push_metadata)
4937
4938 # Post push updates
4939 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4940 change_numbers = [
4941 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4942 ]
4943
4944 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4945 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4946
4947 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004948
4949
4950def _UploadAllPrecheck(options, orig_args):
4951 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4952 """Checks the state of the tree and gives the user uploading options
4953
4954 Returns: A tuple of the ordered list of changes that have new commits
4955 since their last upload and a boolean of whether the user wants to
4956 cherry-pick and upload the current branch instead of uploading all cls.
4957 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004958 cl = Changelist()
4959 if cl.GetBranch() is None:
4960 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4961
Joanna Wang18de1f62023-01-21 01:24:24 +00004962 branch_ref = None
4963 cls = []
4964 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004965 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004966
4967 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4968
4969 while True:
4970 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4971 DieWithError(
4972 'More than %s branches in the stack have not been uploaded.\n'
4973 'Are your branches in a misconfigured state?\n'
4974 'If not, please upload some upstream changes first.' %
4975 (_MAX_STACKED_BRANCHES_UPLOAD))
4976
4977 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004978
Joanna Wang6215dd02023-02-07 15:58:03 +00004979 # Only add CL if it has anything to commit.
4980 base_commit = cl.GetCommonAncestorWithUpstream()
4981 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4982
4983 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4984 if diff:
4985 cls.append(cl)
4986 if (not first_pass and
4987 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4988 # We are mid-stack and the user must upload their upstream branches.
4989 must_upload_upstream = True
4990 elif first_pass: # The current branch has nothing to commit. Exit.
4991 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4992 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
4993 first_pass = False
4994
4995 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00004996 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00004997 branch_ref = upstream_branch_ref # set branch for next run.
4998
Joanna Wang6215dd02023-02-07 15:58:03 +00004999 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5000 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5001 upstream_branch,
5002 LAST_UPLOAD_HASH_CONFIG_KEY)
5003
Joanna Wang18de1f62023-01-21 01:24:24 +00005004 # Case 1: We've reached the beginning of the tree.
5005 if origin != '.':
5006 break
5007
Joanna Wang18de1f62023-01-21 01:24:24 +00005008 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005009 # the user MUST upload them unless they are empty. Continue to
5010 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005011 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005012 continue
5013
Joanna Wang18de1f62023-01-21 01:24:24 +00005014 # Case 3: If upstream's last_upload == cl.base_commit we do
5015 # not need to upload any more upstreams from this point on.
5016 # (Even if there may be diverged branches higher up the tree)
5017 if base_commit == upstream_last_upload:
5018 break
5019
5020 # Case 4: If upstream's last_upload < cl.base_commit we are
5021 # uploading cl and upstream_cl.
5022 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005023 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005024 continue
5025
5026 # Case 5: If cl.base_commit < upstream's last_upload the user
5027 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005028 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005029 DieWithError(
5030 'At least one branch in the stack has diverged from its upstream '
5031 'branch and does not contain its upstream\'s last upload.\n'
5032 'Please rebase the stack with `git rebase-update` before uploading.')
5033
5034 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5035 # any relation to commits in the tree. Continue up the tree until we hit
5036 # the root.
5037
5038 # We assume all cls in the stack have the same auth requirements and only
5039 # check this once.
5040 cls[0].EnsureAuthenticated(force=options.force)
5041
5042 cherry_pick = False
5043 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005044 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005045 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005046 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005047 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005048 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005049 msg = ('At least one parent branch in `%s` has never been uploaded '
5050 'and must be uploaded before/with `%s`.\n' %
5051 (branches, cls[1].branch))
5052 if options.cherry_pick_stacked:
5053 DieWithError(msg)
5054 if not options.force:
5055 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005056 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005057 if options.cherry_pick_stacked:
5058 print('cherry-picking `%s` on %s\'s last upload' %
5059 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005060 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005061 elif not options.force:
5062 answer = gclient_utils.AskForData(
5063 '\n' + opt_message +
5064 'Press enter to update branches %s.\nOr type `n` to upload only '
5065 '`%s` cherry-picked on %s\'s last upload:' %
5066 (branches, cls[0].branch, cls[1].branch))
5067 if answer.lower() == 'n':
5068 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005069 return cls, cherry_pick
5070
5071
Francois Dorayd42c6812017-05-30 15:10:20 -04005072@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005073@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005074def CMDsplit(parser, args):
5075 """Splits a branch into smaller branches and uploads CLs.
5076
5077 Creates a branch and uploads a CL for each group of files modified in the
5078 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005079 comment, the string '$directory', is replaced with the directory containing
5080 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005081 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005082 parser.add_option('-d', '--description', dest='description_file',
5083 help='A text file containing a CL description in which '
5084 '$directory will be replaced by each CL\'s directory.')
5085 parser.add_option('-c', '--comment', dest='comment_file',
5086 help='A text file containing a CL comment.')
5087 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005088 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005089 help='List the files and reviewers for each CL that would '
5090 'be created, but don\'t create branches or CLs.')
5091 parser.add_option('--cq-dry-run', action='store_true',
5092 help='If set, will do a cq dry run for each uploaded CL. '
5093 'Please be careful when doing this; more than ~10 CLs '
5094 'has the potential to overload our build '
5095 'infrastructure. Try to upload these not during high '
5096 'load times (usually 11-3 Mountain View time). Email '
5097 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005098 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5099 default=True,
5100 help='Sends your change to the CQ after an approval. Only '
5101 'works on repos that have the Auto-Submit label '
5102 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005103 parser.add_option('--max-depth',
5104 type='int',
5105 default=0,
5106 help='The max depth to look for OWNERS files. Useful for '
5107 'controlling the granularity of the split CLs, e.g. '
5108 '--max-depth=1 will only split by top-level '
5109 'directory. Specifying a value less than 1 means no '
5110 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005111 options, _ = parser.parse_args(args)
5112
5113 if not options.description_file:
5114 parser.error('No --description flag specified.')
5115
5116 def WrappedCMDupload(args):
5117 return CMDupload(OptionParser(), args)
5118
Daniel Cheng403c44e2022-10-05 22:24:58 +00005119 return split_cl.SplitCl(options.description_file, options.comment_file,
5120 Changelist, WrappedCMDupload, options.dry_run,
5121 options.cq_dry_run, options.enable_auto_submit,
5122 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005123
5124
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005125@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005126@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005127def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005128 """DEPRECATED: Used to commit the current changelist via git-svn."""
5129 message = ('git-cl no longer supports committing to SVN repositories via '
5130 'git-svn. You probably want to use `git cl land` instead.')
5131 print(message)
5132 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005133
5134
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005135@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005136@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005137def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005138 """Commits the current changelist via git.
5139
5140 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5141 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005142 """
5143 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5144 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005145 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005146 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005147 parser.add_option('--parallel', action='store_true',
5148 help='Run all tests specified by input_api.RunTests in all '
5149 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005150 parser.add_option('--resultdb', action='store_true',
5151 help='Run presubmit checks in the ResultSink environment '
5152 'and send results to the ResultDB database.')
5153 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005154 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005155
Edward Lemur934836a2019-09-09 20:16:54 +00005156 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005157
Robert Iannucci2e73d432018-03-14 01:10:47 -07005158 if not cl.GetIssue():
5159 DieWithError('You must upload the change first to Gerrit.\n'
5160 ' If you would rather have `git cl land` upload '
5161 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005162 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5163 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005164
5165
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005166@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005167@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005168def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005169 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005170 parser.add_option('-b', dest='newbranch',
5171 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005172 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005173 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005174 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005175 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005176
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005177 group = optparse.OptionGroup(
5178 parser,
5179 'Options for continuing work on the current issue uploaded from a '
5180 'different clone (e.g. different machine). Must be used independently '
5181 'from the other options. No issue number should be specified, and the '
5182 'branch must have an issue number associated with it')
5183 group.add_option('--reapply', action='store_true', dest='reapply',
5184 help='Reset the branch and reapply the issue.\n'
5185 'CAUTION: This will undo any local changes in this '
5186 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005187
5188 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005189 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005190 parser.add_option_group(group)
5191
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005192 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005193
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005194 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005195 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005196 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005197 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005198 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005199
Edward Lemur934836a2019-09-09 20:16:54 +00005200 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005201 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005202 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005203
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005204 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005205 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005206 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005207
5208 RunGit(['reset', '--hard', upstream])
5209 if options.pull:
5210 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005211
Edward Lemur678a6842019-10-03 22:25:05 +00005212 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005213 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5214 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005215
5216 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005217 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005218
Edward Lemurf38bc172019-09-03 21:02:13 +00005219 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005220 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005221 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005222
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005223 # We don't want uncommitted changes mixed up with the patch.
5224 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005225 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005226
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005227 if options.newbranch:
5228 if options.force:
5229 RunGit(['branch', '-D', options.newbranch],
5230 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005231 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005232
Edward Lemur678a6842019-10-03 22:25:05 +00005233 cl = Changelist(
5234 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005235
Edward Lemur678a6842019-10-03 22:25:05 +00005236 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005237 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005238
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005239 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5240 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005241
5242
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005243def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005244 """Fetches the tree status and returns either 'open', 'closed',
5245 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005246 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005247 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005248 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005249 if status.find('closed') != -1 or status == '0':
5250 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005251
5252 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005253 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005254
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005255 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005256 return 'unset'
5257
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005258
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005259def GetTreeStatusReason():
5260 """Fetches the tree status from a json url and returns the message
5261 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005262 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005263 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005264 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005265 status = json.loads(connection.read())
5266 connection.close()
5267 return status['message']
5268
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005269
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005270@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005271def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005272 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005273 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005274 status = GetTreeStatus()
5275 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005276 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005277 return 2
5278
vapiera7fbd5a2016-06-16 09:17:49 -07005279 print('The tree is %s' % status)
5280 print()
5281 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005282 if status != 'open':
5283 return 1
5284 return 0
5285
5286
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005287@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005288def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005289 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5290 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005291 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005292 '-b', '--bot', action='append',
5293 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5294 'times to specify multiple builders. ex: '
5295 '"-b win_rel -b win_layout". See '
5296 'the try server waterfall for the builders name and the tests '
5297 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005298 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005299 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005300 help=('Buildbucket bucket to send the try requests. Format: '
5301 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005302 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005303 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005304 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005305 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005306 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005307 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005308 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005309 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005310 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005311 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005312 '-q',
5313 '--quick-run',
5314 action='store_true',
5315 default=False,
5316 help='trigger in quick run mode '
5317 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5318 'uick_run.md) (chromium only).')
5319 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005320 '--category', default='git_cl_try', help='Specify custom build category.')
5321 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005322 '--project',
5323 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005324 'in recipe to determine to which repository or directory to '
5325 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005326 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005327 '-p', '--property', dest='properties', action='append', default=[],
5328 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005329 'key2=value2 etc. The value will be treated as '
5330 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005331 'NOTE: using this may make your tryjob not usable for CQ, '
5332 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005333 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005334 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5335 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005336 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005337 parser.add_option(
5338 '-R', '--retry-failed', action='store_true', default=False,
5339 help='Retry failed jobs from the latest set of tryjobs. '
5340 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005341 parser.add_option(
5342 '-i', '--issue', type=int,
5343 help='Operate on this issue instead of the current branch\'s implicit '
5344 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005345 options, args = parser.parse_args(args)
5346
machenbach@chromium.org45453142015-09-15 08:45:22 +00005347 # Make sure that all properties are prop=value pairs.
5348 bad_params = [x for x in options.properties if '=' not in x]
5349 if bad_params:
5350 parser.error('Got properties with missing "=": %s' % bad_params)
5351
maruel@chromium.org15192402012-09-06 12:38:29 +00005352 if args:
5353 parser.error('Unknown arguments: %s' % args)
5354
Edward Lemur934836a2019-09-09 20:16:54 +00005355 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005356 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005357 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005358
Edward Lemurf38bc172019-09-03 21:02:13 +00005359 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005360 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005361
tandriie113dfd2016-10-11 10:20:12 -07005362 error_message = cl.CannotTriggerTryJobReason()
5363 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005364 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005365
Edward Lemur45768512020-03-02 19:03:14 +00005366 if options.bot:
5367 if options.retry_failed:
5368 parser.error('--bot is not compatible with --retry-failed.')
5369 if not options.bucket:
5370 parser.error('A bucket (e.g. "chromium/try") is required.')
5371
5372 triggered = [b for b in options.bot if 'triggered' in b]
5373 if triggered:
5374 parser.error(
5375 'Cannot schedule builds on triggered bots: %s.\n'
5376 'This type of bot requires an initial job from a parent (usually a '
5377 'builder). Schedule a job on the parent instead.\n' % triggered)
5378
5379 if options.bucket.startswith('.master'):
5380 parser.error('Buildbot masters are not supported.')
5381
5382 project, bucket = _parse_bucket(options.bucket)
5383 if project is None or bucket is None:
5384 parser.error('Invalid bucket: %s.' % options.bucket)
5385 jobs = sorted((project, bucket, bot) for bot in options.bot)
5386 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005387 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005388 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005389 if options.verbose:
5390 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005391 jobs = _filter_failed_for_retry(builds)
5392 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005393 print('There are no failed jobs in the latest set of jobs '
5394 '(patchset #%d), doing nothing.' % patchset)
5395 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005396 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005397 if num_builders > 10:
5398 confirm_or_exit('There are %d builders with failed builds.'
5399 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005400 elif options.quick_run:
5401 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5402 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005403 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005404 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005405 print('git cl try with no bots now defaults to CQ dry run.')
5406 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5407 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005408
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005409 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005410 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005411 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005412 except BuildbucketResponseException as ex:
5413 print('ERROR: %s' % ex)
5414 return 1
5415 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005416
5417
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005418@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005419def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005420 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005421 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005422 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005423 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005424 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005425 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005426 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005427 '--color', action='store_true', default=setup_color.IS_TTY,
5428 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005429 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005430 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5431 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005432 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005433 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005434 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005435 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005436 parser.add_option(
5437 '-i', '--issue', type=int,
5438 help='Operate on this issue instead of the current branch\'s implicit '
5439 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005440 options, args = parser.parse_args(args)
5441 if args:
5442 parser.error('Unrecognized args: %s' % ' '.join(args))
5443
Edward Lemur934836a2019-09-09 20:16:54 +00005444 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005445 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005446 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005447
tandrii221ab252016-10-06 08:12:04 -07005448 patchset = options.patchset
5449 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005450 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005451 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005452 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005453 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005454 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005455 cl.GetIssue())
5456
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005457 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005458 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005459 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005460 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005461 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005462 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005463 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005464 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005465 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005466 return 0
5467
5468
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005469@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005470@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005471def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005472 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005473 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005474 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005475 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005476
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005477 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005478 if args:
5479 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005480 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005481 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005482 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005483 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005484
5485 # Clear configured merge-base, if there is one.
5486 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005487 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005488 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005489 return 0
5490
5491
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005492@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005493def CMDweb(parser, args):
5494 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005495 parser.add_option('-p',
5496 '--print-only',
5497 action='store_true',
5498 dest='print_only',
5499 help='Only print the Gerrit URL, don\'t open it in the '
5500 'browser.')
5501 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005502 if args:
5503 parser.error('Unrecognized args: %s' % ' '.join(args))
5504
5505 issue_url = Changelist().GetIssueURL()
5506 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005507 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005508 return 1
5509
Orr Bernstein0b960582022-12-22 20:16:18 +00005510 if options.print_only:
5511 print(issue_url)
5512 return 0
5513
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005514 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005515 # allows us to hide the "Created new window in existing browser session."
5516 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005517 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005518 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005519 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005520 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005521 os.open(os.devnull, os.O_RDWR)
5522 try:
5523 webbrowser.open(issue_url)
5524 finally:
5525 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005526 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005527 return 0
5528
5529
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005530@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005531def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005532 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005533 parser.add_option('-d', '--dry-run', action='store_true',
5534 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005535 parser.add_option(
5536 '-q',
5537 '--quick-run',
5538 action='store_true',
5539 help='trigger in quick run mode '
5540 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5541 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005542 parser.add_option('-c', '--clear', action='store_true',
5543 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005544 parser.add_option(
5545 '-i', '--issue', type=int,
5546 help='Operate on this issue instead of the current branch\'s implicit '
5547 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005548 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005549 if args:
5550 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005551 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5552 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005553
Edward Lemur934836a2019-09-09 20:16:54 +00005554 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005555 if not cl.GetIssue():
5556 parser.error('Must upload the issue first.')
5557
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005558 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005559 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005560 elif options.quick_run:
5561 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005562 elif options.dry_run:
5563 state = _CQState.DRY_RUN
5564 else:
5565 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005566 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005567 return 0
5568
5569
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005570@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005571def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005572 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005573 parser.add_option(
5574 '-i', '--issue', type=int,
5575 help='Operate on this issue instead of the current branch\'s implicit '
5576 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005577 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005578 if args:
5579 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005580 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005581 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005582 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005583 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005584 cl.CloseIssue()
5585 return 0
5586
5587
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005588@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005589def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005590 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005591 parser.add_option(
5592 '--stat',
5593 action='store_true',
5594 dest='stat',
5595 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005596 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005597 if args:
5598 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005599
Edward Lemur934836a2019-09-09 20:16:54 +00005600 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005601 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005602 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005603 if not issue:
5604 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005605
Gavin Makbe2e9262022-11-08 23:41:55 +00005606 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005607 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005608 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005609 if not base:
5610 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5611 revision_info = detail['revisions'][detail['current_revision']]
5612 fetch_info = revision_info['fetch']['http']
5613 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5614 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005615
Aaron Gablea718c3e2017-08-28 17:47:28 -07005616 cmd = ['git', 'diff']
5617 if options.stat:
5618 cmd.append('--stat')
5619 cmd.append(base)
5620 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005621
5622 return 0
5623
5624
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005625@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005626def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005627 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005628 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005629 '--ignore-current',
5630 action='store_true',
5631 help='Ignore the CL\'s current reviewers and start from scratch.')
5632 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005633 '--ignore-self',
5634 action='store_true',
5635 help='Do not consider CL\'s author as an owners.')
5636 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005637 '--no-color',
5638 action='store_true',
5639 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005640 parser.add_option(
5641 '--batch',
5642 action='store_true',
5643 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005644 # TODO: Consider moving this to another command, since other
5645 # git-cl owners commands deal with owners for a given CL.
5646 parser.add_option(
5647 '--show-all',
5648 action='store_true',
5649 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005650 options, args = parser.parse_args(args)
5651
Edward Lemur934836a2019-09-09 20:16:54 +00005652 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005653 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005654
Yang Guo6e269a02019-06-26 11:17:02 +00005655 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005656 if len(args) == 0:
5657 print('No files specified for --show-all. Nothing to do.')
5658 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005659 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005660 for path in args:
5661 print('Owners for %s:' % path)
5662 print('\n'.join(
5663 ' - %s' % owner
5664 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005665 return 0
5666
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005667 if args:
5668 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005669 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005670 base_branch = args[0]
5671 else:
5672 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005673 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005674
Edward Lemur2c62b332020-03-12 22:12:33 +00005675 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005676
5677 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005678 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5679 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005680 return 0
5681
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005682 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005683 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005684 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005685 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005686 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005687 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005688 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005689
5690
Aiden Bennerc08566e2018-10-03 17:52:42 +00005691def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005692 """Generates a diff command."""
5693 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005694 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5695
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005696 if allow_prefix:
5697 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5698 # case that diff.noprefix is set in the user's git config.
5699 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5700 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005701 diff_cmd += ['--no-prefix']
5702
5703 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005704
5705 if args:
5706 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005707 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005708 diff_cmd.append(arg)
5709 else:
5710 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005711
5712 return diff_cmd
5713
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005714
Jamie Madill5e96ad12020-01-13 16:08:35 +00005715def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5716 """Runs clang-format-diff and sets a return value if necessary."""
5717
5718 if not clang_diff_files:
5719 return 0
5720
5721 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5722 # formatted. This is used to block during the presubmit.
5723 return_value = 0
5724
5725 # Locate the clang-format binary in the checkout
5726 try:
5727 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5728 except clang_format.NotFoundError as e:
5729 DieWithError(e)
5730
5731 if opts.full or settings.GetFormatFullByDefault():
5732 cmd = [clang_format_tool]
5733 if not opts.dry_run and not opts.diff:
5734 cmd.append('-i')
5735 if opts.dry_run:
5736 for diff_file in clang_diff_files:
5737 with open(diff_file, 'r') as myfile:
5738 code = myfile.read().replace('\r\n', '\n')
5739 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5740 stdout = stdout.replace('\r\n', '\n')
5741 if opts.diff:
5742 sys.stdout.write(stdout)
5743 if code != stdout:
5744 return_value = 2
5745 else:
5746 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5747 if opts.diff:
5748 sys.stdout.write(stdout)
5749 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005750 try:
5751 script = clang_format.FindClangFormatScriptInChromiumTree(
5752 'clang-format-diff.py')
5753 except clang_format.NotFoundError as e:
5754 DieWithError(e)
5755
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005756 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005757 if not opts.dry_run and not opts.diff:
5758 cmd.append('-i')
5759
5760 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005761 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005762
Edward Lesmes89624cd2020-04-06 17:51:56 +00005763 env = os.environ.copy()
5764 env['PATH'] = (
5765 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5766 stdout = RunCommand(
5767 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005768 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005769 if opts.diff:
5770 sys.stdout.write(stdout)
5771 if opts.dry_run and len(stdout) > 0:
5772 return_value = 2
5773
5774 return return_value
5775
5776
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005777def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5778 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5779 presubmit checks have failed (and returns 0 otherwise)."""
5780
5781 if not rust_diff_files:
5782 return 0
5783
5784 # Locate the rustfmt binary.
5785 try:
5786 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5787 except rustfmt.NotFoundError as e:
5788 DieWithError(e)
5789
5790 # TODO(crbug.com/1231317): Support formatting only the changed lines
5791 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5792 # https://github.com/emilio/rustfmt-format-diff
5793 cmd = [rustfmt_tool]
5794 if opts.dry_run:
5795 cmd.append('--check')
5796 cmd += rust_diff_files
5797 rustfmt_exitcode = subprocess2.call(cmd)
5798
5799 if opts.presubmit and rustfmt_exitcode != 0:
5800 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005801
5802 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005803
5804
Olivier Robin0a6b5442022-04-07 07:25:04 +00005805def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5806 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5807 that presubmit checks have failed (and returns 0 otherwise)."""
5808
5809 if not swift_diff_files:
5810 return 0
5811
5812 # Locate the swift-format binary.
5813 try:
5814 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5815 except swift_format.NotFoundError as e:
5816 DieWithError(e)
5817
5818 cmd = [swift_format_tool]
5819 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005820 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005821 else:
5822 cmd += ['format', '-i']
5823 cmd += swift_diff_files
5824 swift_format_exitcode = subprocess2.call(cmd)
5825
5826 if opts.presubmit and swift_format_exitcode != 0:
5827 return 2
5828
5829 return 0
5830
5831
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005832def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005833 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005834 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005835
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005836
enne@chromium.org555cfe42014-01-29 18:21:39 +00005837@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005838@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005839def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005840 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005841 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005842 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005843 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005844 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005845 parser.add_option('--full', action='store_true',
5846 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005847 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005848 parser.add_option('--dry-run', action='store_true',
5849 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005850 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005851 '--no-clang-format',
5852 dest='clang_format',
5853 action='store_false',
5854 default=True,
5855 help='Disables formatting of various file types using clang-format.')
5856 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005857 '--python',
5858 action='store_true',
5859 default=None,
5860 help='Enables python formatting on all python files.')
5861 parser.add_option(
5862 '--no-python',
5863 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005864 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005865 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005866 'If neither --python or --no-python are set, python files that have a '
5867 '.style.yapf file in an ancestor directory will be formatted. '
5868 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005869 parser.add_option(
5870 '--js',
5871 action='store_true',
5872 help='Format javascript code with clang-format. '
5873 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005874 parser.add_option('--diff', action='store_true',
5875 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005876 parser.add_option('--presubmit', action='store_true',
5877 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005878
5879 parser.add_option('--rust-fmt',
5880 dest='use_rust_fmt',
5881 action='store_true',
5882 default=rustfmt.IsRustfmtSupported(),
5883 help='Enables formatting of Rust file types using rustfmt.')
5884 parser.add_option(
5885 '--no-rust-fmt',
5886 dest='use_rust_fmt',
5887 action='store_false',
5888 help='Disables formatting of Rust file types using rustfmt.')
5889
Olivier Robin0a6b5442022-04-07 07:25:04 +00005890 parser.add_option(
5891 '--swift-format',
5892 dest='use_swift_format',
5893 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005894 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005895 help='Enables formatting of Swift file types using swift-format '
5896 '(macOS host only).')
5897 parser.add_option(
5898 '--no-swift-format',
5899 dest='use_swift_format',
5900 action='store_false',
5901 help='Disables formatting of Swift file types using swift-format.')
5902
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005903 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005904
Garrett Beaty91a6f332020-01-06 16:57:24 +00005905 if opts.python is not None and opts.no_python:
5906 raise parser.error('Cannot set both --python and --no-python')
5907 if opts.no_python:
5908 opts.python = False
5909
Daniel Chengc55eecf2016-12-30 03:11:02 -08005910 # Normalize any remaining args against the current path, so paths relative to
5911 # the current directory are still resolved as expected.
5912 args = [os.path.join(os.getcwd(), arg) for arg in args]
5913
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005914 # git diff generates paths against the root of the repository. Change
5915 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005916 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005917 if rel_base_path:
5918 os.chdir(rel_base_path)
5919
digit@chromium.org29e47272013-05-17 17:01:46 +00005920 # Grab the merge-base commit, i.e. the upstream commit of the current
5921 # branch when it was created or the last time it was rebased. This is
5922 # to cover the case where the user may have called "git fetch origin",
5923 # moving the origin branch to a newer commit, but hasn't rebased yet.
5924 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005925 upstream_branch = opts.upstream
5926 if not upstream_branch:
5927 cl = Changelist()
5928 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005929 if upstream_branch:
5930 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5931 upstream_commit = upstream_commit.strip()
5932
5933 if not upstream_commit:
5934 DieWithError('Could not find base commit for this branch. '
5935 'Are you in detached state?')
5936
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005937 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5938 diff_output = RunGit(changed_files_cmd)
5939 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005940 # Filter out files deleted by this CL
5941 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005942
Andreas Haas417d89c2020-02-06 10:24:27 +00005943 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005944 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005945
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005946 clang_diff_files = []
5947 if opts.clang_format:
5948 clang_diff_files = [
5949 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5950 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005951 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005952 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005953 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005954 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005955
Edward Lesmes50da7702020-03-30 19:23:43 +00005956 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005957
Jamie Madill5e96ad12020-01-13 16:08:35 +00005958 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5959 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005960
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005961 if opts.use_rust_fmt:
5962 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5963 upstream_commit)
5964 if rust_fmt_return_value == 2:
5965 return_value = 2
5966
Olivier Robin0a6b5442022-04-07 07:25:04 +00005967 if opts.use_swift_format:
5968 if sys.platform != 'darwin':
5969 DieWithError('swift-format is only supported on macOS.')
5970 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5971 upstream_commit)
5972 if swift_format_return_value == 2:
5973 return_value = 2
5974
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005975 # Similar code to above, but using yapf on .py files rather than clang-format
5976 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005977 py_explicitly_disabled = opts.python is not None and not opts.python
5978 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005979 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5980 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005981
Aiden Bennerc08566e2018-10-03 17:52:42 +00005982 # Used for caching.
5983 yapf_configs = {}
5984 for f in python_diff_files:
5985 # Find the yapf style config for the current file, defaults to depot
5986 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005987 _FindYapfConfigFile(f, yapf_configs, top_dir)
5988
5989 # Turn on python formatting by default if a yapf config is specified.
5990 # This breaks in the case of this repo though since the specified
5991 # style file is also the global default.
5992 if opts.python is None:
5993 filtered_py_files = []
5994 for f in python_diff_files:
5995 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5996 filtered_py_files.append(f)
5997 else:
5998 filtered_py_files = python_diff_files
5999
6000 # Note: yapf still seems to fix indentation of the entire file
6001 # even if line ranges are specified.
6002 # See https://github.com/google/yapf/issues/499
6003 if not opts.full and filtered_py_files:
6004 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6005
Brian Sheedyb4307d52019-12-02 19:18:17 +00006006 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6007 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6008 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006009
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006010 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006011 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6012 # Default to pep8 if not .style.yapf is found.
6013 if not yapf_style:
6014 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006015
Peter Wend9399922020-06-17 17:33:49 +00006016 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006017 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006018 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006019 else:
6020 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006021
6022 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006023
6024 has_formattable_lines = False
6025 if not opts.full:
6026 # Only run yapf over changed line ranges.
6027 for diff_start, diff_len in py_line_diffs[f]:
6028 diff_end = diff_start + diff_len - 1
6029 # Yapf errors out if diff_end < diff_start but this
6030 # is a valid line range diff for a removal.
6031 if diff_end >= diff_start:
6032 has_formattable_lines = True
6033 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6034 # If all line diffs were removals we have nothing to format.
6035 if not has_formattable_lines:
6036 continue
6037
6038 if opts.diff or opts.dry_run:
6039 cmd += ['--diff']
6040 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006041 stdout = RunCommand(cmd,
6042 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006043 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006044 cwd=top_dir,
6045 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006046 if opts.diff:
6047 sys.stdout.write(stdout)
6048 elif len(stdout) > 0:
6049 return_value = 2
6050 else:
6051 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006052 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006053
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006054 # Format GN build files. Always run on full build files for canonical form.
6055 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006056 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006057 if opts.dry_run or opts.diff:
6058 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006059 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006060 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006061 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006062 cwd=top_dir)
6063 if opts.dry_run and gn_ret == 2:
6064 return_value = 2 # Not formatted.
6065 elif opts.diff and gn_ret == 2:
6066 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006067 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006068 elif gn_ret != 0:
6069 # For non-dry run cases (and non-2 return values for dry-run), a
6070 # nonzero error code indicates a failure, probably because the file
6071 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006072 DieWithError('gn format failed on ' + gn_diff_file +
6073 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006074
Ilya Shermane081cbe2017-08-15 17:51:04 -07006075 # Skip the metrics formatting from the global presubmit hook. These files have
6076 # a separate presubmit hook that issues an error if the files need formatting,
6077 # whereas the top-level presubmit script merely issues a warning. Formatting
6078 # these files is somewhat slow, so it's important not to duplicate the work.
6079 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006080 for diff_xml in GetDiffXMLs(diff_files):
6081 xml_dir = GetMetricsDir(diff_xml)
6082 if not xml_dir:
6083 continue
6084
Ilya Shermane081cbe2017-08-15 17:51:04 -07006085 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006086 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006087 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006088
6089 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6090 # command as histograms/pretty_print.py now needs a relative path argument
6091 # after splitting the histograms into multiple directories.
6092 # For example, in tools/metrics/ukm, pretty-print could be run using:
6093 # $ python pretty_print.py
6094 # But in tools/metrics/histogrmas, pretty-print should be run with an
6095 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006096 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006097 # $ python pretty_print.py enums.xml
6098
Weilun Shib92c4b72020-08-27 17:45:11 +00006099 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006100 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006101 cmd.append(diff_xml)
6102
Ilya Shermane081cbe2017-08-15 17:51:04 -07006103 if opts.dry_run or opts.diff:
6104 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006105
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006106 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6107 # `shell` param and instead replace `'vpython'` with
6108 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006109 stdout = RunCommand(cmd,
6110 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006111 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006112 if opts.diff:
6113 sys.stdout.write(stdout)
6114 if opts.dry_run and stdout:
6115 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006116
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006117 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006118
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006119
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006120def GetDiffXMLs(diff_files):
6121 return [
6122 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6123 ]
6124
6125
6126def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006127 metrics_xml_dirs = [
6128 os.path.join('tools', 'metrics', 'actions'),
6129 os.path.join('tools', 'metrics', 'histograms'),
6130 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006131 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006132 os.path.join('tools', 'metrics', 'ukm'),
6133 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006134 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006135 if diff_xml.startswith(xml_dir):
6136 return xml_dir
6137 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006138
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006139
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006140@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006141@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006142def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006143 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006144 _, args = parser.parse_args(args)
6145
6146 if len(args) != 1:
6147 parser.print_help()
6148 return 1
6149
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006150 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006151 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006152 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006153
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006154 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006155
Edward Lemur52969c92020-02-06 18:15:28 +00006156 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006157 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006158 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006159
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006160 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006161 for key, issue in [x.split() for x in output.splitlines()]:
6162 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006163 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006164
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006165 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006166 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006167 return 1
6168 if len(branches) == 1:
6169 RunGit(['checkout', branches[0]])
6170 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006171 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006172 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006173 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006174 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006175 try:
6176 RunGit(['checkout', branches[int(which)]])
6177 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006178 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006179 return 1
6180
6181 return 0
6182
6183
maruel@chromium.org29404b52014-09-08 22:58:00 +00006184def CMDlol(parser, args):
6185 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006186 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006187 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6188 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6189 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006190 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006191 return 0
6192
6193
Josip Sokcevic0399e172022-03-21 23:11:51 +00006194def CMDversion(parser, args):
Josip Sokcevic0399e172022-03-21 23:11:51 +00006195 print(utils.depot_tools_version())
6196
6197
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006198class OptionParser(optparse.OptionParser):
6199 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006200
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006201 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006202 optparse.OptionParser.__init__(
6203 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006204 self.add_option(
6205 '-v', '--verbose', action='count', default=0,
6206 help='Use 2 times for more debugging info')
6207
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006208 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006209 try:
6210 return self._parse_args(args)
6211 finally:
6212 # Regardless of success or failure of args parsing, we want to report
6213 # metrics, but only after logging has been initialized (if parsing
6214 # succeeded).
6215 global settings
6216 settings = Settings()
6217
Edward Lesmes9c349062021-05-06 20:02:39 +00006218 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006219 # GetViewVCUrl ultimately calls logging method.
6220 project_url = settings.GetViewVCUrl().strip('/+')
6221 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6222 metrics.collector.add('project_urls', [project_url])
6223
6224 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006225 # Create an optparse.Values object that will store only the actual passed
6226 # options, without the defaults.
6227 actual_options = optparse.Values()
6228 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6229 # Create an optparse.Values object with the default options.
6230 options = optparse.Values(self.get_default_values().__dict__)
6231 # Update it with the options passed by the user.
6232 options._update_careful(actual_options.__dict__)
6233 # Store the options passed by the user in an _actual_options attribute.
6234 # We store only the keys, and not the values, since the values can contain
6235 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006236 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006237
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006238 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006239 logging.basicConfig(
6240 level=levels[min(options.verbose, len(levels) - 1)],
6241 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6242 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006243
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006244 return options, args
6245
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006246
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006247def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006248 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006249 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006250 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006251 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006252
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006253 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006254 dispatcher = subcommand.CommandDispatcher(__name__)
6255 try:
6256 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006257 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006258 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006259 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006260 if e.code != 500:
6261 raise
6262 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006263 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006264 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006265 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006266
6267
6268if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006269 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6270 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006271 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006272 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006273 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006274 sys.exit(main(sys.argv[1:]))