blob: a4c6e33f0c747a48af77aeb9771a4160e8f6822f [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
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
maruel@chromium.org2a74d372011-03-29 19:05:50 +000050import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000055import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
Edward Lemur79d4f992019-11-11 23:49:02 +000058from third_party import six
59from six.moves import urllib
60
61
62if sys.version_info.major == 3:
63 basestring = (str,) # pylint: disable=redefined-builtin
64
Edward Lemurb9830242019-10-30 22:19:20 +000065
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
Edward Lemur0f58ae42019-04-30 17:24:12 +000068# Traces for git push will be stored in a traces directory inside the
69# depot_tools checkout.
70DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
71TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000072PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000073
74# When collecting traces, Git hashes will be reduced to 6 characters to reduce
75# the size after compression.
76GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
77# Used to redact the cookies from the gitcookies file.
78GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
79
Edward Lemurd4d1ba42019-09-20 21:46:37 +000080MAX_ATTEMPTS = 3
81
Edward Lemur1b52d872019-05-09 21:12:12 +000082# The maximum number of traces we will keep. Multiplied by 3 since we store
83# 3 files per trace.
84MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000085# Message to be displayed to the user to inform where to find the traces for a
86# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000087TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000088'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000090' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000091'Copies of your gitcookies file and git config have been recorded at:\n'
92' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000093# Format of the message to be stored as part of the traces to give developers a
94# better context when they go through traces.
95TRACES_README_FORMAT = (
96'Date: %(now)s\n'
97'\n'
98'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
99'Title: %(title)s\n'
100'\n'
101'%(description)s\n'
102'\n'
103'Execution time: %(execution_time)s\n'
104'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000105
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800106POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000107DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000108REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000109 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
110 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000111}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000113DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
114DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
115
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000116DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
117
thestig@chromium.org44202a22014-03-11 19:22:18 +0000118# Valid extensions for files we want to lint.
119DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
120DEFAULT_LINT_IGNORE_REGEX = r"$^"
121
Aiden Bennerc08566e2018-10-03 17:52:42 +0000122# File name for yapf style config files.
123YAPF_CONFIG_FILENAME = '.style.yapf'
124
Edward Lesmes50da7702020-03-30 19:23:43 +0000125# The issue, patchset and codereview server are stored on git config for each
126# branch under branch.<branch-name>.<config-key>.
127ISSUE_CONFIG_KEY = 'gerritissue'
128PATCHSET_CONFIG_KEY = 'gerritpatchset'
129CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000130# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
131# you make to Gerrit. Instead, it creates a new commit object that contains all
132# changes you've made, diffed against a parent/merge base.
133# This is the hash of the new squashed commit and you can find this on Gerrit.
134GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
135# This is the latest uploaded local commit hash.
136LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000137
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000138# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000139Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000140
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000141# Initialized in main()
142settings = None
143
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100144# Used by tests/git_cl_test.py to add extra logging.
145# Inside the weirdly failing test, add this:
146# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700147# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100148_IS_BEING_TESTED = False
149
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000150_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000151
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000152_KNOWN_GERRIT_TO_SHORT_URLS = {
153 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
154 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
155}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000156assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
157 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000158
159
Joanna Wang18de1f62023-01-21 01:24:24 +0000160# Maximum number of branches in a stack that can be traversed and uploaded
161# at once. Picked arbitrarily.
162_MAX_STACKED_BRANCHES_UPLOAD = 20
163
164
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000165class GitPushError(Exception):
166 pass
167
168
Christopher Lamf732cd52017-01-24 12:40:11 +1100169def DieWithError(message, change_desc=None):
170 if change_desc:
171 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000172 print('\n ** Content of CL description **\n' +
173 '='*72 + '\n' +
174 change_desc.description + '\n' +
175 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100176
vapiera7fbd5a2016-06-16 09:17:49 -0700177 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000178 sys.exit(1)
179
180
Christopher Lamf732cd52017-01-24 12:40:11 +1100181def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000182 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000183 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000184 with open(backup_path, 'wb') as backup_file:
185 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100186
187
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000188def GetNoGitPagerEnv():
189 env = os.environ.copy()
190 # 'cat' is a magical git string that disables pagers on all platforms.
191 env['GIT_PAGER'] = 'cat'
192 return env
193
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000194
bsep@chromium.org627d9002016-04-29 00:00:52 +0000195def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000196 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000197 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
198 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000199 except subprocess2.CalledProcessError as e:
200 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000201 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000202 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
203 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000204 out = e.stdout.decode('utf-8', 'replace')
205 if e.stderr:
206 out += e.stderr.decode('utf-8', 'replace')
207 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000208
209
210def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000211 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000212 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000213
214
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000215def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000216 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700217 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000218 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700219 else:
220 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000221 try:
tandrii5d48c322016-08-18 16:19:37 -0700222 (out, _), code = subprocess2.communicate(['git'] + args,
223 env=GetNoGitPagerEnv(),
224 stdout=subprocess2.PIPE,
225 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000226 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700227 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900228 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000229 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000230
231
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000232def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000233 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000234 return RunGitWithCode(args, suppress_stderr=True)[1]
235
236
tandrii2a16b952016-10-19 07:09:44 -0700237def time_sleep(seconds):
238 # Use this so that it can be mocked in tests without interfering with python
239 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700240 return time.sleep(seconds)
241
242
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000243def time_time():
244 # Use this so that it can be mocked in tests without interfering with python
245 # system machinery.
246 return time.time()
247
248
Edward Lemur1b52d872019-05-09 21:12:12 +0000249def datetime_now():
250 # Use this so that it can be mocked in tests without interfering with python
251 # system machinery.
252 return datetime.datetime.now()
253
254
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100255def confirm_or_exit(prefix='', action='confirm'):
256 """Asks user to press enter to continue or press Ctrl+C to abort."""
257 if not prefix or prefix.endswith('\n'):
258 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100259 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100260 mid = ' Press'
261 elif prefix.endswith(' '):
262 mid = 'press'
263 else:
264 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000265 gclient_utils.AskForData(
266 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100267
268
269def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000270 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000271 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100272 while True:
273 if 'yes'.startswith(result):
274 return True
275 if 'no'.startswith(result):
276 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000277 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100278
279
machenbach@chromium.org45453142015-09-15 08:45:22 +0000280def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000281 prop_list = getattr(options, 'properties', [])
282 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000283 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000284 try:
285 properties[key] = json.loads(val)
286 except ValueError:
287 pass # If a value couldn't be evaluated, treat it as a string.
288 return properties
289
290
Edward Lemur4c707a22019-09-24 21:13:43 +0000291def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000292 """Calls a buildbucket v2 method and returns the parsed json response."""
293 headers = {
294 'Accept': 'application/json',
295 'Content-Type': 'application/json',
296 }
297 request = json.dumps(request)
298 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
299
300 logging.info('POST %s with %s' % (url, request))
301
302 attempts = 1
303 time_to_sleep = 1
304 while True:
305 response, content = http.request(url, 'POST', body=request, headers=headers)
306 if response.status == 200:
307 return json.loads(content[4:])
308 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
309 msg = '%s error when calling POST %s with %s: %s' % (
310 response.status, url, request, content)
311 raise BuildbucketResponseException(msg)
312 logging.debug(
313 '%s error when calling POST %s with %s. '
314 'Sleeping for %d seconds and retrying...' % (
315 response.status, url, request, time_to_sleep))
316 time.sleep(time_to_sleep)
317 time_to_sleep *= 2
318 attempts += 1
319
320 assert False, 'unreachable'
321
322
Edward Lemur6215c792019-10-03 21:59:05 +0000323def _parse_bucket(raw_bucket):
324 legacy = True
325 project = bucket = None
326 if '/' in raw_bucket:
327 legacy = False
328 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000329 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000330 elif raw_bucket.startswith('luci.'):
331 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000332 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000333 elif '.' in raw_bucket:
334 project = raw_bucket.split('.')[0]
335 bucket = raw_bucket
336 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000337 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000338 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
339 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000340
341
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000342def _canonical_git_googlesource_host(host):
343 """Normalizes Gerrit hosts (with '-review') to Git host."""
344 assert host.endswith(_GOOGLESOURCE)
345 # Prefix doesn't include '.' at the end.
346 prefix = host[:-(1 + len(_GOOGLESOURCE))]
347 if prefix.endswith('-review'):
348 prefix = prefix[:-len('-review')]
349 return prefix + '.' + _GOOGLESOURCE
350
351
352def _canonical_gerrit_googlesource_host(host):
353 git_host = _canonical_git_googlesource_host(host)
354 prefix = git_host.split('.', 1)[0]
355 return prefix + '-review.' + _GOOGLESOURCE
356
357
358def _get_counterpart_host(host):
359 assert host.endswith(_GOOGLESOURCE)
360 git = _canonical_git_googlesource_host(host)
361 gerrit = _canonical_gerrit_googlesource_host(git)
362 return git if gerrit == host else gerrit
363
364
Quinten Yearsley777660f2020-03-04 23:37:06 +0000365def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000366 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700367
368 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000369 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000370 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700371 options: Command-line options.
372 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000374 for project, bucket, builder in jobs:
375 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000376 print('To see results here, run: git cl try-results')
377 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700378
Quinten Yearsley777660f2020-03-04 23:37:06 +0000379 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000380 if not requests:
381 return
382
Edward Lemur5b929a42019-10-21 17:57:39 +0000383 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000384 http.force_exception_to_status_code = True
385
386 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000387 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
388 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000389
390 errors = [
391 ' ' + response['error']['message']
392 for response in batch_response.get('responses', [])
393 if 'error' in response
394 ]
395 if errors:
396 raise BuildbucketResponseException(
397 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
398
399
Quinten Yearsley777660f2020-03-04 23:37:06 +0000400def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000401 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000402 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000403 shared_properties = {
404 'category': options.ensure_value('category', 'git_cl_try')
405 }
406 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000407 shared_properties['clobber'] = True
408 shared_properties.update(_get_properties_from_options(options) or {})
409
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000410 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000411 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000412 shared_tags.append({'key': 'retry_failed',
413 'value': '1'})
414
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000415 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000416 for (project, bucket, builder) in jobs:
417 properties = shared_properties.copy()
418 if 'presubmit' in builder.lower():
419 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000420
Edward Lemur45768512020-03-02 19:03:14 +0000421 requests.append({
422 'scheduleBuild': {
423 'requestId': str(uuid.uuid4()),
424 'builder': {
425 'project': getattr(options, 'project', None) or project,
426 'bucket': bucket,
427 'builder': builder,
428 },
429 'gerritChanges': gerrit_changes,
430 'properties': properties,
431 'tags': [
432 {'key': 'builder', 'value': builder},
433 ] + shared_tags,
434 }
435 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000436
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000437 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000438 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000439 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000440 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000441 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000442 'id': options.revision,
443 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000444 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000445
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000446 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000447
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000448
Quinten Yearsley777660f2020-03-04 23:37:06 +0000449def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000450 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000451
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000452 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000453 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000454 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000455 request = {
456 'predicate': {
457 'gerritChanges': [changelist.GetGerritChange(patchset)],
458 },
459 'fields': ','.join('builds.*.' + field for field in fields),
460 }
tandrii221ab252016-10-06 08:12:04 -0700461
Edward Lemur5b929a42019-10-21 17:57:39 +0000462 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000463 if authenticator.has_cached_credentials():
464 http = authenticator.authorize(httplib2.Http())
465 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700466 print('Warning: Some results might be missing because %s' %
467 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000468 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000469 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000470 http.force_exception_to_status_code = True
471
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000472 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
473 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000474
Edward Lemur45768512020-03-02 19:03:14 +0000475
Edward Lemur5b929a42019-10-21 17:57:39 +0000476def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000477 """Fetches builds from the latest patchset that has builds (within
478 the last few patchsets).
479
480 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000481 changelist (Changelist): The CL to fetch builds for
482 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000483 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
484 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000485 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000486 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
487 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000488 """
489 assert buildbucket_host
490 assert changelist.GetIssue(), 'CL must be uploaded first'
491 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000492 if latest_patchset is None:
493 assert changelist.GetMostRecentPatchset()
494 ps = changelist.GetMostRecentPatchset()
495 else:
496 assert latest_patchset > 0, latest_patchset
497 ps = latest_patchset
498
Quinten Yearsley983111f2019-09-26 17:18:48 +0000499 min_ps = max(1, ps - 5)
500 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000501 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000502 if len(builds):
503 return builds, ps
504 ps -= 1
505 return [], 0
506
507
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000508def _filter_failed_for_retry(all_builds):
509 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000510
511 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000512 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000513 i.e. a list of buildbucket.v2.Builds which includes status and builder
514 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515
516 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000517 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000518 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000519 """
Edward Lemur45768512020-03-02 19:03:14 +0000520 grouped = {}
521 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000522 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000523 key = (builder['project'], builder['bucket'], builder['builder'])
524 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000525
Edward Lemur45768512020-03-02 19:03:14 +0000526 jobs = []
527 for (project, bucket, builder), builds in grouped.items():
528 if 'triggered' in builder:
529 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
530 'from a parent. Please schedule a manual job for the parent '
531 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000532 continue
533 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
534 # Don't retry if any are running.
535 continue
Edward Lemur45768512020-03-02 19:03:14 +0000536 # If builder had several builds, retry only if the last one failed.
537 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
538 # build, but in case of retrying failed jobs retrying a flaky one makes
539 # sense.
540 builds = sorted(builds, key=lambda b: b['createTime'])
541 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
542 continue
543 # Don't retry experimental build previously triggered by CQ.
544 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
545 for t in builds[-1]['tags']):
546 continue
547 jobs.append((project, bucket, builder))
548
549 # Sort the jobs to make testing easier.
550 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000551
552
Quinten Yearsley777660f2020-03-04 23:37:06 +0000553def _print_tryjobs(options, builds):
554 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000555 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000556 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557 return
558
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000559 longest_builder = max(len(b['builder']['builder']) for b in builds)
560 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000561 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000562 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
563 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000565 builds_by_status = {}
566 for b in builds:
567 builds_by_status.setdefault(b['status'], []).append({
568 'id': b['id'],
569 'name': name_fmt.format(
570 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
571 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000572
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000573 sort_key = lambda b: (b['name'], b['id'])
574
575 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000576 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000577 if not builds:
578 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000580 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000581 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000582 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000583 else:
584 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
585
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000586 print(colorize(title))
587 for b in sorted(builds, key=sort_key):
588 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000589
590 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000591 print_builds(
592 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
593 print_builds(
594 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
595 color=Fore.MAGENTA)
596 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
597 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
598 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000599 print_builds('Started:', builds_by_status.pop('STARTED', []),
600 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000601 print_builds(
602 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000603 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000604 print_builds(
605 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000606 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000607
608
Aiden Bennerc08566e2018-10-03 17:52:42 +0000609def _ComputeDiffLineRanges(files, upstream_commit):
610 """Gets the changed line ranges for each file since upstream_commit.
611
612 Parses a git diff on provided files and returns a dict that maps a file name
613 to an ordered list of range tuples in the form (start_line, count).
614 Ranges are in the same format as a git diff.
615 """
616 # If files is empty then diff_output will be a full diff.
617 if len(files) == 0:
618 return {}
619
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000620 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000621 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000622 diff_output = RunGit(diff_cmd)
623
624 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
625 # 2 capture groups
626 # 0 == fname of diff file
627 # 1 == 'diff_start,diff_count' or 'diff_start'
628 # will match each of
629 # diff --git a/foo.foo b/foo.py
630 # @@ -12,2 +14,3 @@
631 # @@ -12,2 +17 @@
632 # running re.findall on the above string with pattern will give
633 # [('foo.py', ''), ('', '14,3'), ('', '17')]
634
635 curr_file = None
636 line_diffs = {}
637 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
638 if match[0] != '':
639 # Will match the second filename in diff --git a/a.py b/b.py.
640 curr_file = match[0]
641 line_diffs[curr_file] = []
642 else:
643 # Matches +14,3
644 if ',' in match[1]:
645 diff_start, diff_count = match[1].split(',')
646 else:
647 # Single line changes are of the form +12 instead of +12,1.
648 diff_start = match[1]
649 diff_count = 1
650
651 diff_start = int(diff_start)
652 diff_count = int(diff_count)
653
654 # If diff_count == 0 this is a removal we can ignore.
655 line_diffs[curr_file].append((diff_start, diff_count))
656
657 return line_diffs
658
659
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000660def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000661 """Checks if a yapf file is in any parent directory of fpath until top_dir.
662
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000663 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000664 is found returns None. Uses yapf_config_cache as a cache for previously found
665 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000666 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000667 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000668 # Return result if we've already computed it.
669 if fpath in yapf_config_cache:
670 return yapf_config_cache[fpath]
671
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000672 parent_dir = os.path.dirname(fpath)
673 if os.path.isfile(fpath):
674 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000675 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000676 # Otherwise fpath is a directory
677 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
678 if os.path.isfile(yapf_file):
679 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000680 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000681 # If we're at the top level directory, or if we're at root
682 # there is no provided style.
683 ret = None
684 else:
685 # Otherwise recurse on the current directory.
686 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000687 yapf_config_cache[fpath] = ret
688 return ret
689
690
Brian Sheedyb4307d52019-12-02 19:18:17 +0000691def _GetYapfIgnorePatterns(top_dir):
692 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000693
694 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
695 but this functionality appears to break when explicitly passing files to
696 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000697 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000698 the .yapfignore file should be in the directory that yapf is invoked from,
699 which we assume to be the top level directory in this case.
700
701 Args:
702 top_dir: The top level directory for the repository being formatted.
703
704 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000705 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000706 """
707 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000708 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000709 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000710 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000711
Anthony Politoc64e3902021-04-30 21:55:25 +0000712 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
713 stripped_line = line.strip()
714 # Comments and blank lines should be ignored.
715 if stripped_line.startswith('#') or stripped_line == '':
716 continue
717 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000718 return ignore_patterns
719
720
721def _FilterYapfIgnoredFiles(filepaths, patterns):
722 """Filters out any filepaths that match any of the given patterns.
723
724 Args:
725 filepaths: An iterable of strings containing filepaths to filter.
726 patterns: An iterable of strings containing fnmatch patterns to filter on.
727
728 Returns:
729 A list of strings containing all the elements of |filepaths| that did not
730 match any of the patterns in |patterns|.
731 """
732 # Not inlined so that tests can use the same implementation.
733 return [f for f in filepaths
734 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000735
736
Aaron Gable13101a62018-02-09 13:20:41 -0800737def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000738 """Prints statistics about the change to the user."""
739 # --no-ext-diff is broken in some versions of Git, so try to work around
740 # this by overriding the environment (but there is still a problem if the
741 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000742 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000743 if 'GIT_EXTERNAL_DIFF' in env:
744 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000745
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000746 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800747 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000748 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000749
750
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000751class BuildbucketResponseException(Exception):
752 pass
753
754
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000755class Settings(object):
756 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000757 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000758 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000759 self.tree_status_url = None
760 self.viewvc_url = None
761 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000762 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000763 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000764 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000765 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000766 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000767 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768
Edward Lemur26964072020-02-19 19:18:51 +0000769 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000770 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000771 if self.updated:
772 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000773
Edward Lemur26964072020-02-19 19:18:51 +0000774 # The only value that actually changes the behavior is
775 # autoupdate = "false". Everything else means "true".
776 autoupdate = (
777 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
778
779 cr_settings_file = FindCodereviewSettingsFile()
780 if autoupdate != 'false' and cr_settings_file:
781 LoadCodereviewSettingsFromFile(cr_settings_file)
782 cr_settings_file.close()
783
784 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000785
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000786 @staticmethod
787 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000788 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000789
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000790 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000791 if self.root is None:
792 self.root = os.path.abspath(self.GetRelativeRoot())
793 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000794
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795 def GetTreeStatusUrl(self, error_ok=False):
796 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000797 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
798 if self.tree_status_url is None and not error_ok:
799 DieWithError(
800 'You must configure your tree status URL by running '
801 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 return self.tree_status_url
803
804 def GetViewVCUrl(self):
805 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000806 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807 return self.viewvc_url
808
rmistry@google.com90752582014-01-14 21:04:50 +0000809 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000810 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000811
rmistry@google.com5626a922015-02-26 14:03:30 +0000812 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000813 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000814 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000815 return run_post_upload_hook == "True"
816
Joanna Wangc8f23e22023-01-19 21:18:10 +0000817 def GetDefaultCCList(self):
818 return self._GetConfig('rietveld.cc')
819
Dirk Pranke6f0df682021-06-25 00:42:33 +0000820 def GetUsePython3(self):
821 return self._GetConfig('rietveld.use-python3')
822
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000823 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000824 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000825 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000826 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
827 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000828 # Default is squash now (http://crbug.com/611892#c23).
829 self.squash_gerrit_uploads = self._GetConfig(
830 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000831 return self.squash_gerrit_uploads
832
Edward Lesmes4de54132020-05-05 19:41:33 +0000833 def GetSquashGerritUploadsOverride(self):
834 """Return True or False if codereview.settings should be overridden.
835
836 Returns None if no override has been defined.
837 """
838 # See also http://crbug.com/611892#c23
839 result = self._GetConfig('gerrit.override-squash-uploads').lower()
840 if result == 'true':
841 return True
842 if result == 'false':
843 return False
844 return None
845
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000846 def GetIsGerrit(self):
847 """Return True if gerrit.host is set."""
848 if self.is_gerrit is None:
849 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
850 return self.is_gerrit
851
tandrii@chromium.org28253532016-04-14 13:46:56 +0000852 def GetGerritSkipEnsureAuthenticated(self):
853 """Return True if EnsureAuthenticated should not be done for Gerrit
854 uploads."""
855 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000856 self.gerrit_skip_ensure_authenticated = self._GetConfig(
857 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000858 return self.gerrit_skip_ensure_authenticated
859
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000860 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000861 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000862 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000863 # Git requires single quotes for paths with spaces. We need to replace
864 # them with double quotes for Windows to treat such paths as a single
865 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000866 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000867 return self.git_editor or None
868
thestig@chromium.org44202a22014-03-11 19:22:18 +0000869 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000870 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000871
872 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000873 return self._GetConfig(
874 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000875
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000876 def GetFormatFullByDefault(self):
877 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000878 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000879 result = (
880 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
881 error_ok=True).strip())
882 self.format_full_by_default = (result == 'true')
883 return self.format_full_by_default
884
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000885 def IsStatusCommitOrderByDate(self):
886 if self.is_status_commit_order_by_date is None:
887 result = (RunGit(['config', '--bool', 'cl.date-order'],
888 error_ok=True).strip())
889 self.is_status_commit_order_by_date = (result == 'true')
890 return self.is_status_commit_order_by_date
891
Edward Lemur26964072020-02-19 19:18:51 +0000892 def _GetConfig(self, key, default=''):
893 self._LazyUpdateIfNeeded()
894 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000895
896
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000897class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000898 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000899 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000900 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000901 DRY_RUN = 'dry_run'
902 COMMIT = 'commit'
903
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000904 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000905
906
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000907class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000908 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000909 self.issue = issue
910 self.patchset = patchset
911 self.hostname = hostname
912
913 @property
914 def valid(self):
915 return self.issue is not None
916
917
Edward Lemurf38bc172019-09-03 21:02:13 +0000918def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000919 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
920 fail_result = _ParsedIssueNumberArgument()
921
Edward Lemur678a6842019-10-03 22:25:05 +0000922 if isinstance(arg, int):
923 return _ParsedIssueNumberArgument(issue=arg)
924 if not isinstance(arg, basestring):
925 return fail_result
926
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000927 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000928 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700929
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000930 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000931 if not url.startswith('http'):
932 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000933 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
934 if url.startswith(short_url):
935 url = gerrit_url + url[len(short_url):]
936 break
937
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000938 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000939 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000940 except ValueError:
941 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200942
Alex Turner30ae6372022-01-04 02:32:52 +0000943 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
944 # URL.
945 if not arg.startswith('http') and '.' not in parsed_url.netloc:
946 return fail_result
947
Edward Lemur678a6842019-10-03 22:25:05 +0000948 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
949 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
950 # Short urls like https://domain/<issue_number> can be used, but don't allow
951 # specifying the patchset (you'd 404), but we allow that here.
952 if parsed_url.path == '/':
953 part = parsed_url.fragment
954 else:
955 part = parsed_url.path
956
957 match = re.match(
958 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
959 if not match:
960 return fail_result
961
962 issue = int(match.group('issue'))
963 patchset = match.group('patchset')
964 return _ParsedIssueNumberArgument(
965 issue=issue,
966 patchset=int(patchset) if patchset else None,
967 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000968
969
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000970def _create_description_from_log(args):
971 """Pulls out the commit log to use as a base for the CL description."""
972 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000973 if len(args) == 1 and args[0] == None:
974 # Handle the case where None is passed as the branch.
975 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000976 if len(args) == 1 and not args[0].endswith('.'):
977 log_args = [args[0] + '..']
978 elif len(args) == 1 and args[0].endswith('...'):
979 log_args = [args[0][:-1]]
980 elif len(args) == 2:
981 log_args = [args[0] + '..' + args[1]]
982 else:
983 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000984 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000985
986
Aaron Gablea45ee112016-11-22 15:14:38 -0800987class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700988 def __init__(self, issue, url):
989 self.issue = issue
990 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800991 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700992
993 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800994 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700995 self.issue, self.url)
996
997
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100998_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000999 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001000 # TODO(tandrii): these two aren't known in Gerrit.
1001 'approval', 'disapproval'])
1002
1003
Joanna Wange8523912023-01-21 02:05:40 +00001004_NewUpload = collections.namedtuple('NewUpload', [
1005 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit',
1006 'change_desc'
1007])
1008
1009
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001010class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001011 """Changelist works with one changelist in local branch.
1012
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001013 Notes:
1014 * Not safe for concurrent multi-{thread,process} use.
1015 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001016 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001017 """
1018
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001019 def __init__(self,
1020 branchref=None,
1021 issue=None,
1022 codereview_host=None,
1023 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024 """Create a new ChangeList instance.
1025
Edward Lemurf38bc172019-09-03 21:02:13 +00001026 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001027 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001028 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001029 global settings
1030 if not settings:
1031 # Happens when git_cl.py is used as a utility library.
1032 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001033
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 self.branchref = branchref
1035 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001036 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001037 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038 else:
1039 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001040 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001042 self.lookedup_issue = False
1043 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001044 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001045 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001046 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001047 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001048 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001049 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001050 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001051
Edward Lemur125d60a2019-09-13 18:25:41 +00001052 # Lazily cached values.
1053 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1054 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001055 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001056 # Map from change number (issue) to its detail cache.
1057 self._detail_cache = {}
1058
1059 if codereview_host is not None:
1060 assert not codereview_host.startswith('https://'), codereview_host
1061 self._gerrit_host = codereview_host
1062 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001063
Edward Lesmese1576912021-02-16 21:53:34 +00001064 @property
1065 def owners_client(self):
1066 if self._owners_client is None:
1067 remote, remote_branch = self.GetRemoteBranch()
1068 branch = GetTargetRef(remote, remote_branch, None)
1069 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001070 host=self.GetGerritHost(),
1071 project=self.GetGerritProject(),
1072 branch=branch)
1073 return self._owners_client
1074
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001075 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001076 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001077
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001078 The return value is a string suitable for passing to git cl with the --cc
1079 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001080 """
1081 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001082 base_cc = settings.GetDefaultCCList()
1083 more_cc = ','.join(self.more_cc)
1084 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001085 return self.cc
1086
Daniel Cheng7227d212017-11-17 08:12:37 -08001087 def ExtendCC(self, more_cc):
1088 """Extends the list of users to cc on this CL based on the changed files."""
1089 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001090
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001091 def GetCommitDate(self):
1092 """Returns the commit date as provided in the constructor"""
1093 return self.commit_date
1094
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001095 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001096 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001097 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001098 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001099 if not branchref:
1100 return None
1101 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001102 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103 return self.branch
1104
1105 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001106 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001107 self.GetBranch() # Poke the lazy loader.
1108 return self.branchref
1109
Edward Lemur85153282020-02-14 22:06:29 +00001110 def _GitGetBranchConfigValue(self, key, default=None):
1111 return scm.GIT.GetBranchConfig(
1112 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001113
Edward Lemur85153282020-02-14 22:06:29 +00001114 def _GitSetBranchConfigValue(self, key, value):
1115 action = 'set %s to %r' % (key, value)
1116 if not value:
1117 action = 'unset %s' % key
1118 assert self.GetBranch(), 'a branch is needed to ' + action
1119 return scm.GIT.SetBranchConfig(
1120 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001121
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001122 @staticmethod
1123 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001124 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001125 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001126 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001127 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1128 settings.GetRoot(), branch)
1129 if not remote or not upstream_branch:
1130 DieWithError(
1131 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001132 'Verify this branch is set up to track another \n'
1133 '(via the --track argument to "git checkout -b ..."). \n'
1134 'or pass complete "git diff"-style arguments if supported, like\n'
1135 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001136
1137 return remote, upstream_branch
1138
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001139 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001140 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001141 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001142 DieWithError('The upstream for the current branch (%s) does not exist '
1143 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001144 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001145 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001146
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 def GetUpstreamBranch(self):
1148 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001149 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001150 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001151 upstream_branch = upstream_branch.replace('refs/heads/',
1152 'refs/remotes/%s/' % remote)
1153 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1154 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001155 self.upstream_branch = upstream_branch
1156 return self.upstream_branch
1157
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001158 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001159 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001160 remote, branch = None, self.GetBranch()
1161 seen_branches = set()
1162 while branch not in seen_branches:
1163 seen_branches.add(branch)
1164 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001165 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001166 if remote != '.' or branch.startswith('refs/remotes'):
1167 break
1168 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001169 remotes = RunGit(['remote'], error_ok=True).split()
1170 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001171 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001172 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001174 logging.warning('Could not determine which remote this change is '
1175 'associated with, so defaulting to "%s".' %
1176 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001177 else:
Gavin Make6a62332020-12-04 21:57:10 +00001178 logging.warning('Could not determine which remote this change is '
1179 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001180 branch = 'HEAD'
1181 if branch.startswith('refs/remotes'):
1182 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001183 elif branch.startswith('refs/branch-heads/'):
1184 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001185 else:
1186 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001187 return self._remote
1188
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001189 def GetRemoteUrl(self):
1190 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1191
1192 Returns None if there is no remote.
1193 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001194 is_cached, value = self._cached_remote_url
1195 if is_cached:
1196 return value
1197
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001198 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001199 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001200
Edward Lemur298f2cf2019-02-22 21:40:39 +00001201 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001202 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001203 if host:
1204 self._cached_remote_url = (True, url)
1205 return url
1206
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001207 # If it cannot be parsed as an url, assume it is a local directory,
1208 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001209 logging.warning('"%s" doesn\'t appear to point to a git host. '
1210 'Interpreting it as a local directory.', url)
1211 if not os.path.isdir(url):
1212 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001213 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1214 'but it doesn\'t exist.',
1215 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001216 return None
1217
1218 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001219 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001220
Edward Lemur79d4f992019-11-11 23:49:02 +00001221 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222 if not host:
1223 logging.error(
1224 'Remote "%(remote)s" for branch "%(branch)s" points to '
1225 '"%(cache_path)s", but it is misconfigured.\n'
1226 '"%(cache_path)s" must be a git repo and must have a remote named '
1227 '"%(remote)s" pointing to the git host.', {
1228 'remote': remote,
1229 'cache_path': cache_path,
1230 'branch': self.GetBranch()})
1231 return None
1232
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001233 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001234 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001235
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001236 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001237 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001238 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001239 if self.GetBranch():
1240 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001241 if self.issue is not None:
1242 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001243 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001244 return self.issue
1245
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001246 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001248 issue = self.GetIssue()
1249 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001250 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001251 server = self.GetCodereviewServer()
1252 if short:
1253 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1254 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255
Dirk Pranke6f0df682021-06-25 00:42:33 +00001256 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001257 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001258
Edward Lemur6c6827c2020-02-06 21:15:18 +00001259 def FetchDescription(self, pretty=False):
1260 assert self.GetIssue(), 'issue is required to query Gerrit'
1261
Edward Lemur9aa1a962020-02-25 00:58:38 +00001262 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001263 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1264 current_rev = data['current_revision']
1265 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001266
1267 if not pretty:
1268 return self.description
1269
1270 # Set width to 72 columns + 2 space indent.
1271 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1272 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1273 lines = self.description.splitlines()
1274 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001275
1276 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001277 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001278 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001279 if self.GetBranch():
1280 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001281 if self.patchset is not None:
1282 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001283 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284 return self.patchset
1285
Edward Lemur9aa1a962020-02-25 00:58:38 +00001286 def GetAuthor(self):
1287 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1288
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001289 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001290 """Set this branch's patchset. If patchset=0, clears the patchset."""
1291 assert self.GetBranch()
1292 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001293 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001294 else:
1295 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001296 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001298 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001299 """Set this branch's issue. If issue isn't given, clears the issue."""
1300 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001302 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001303 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001304 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001305 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001306 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001307 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001308 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309 else:
tandrii5d48c322016-08-18 16:19:37 -07001310 # Reset all of these just to be clean.
1311 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001312 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001313 ISSUE_CONFIG_KEY,
1314 PATCHSET_CONFIG_KEY,
1315 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001316 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001317 ]
tandrii5d48c322016-08-18 16:19:37 -07001318 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001319 try:
1320 self._GitSetBranchConfigValue(prop, None)
1321 except subprocess2.CalledProcessError:
1322 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001323 msg = RunGit(['log', '-1', '--format=%B']).strip()
1324 if msg and git_footers.get_footer_change_id(msg):
1325 print('WARNING: The change patched into this branch has a Change-Id. '
1326 'Removing it.')
1327 RunGit(['commit', '--amend', '-m',
1328 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001329 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001330 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001331 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001332
Joanna Wangb46232e2023-01-21 01:58:46 +00001333 def GetAffectedFiles(self, upstream, end_commit=None):
1334 # type: (str, Optional[str]) -> Sequence[str]
1335 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001336 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001337 return [
1338 f for _, f in scm.GIT.CaptureStatus(
1339 settings.GetRoot(), upstream, end_commit=end_commit)
1340 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001341 except subprocess2.CalledProcessError:
1342 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001343 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001344 'This branch probably doesn\'t exist anymore. To reset the\n'
1345 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001346 ' git branch --set-upstream-to origin/main %s\n'
1347 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001348 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001349
dsansomee2d6fd92016-09-08 00:10:47 -07001350 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001351 assert self.GetIssue(), 'issue is required to update description'
1352
1353 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001354 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001355 if not force:
1356 confirm_or_exit(
1357 'The description cannot be modified while the issue has a pending '
1358 'unpublished edit. Either publish the edit in the Gerrit web UI '
1359 'or delete it.\n\n', action='delete the unpublished edit')
1360
1361 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001362 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001363 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001364 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001365 description, notify='NONE')
1366
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001367 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001368
Edward Lemur75526302020-02-27 22:31:05 +00001369 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001370 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001371 '--root', settings.GetRoot(),
1372 '--upstream', upstream,
1373 ]
1374
1375 args.extend(['--verbose'] * verbose)
1376
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001377 remote, remote_branch = self.GetRemoteBranch()
1378 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001379 if settings.GetIsGerrit():
1380 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1381 args.extend(['--gerrit_project', self.GetGerritProject()])
1382 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001383
Edward Lemur99df04e2020-03-05 19:39:43 +00001384 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001385 issue = self.GetIssue()
1386 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001387 if author:
1388 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001389 if issue:
1390 args.extend(['--issue', str(issue)])
1391 if patchset:
1392 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001393
Edward Lemur75526302020-02-27 22:31:05 +00001394 return args
1395
Josip Sokcevic017544d2022-03-31 23:47:53 +00001396 def RunHook(self,
1397 committing,
1398 may_prompt,
1399 verbose,
1400 parallel,
1401 upstream,
1402 description,
1403 all_files,
1404 files=None,
1405 resultdb=False,
1406 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001407 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1408 args = self._GetCommonPresubmitArgs(verbose, upstream)
1409 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001410 if may_prompt:
1411 args.append('--may_prompt')
1412 if parallel:
1413 args.append('--parallel')
1414 if all_files:
1415 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001416 if files:
1417 args.extend(files.split(';'))
1418 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001419 if files or all_files:
1420 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001421
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001422 if resultdb and not realm:
1423 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1424 # it is not required to pass the realm flag
1425 print('Note: ResultDB reporting will NOT be performed because --realm'
1426 ' was not specified. To enable ResultDB, please run the command'
1427 ' again with the --realm argument to specify the LUCI realm.')
1428
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001429 py3_results = self._RunPresubmit(args,
1430 description,
1431 use_python3=True,
1432 resultdb=resultdb,
1433 realm=realm)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001434 if py3_results.get('skipped_presubmits', 1) == 0:
1435 print('No more presubmits to run - skipping Python 2 presubmits.')
1436 return py3_results
1437
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001438 py2_results = self._RunPresubmit(args,
1439 description,
1440 use_python3=False,
1441 resultdb=resultdb,
1442 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001443 return self._MergePresubmitResults(py2_results, py3_results)
1444
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001445 def _RunPresubmit(self,
1446 args,
1447 description,
1448 use_python3,
1449 resultdb=None,
1450 realm=None):
1451 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1452 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001453 args = args[:]
1454 vpython = 'vpython3' if use_python3 else 'vpython'
1455
Edward Lemur227d5102020-02-25 23:45:35 +00001456 with gclient_utils.temporary_file() as description_file:
1457 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001458 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001459 args.extend(['--json_output', json_output])
1460 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001461 if self.GetUsePython3():
1462 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001463 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001464 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001465 if resultdb and realm:
1466 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001467
1468 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001469 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001470
Edward Lemur227d5102020-02-25 23:45:35 +00001471 metrics.collector.add_repeated('sub_commands', {
1472 'command': 'presubmit',
1473 'execution_time': time_time() - start,
1474 'exit_code': exit_code,
1475 })
1476
1477 if exit_code:
1478 sys.exit(exit_code)
1479
1480 json_results = gclient_utils.FileRead(json_output)
1481 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001482
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001483 def _MergePresubmitResults(self, py2_results, py3_results):
1484 return {
1485 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1486 py3_results.get('more_cc', []))),
1487 'errors': (
1488 py2_results.get('errors', []) + py3_results.get('errors', [])),
1489 'notifications': (
1490 py2_results.get('notifications', []) +
1491 py3_results.get('notifications', [])),
1492 'warnings': (
1493 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1494 }
1495
Brian Sheedy7326ca22022-11-02 18:36:17 +00001496 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001497 args = self._GetCommonPresubmitArgs(verbose, upstream)
1498 args.append('--post_upload')
1499
1500 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001501 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001502 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001503 if not py3_only:
1504 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001505 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1506 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001507 if not py3_only:
1508 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001509 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001510
Edward Lemur5a644f82020-03-18 16:44:57 +00001511 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001512 # type: (optparse.Values, Sequence[str], Sequence[str]
1513 # ) -> ChangeDescription
1514 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001515 if self.GetIssue():
1516 description = self.FetchDescription()
1517 elif options.message:
1518 description = options.message
1519 else:
1520 description = _create_description_from_log(git_diff_args)
1521 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001522 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001523
Edward Lemur5a644f82020-03-18 16:44:57 +00001524 bug = options.bug
1525 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001526 if not self.GetIssue():
1527 # Extract bug number from branch name, but only if issue is being created.
1528 # It must start with bug or fix, followed by _ or - and number.
1529 # Optionally, it may contain _ or - after number with arbitrary text.
1530 # Examples:
1531 # bug-123
1532 # bug_123
1533 # fix-123
1534 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001535 branch = self.GetBranch()
1536 if branch is not None:
1537 match = re.match(
1538 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1539 if not bug and not fixed and match:
1540 if match.group('type') == 'bug':
1541 bug = match.group('bugnum')
1542 else:
1543 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001544
1545 change_description = ChangeDescription(description, bug, fixed)
1546
Joanna Wang39811b12023-01-20 23:09:48 +00001547 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001548 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001549 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001550 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001551 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001552 missing_files = [
1553 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001554 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001555 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001556 owners = self.owners_client.SuggestOwners(
1557 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001558 assert isinstance(options.reviewers, list), options.reviewers
1559 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001560
Edward Lemur5a644f82020-03-18 16:44:57 +00001561 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001562 if options.reviewers:
1563 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001564
1565 return change_description
1566
Joanna Wanga1abbed2023-01-24 01:41:05 +00001567 def _GetTitleForUpload(self, options, multi_change_upload=False):
1568 # type: (optparse.Values, Optional[bool]) -> str
1569
1570 # Getting titles for multipl commits is not supported so we return the
1571 # default.
1572 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001573 return options.title
1574
1575 # On first upload, patchset title is always this string, while options.title
1576 # gets converted to first line of message.
1577 if not self.GetIssue():
1578 return 'Initial upload'
1579
1580 # When uploading subsequent patchsets, options.message is taken as the title
1581 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001582 if options.message:
1583 return options.message.strip()
1584
1585 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001586 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001587 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001588 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001589 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001590
1591 # Use the default title if the user confirms the default with a 'y'.
1592 if user_title.lower() == 'y':
1593 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001594 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001595
Joanna Wanga1abbed2023-01-24 01:41:05 +00001596 def _GetRefSpecOptions(self, options, change_desc, multi_change_upload=False):
1597 # type: (optparse.Values, Sequence[Changelist], Optional[bool]
1598 # ) -> Sequence[str]
1599
1600 # Extra options that can be specified at push time. Doc:
1601 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1602 refspec_opts = []
1603
1604 # By default, new changes are started in WIP mode, and subsequent patchsets
1605 # don't send email. At any time, passing --send-mail or --send-email will
1606 # mark the change ready and send email for that particular patch.
1607 if options.send_mail:
1608 refspec_opts.append('ready')
1609 refspec_opts.append('notify=ALL')
1610 elif (not self.GetIssue() and options.squash and not multi_change_upload):
1611 refspec_opts.append('wip')
1612 else:
1613 refspec_opts.append('notify=NONE')
1614
1615 # TODO(tandrii): options.message should be posted as a comment if
1616 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1617 # to do it.
1618
1619 # Set options.title in case user was prompted in _GetTitleForUpload and
1620 # _CMDUploadChange needs to be called again.
1621 options.title = self._GetTitleForUpload(
1622 options, multi_change_upload=multi_change_upload)
1623
1624 if options.title:
1625 # Punctuation and whitespace in |title| must be percent-encoded.
1626 refspec_opts.append('m=' +
1627 gerrit_util.PercentEncodeForGitRef(options.title))
1628
1629 if options.private:
1630 refspec_opts.append('private')
1631
1632 if options.topic:
1633 # Documentation on Gerrit topics is here:
1634 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1635 refspec_opts.append('topic=%s' % options.topic)
1636
1637 if options.enable_auto_submit:
1638 refspec_opts.append('l=Auto-Submit+1')
1639 if options.set_bot_commit:
1640 refspec_opts.append('l=Bot-Commit+1')
1641 if options.use_commit_queue:
1642 refspec_opts.append('l=Commit-Queue+2')
1643 elif options.cq_dry_run:
1644 refspec_opts.append('l=Commit-Queue+1')
1645 elif options.cq_quick_run:
1646 refspec_opts.append('l=Commit-Queue+1')
1647 refspec_opts.append('l=Quick-Run+1')
1648
1649 if change_desc.get_reviewers(tbr_only=True):
1650 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1651 self.GetGerritProject())
1652 refspec_opts.append('l=Code-Review+%s' % score)
1653
1654 # Note: hashtags, reviewers, and ccs are handled individually for each
1655 # branch/change.
1656 return refspec_opts
1657
Joanna Wangb88a4342023-01-24 01:28:22 +00001658 def PrepareSquashedCommit(self, options, parent=None, end_commit=None):
1659 # type: (optparse.Values, Optional[str], Optional[str]) -> _NewUpload()
1660 """Create a squashed commit to upload."""
1661 if parent is None:
1662 origin, upstream_branch_ref = self.FetchUpstreamTuple(self.GetBranch())
1663 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
1664 if origin == '.':
1665 # upstream is another local branch.
1666 # Assume we want to upload from upstream's last upload.
1667 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch,
1668 GERRIT_SQUASH_HASH_CONFIG_KEY)
1669 assert parent, ('upstream branch %s not configured correctly. '
1670 'Could not fetch latest gerrit upload from git '
1671 'config.')
1672 else:
1673 # upstream is the root of the tree.
1674 parent = self.GetCommonAncestorWithUpstream()
1675
1676 if end_commit is None:
1677 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1678
1679 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1680 end_commit)
1681 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1682 with gclient_utils.temporary_file() as desc_tempfile:
1683 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1684 commit_to_push = RunGit(
1685 ['commit-tree', latest_tree, '-p', parent, '-F',
1686 desc_tempfile]).strip()
1687
1688 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, change_desc)
1689
Joanna Wange8523912023-01-21 02:05:40 +00001690 def PrepareCherryPickSquashedCommit(self, options):
1691 # type: (optparse.Values) -> _NewUpload()
1692 """Create a commit cherry-picked on parent to push."""
1693
1694 parent = self.GetCommonAncestorWithUpstream()
1695 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1696 self.branchref)
1697
1698 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1699 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1700 with gclient_utils.temporary_file() as desc_tempfile:
1701 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1702 commit_to_cp = RunGit(
1703 ['commit-tree', latest_tree, '-p', parent, '-F',
1704 desc_tempfile]).strip()
1705
1706 _, upstream_branch_ref = self.FetchUpstreamTuple(self.GetBranch())
1707
1708 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
1709 upstream_squashed_upload = scm.GIT.GetBranchConfig(
1710 settings.GetRoot(), upstream_branch, GERRIT_SQUASH_HASH_CONFIG_KEY)
1711
1712 RunGit(['checkout', '-q', upstream_squashed_upload])
1713 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1714 if ret:
1715 RunGit(['cherry-pick', '--abort'])
1716 RunGit(['checkout', '-q', self.branch])
1717 DieWithError('Could not cleanly cherry-pick')
1718
1719 commit_to_push = RunGit(['rev-parse', 'HEAD'])
1720 RunGit(['checkout', '-q', self.branch])
1721
1722 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
1723 change_desc)
1724
Joanna Wangb46232e2023-01-21 01:58:46 +00001725 def _PrepareChange(self, options, parent, end_commit):
1726 # type: (optparse.Values, str, str) ->
1727 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1728 """Prepares the change to be uploaded."""
1729 self.EnsureCanUploadPatchset(options.force)
1730
1731 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1732 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1733 files)
1734
1735 watchlist = watchlists.Watchlists(settings.GetRoot())
1736 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1737 if not options.bypass_hooks:
1738 hook_results = self.RunHook(committing=False,
1739 may_prompt=not options.force,
1740 verbose=options.verbose,
1741 parallel=options.parallel,
1742 upstream=parent,
1743 description=change_desc.description,
1744 all_files=False)
1745 self.ExtendCC(hook_results['more_cc'])
1746
1747 # Update the change description and ensure we have a Change Id.
1748 if self.GetIssue():
1749 if options.edit_description:
1750 change_desc.prompt()
1751 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1752 change_id = change_detail['change_id']
1753 change_desc.ensure_change_id(change_id)
1754
1755 # TODO(b/265929888): Pull in external changes for the current branch
1756 # only. No clear way to pull in external changes for upstream branches
1757 # yet. Potentially offer a separate command to pull in external changes.
1758 else: # No change issue. First time uploading
1759 if not options.force and not options.message_file:
1760 change_desc.prompt()
1761
1762 # Check if user added a change_id in the descripiton.
1763 change_ids = git_footers.get_footer_change_id(change_desc.description)
1764 if len(change_ids) == 1:
1765 change_id = change_ids[0]
1766 else:
1767 change_id = GenerateGerritChangeId(change_desc.description)
1768 change_desc.ensure_change_id(change_id)
1769
1770 if options.preserve_tryjobs:
1771 change_desc.set_preserve_tryjobs()
1772
1773 SaveDescriptionBackup(change_desc)
1774
1775 # Add ccs
1776 ccs = []
1777 # Add default, watchlist, presubmit ccs if this is an existing change
1778 # and CL is not private and auto-ccing has not been disabled.
1779 if self.GetIssue() and not (options.private and options.no_autocc):
1780 ccs = self.GetCCList().split(',')
1781 if len(ccs) > 100:
1782 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1783 'process/lsc/lsc_workflow.md')
1784 print('WARNING: This will auto-CC %s users.' % len(ccs))
1785 print('LSC may be more appropriate: %s' % lsc)
1786 print('You can also use the --no-autocc flag to disable auto-CC.')
1787 confirm_or_exit(action='continue')
1788
1789 # Add ccs from the --cc flag.
1790 if options.cc:
1791 ccs.extend(options.cc)
1792
1793 ccs = [email.strip() for email in ccs if email.strip()]
1794 if change_desc.get_cced():
1795 ccs.extend(change_desc.get_cced())
1796
1797 return change_desc.get_reviewers(), ccs, change_desc
1798
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001799 def CMDUpload(self, options, git_diff_args, orig_args):
1800 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001801 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001802 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001803 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001804 else:
1805 if self.GetBranch() is None:
1806 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1807
1808 # Default to diffing against common ancestor of upstream branch
1809 base_branch = self.GetCommonAncestorWithUpstream()
1810 git_diff_args = [base_branch, 'HEAD']
1811
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001812 # Fast best-effort checks to abort before running potentially expensive
1813 # hooks if uploading is likely to fail anyway. Passing these checks does
1814 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001815 self.EnsureAuthenticated(force=options.force)
1816 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001817
1818 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001819 watchlist = watchlists.Watchlists(settings.GetRoot())
1820 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001821 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001822 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001823
Edward Lemur5a644f82020-03-18 16:44:57 +00001824 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001825 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001826 hook_results = self.RunHook(committing=False,
1827 may_prompt=not options.force,
1828 verbose=options.verbose,
1829 parallel=options.parallel,
1830 upstream=base_branch,
1831 description=change_desc.description,
1832 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001833 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001834
Aaron Gable13101a62018-02-09 13:20:41 -08001835 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001836 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001837 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001838 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001839 if self.GetBranch() is not None:
1840 self._GitSetBranchConfigValue(
1841 LAST_UPLOAD_HASH_CONFIG_KEY,
1842 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001843 # Run post upload hooks, if specified.
1844 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001845 self.RunPostUploadHook(options.verbose, base_branch,
1846 change_desc.description,
1847 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001848
1849 # Upload all dependencies if specified.
1850 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001851 print()
1852 print('--dependencies has been specified.')
1853 print('All dependent local branches will be re-uploaded.')
1854 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001855 # Remove the dependencies flag from args so that we do not end up in a
1856 # loop.
1857 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001858 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001859 return ret
1860
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001861 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001862 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001863
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001864 Issue must have been already uploaded and known. Optionally allows for
1865 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001866 """
1867 assert new_state in _CQState.ALL_STATES
1868 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001869 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001870 vote_map = {
1871 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001872 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001873 _CQState.DRY_RUN: 1,
1874 _CQState.COMMIT: 2,
1875 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001876 if new_state == _CQState.QUICK_RUN:
1877 labels = {
1878 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1879 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1880 }
1881 else:
1882 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001883 notify = False if new_state == _CQState.DRY_RUN else None
1884 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001885 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001886 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001887 return 0
1888 except KeyboardInterrupt:
1889 raise
1890 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001891 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001892 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001893 ' * Your project has no CQ,\n'
1894 ' * You don\'t have permission to change the CQ state,\n'
1895 ' * There\'s a bug in this code (see stack trace below).\n'
1896 'Consider specifying which bots to trigger manually or asking your '
1897 'project owners for permissions or contacting Chrome Infra at:\n'
1898 'https://www.chromium.org/infra\n\n' %
1899 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001900 # Still raise exception so that stack trace is printed.
1901 raise
1902
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001903 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001904 # Lazy load of configs.
1905 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001906 if self._gerrit_host and '.' not in self._gerrit_host:
1907 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1908 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001909 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001910 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001911 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001912 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001913 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1914 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915 return self._gerrit_host
1916
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001917 def _GetGitHost(self):
1918 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001919 remote_url = self.GetRemoteUrl()
1920 if not remote_url:
1921 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001922 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001923
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001924 def GetCodereviewServer(self):
1925 if not self._gerrit_server:
1926 # If we're on a branch then get the server potentially associated
1927 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001928 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001929 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001930 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001931 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001932 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001933 if not self._gerrit_server:
1934 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1935 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001936 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001937 parts[0] = parts[0] + '-review'
1938 self._gerrit_host = '.'.join(parts)
1939 self._gerrit_server = 'https://%s' % self._gerrit_host
1940 return self._gerrit_server
1941
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001942 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001943 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001944 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001945 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001946 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001947 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001948 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001949 if project.endswith('.git'):
1950 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001951 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1952 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1953 # gitiles/git-over-https protocol. E.g.,
1954 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1955 # as
1956 # https://chromium.googlesource.com/v8/v8
1957 if project.startswith('a/'):
1958 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001959 return project
1960
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001961 def _GerritChangeIdentifier(self):
1962 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1963
1964 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001965 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001966 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001967 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001968 if project:
1969 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1970 # Fall back on still unique, but less efficient change number.
1971 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001972
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001973 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001974 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001975 if settings.GetGerritSkipEnsureAuthenticated():
1976 # For projects with unusual authentication schemes.
1977 # See http://crbug.com/603378.
1978 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001979
1980 # Check presence of cookies only if using cookies-based auth method.
1981 cookie_auth = gerrit_util.Authenticator.get()
1982 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001983 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001984
Florian Mayerae510e82020-01-30 21:04:48 +00001985 remote_url = self.GetRemoteUrl()
1986 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001987 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001988 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001989 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
1990 logging.warning(
1991 'Ignoring branch %(branch)s with non-https/sso remote '
1992 '%(remote)s', {
1993 'branch': self.branch,
1994 'remote': self.GetRemoteUrl()
1995 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001996 return
1997
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001998 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001999 self.GetCodereviewServer()
2000 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002001 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002002
2003 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2004 git_auth = cookie_auth.get_auth_header(git_host)
2005 if gerrit_auth and git_auth:
2006 if gerrit_auth == git_auth:
2007 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002008 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002009 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002010 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002011 ' %s\n'
2012 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002013 ' Consider running the following command:\n'
2014 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002015 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002016 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002017 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002018 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002019 cookie_auth.get_new_password_message(git_host)))
2020 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002021 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002022 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002023
2024 missing = (
2025 ([] if gerrit_auth else [self._gerrit_host]) +
2026 ([] if git_auth else [git_host]))
2027 DieWithError('Credentials for the following hosts are required:\n'
2028 ' %s\n'
2029 'These are read from %s (or legacy %s)\n'
2030 '%s' % (
2031 '\n '.join(missing),
2032 cookie_auth.get_gitcookies_path(),
2033 cookie_auth.get_netrc_path(),
2034 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002035
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002036 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002037 if not self.GetIssue():
2038 return
2039
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002040 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002041 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002042 DieWithError(
2043 'Change %s has been abandoned, new uploads are not allowed' %
2044 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002045 if status == 'MERGED':
2046 answer = gclient_utils.AskForData(
2047 'Change %s has been submitted, new uploads are not allowed. '
2048 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2049 ).lower()
2050 if answer not in ('y', ''):
2051 DieWithError('New uploads are not allowed.')
2052 self.SetIssue()
2053 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002054
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002055 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2056 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2057 # Apparently this check is not very important? Otherwise get_auth_email
2058 # could have been added to other implementations of Authenticator.
2059 cookies_auth = gerrit_util.Authenticator.get()
2060 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002061 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002062
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002063 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002064 if self.GetIssueOwner() == cookies_user:
2065 return
2066 logging.debug('change %s owner is %s, cookies user is %s',
2067 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002068 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002069 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002070 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002071 if details['email'] == self.GetIssueOwner():
2072 return
2073 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002074 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002075 'as %s.\n'
2076 'Uploading may fail due to lack of permissions.' %
2077 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2078 confirm_or_exit(action='upload')
2079
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002080 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002081 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002082 or CQ status, assuming adherence to a common workflow.
2083
2084 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002085 * 'error' - error from review tool (including deleted issues)
2086 * 'unsent' - no reviewers added
2087 * 'waiting' - waiting for review
2088 * 'reply' - waiting for uploader to reply to review
2089 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002090 * 'dry-run' - dry-running in the CQ
2091 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002092 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002093 """
2094 if not self.GetIssue():
2095 return None
2096
2097 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002098 data = self._GetChangeDetail([
2099 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002100 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002101 return 'error'
2102
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002103 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002104 return 'closed'
2105
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002106 cq_label = data['labels'].get('Commit-Queue', {})
2107 max_cq_vote = 0
2108 for vote in cq_label.get('all', []):
2109 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2110 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002111 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002112 if max_cq_vote == 1:
2113 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002114
Aaron Gable9ab38c62017-04-06 14:36:33 -07002115 if data['labels'].get('Code-Review', {}).get('approved'):
2116 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002117
2118 if not data.get('reviewers', {}).get('REVIEWER', []):
2119 return 'unsent'
2120
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002121 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002122 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002123 while messages:
2124 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002125 if (m.get('tag', '').startswith('autogenerated:cq') or
2126 m.get('tag', '').startswith('autogenerated:cv')):
2127 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002128 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002129 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002130 # Most recent message was by owner.
2131 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002132
2133 # Some reply from non-owner.
2134 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002135
2136 # Somehow there are no messages even though there are reviewers.
2137 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002138
Gavin Mak4e5e3992022-11-14 22:40:12 +00002139 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002140 if not self.GetIssue():
2141 return None
2142
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002143 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002144 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002145 if update:
2146 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002147 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002148
Gavin Makf35a9eb2022-11-17 18:34:36 +00002149 def _IsPatchsetRangeSignificant(self, lower, upper):
2150 """Returns True if the inclusive range of patchsets contains any reworks or
2151 rebases."""
2152 if not self.GetIssue():
2153 return False
2154
2155 data = self._GetChangeDetail(['ALL_REVISIONS'])
2156 ps_kind = {}
2157 for rev_info in data.get('revisions', {}).values():
2158 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2159
2160 for ps in range(lower, upper + 1):
2161 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2162 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2163 return True
2164 return False
2165
Gavin Make61ccc52020-11-13 00:12:57 +00002166 def GetMostRecentDryRunPatchset(self):
2167 """Get patchsets equivalent to the most recent patchset and return
2168 the patchset with the latest dry run. If none have been dry run, return
2169 the latest patchset."""
2170 if not self.GetIssue():
2171 return None
2172
2173 data = self._GetChangeDetail(['ALL_REVISIONS'])
2174 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002175 dry_run = {int(m['_revision_number'])
2176 for m in data.get('messages', [])
2177 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002178
2179 for revision_info in sorted(data.get('revisions', {}).values(),
2180 key=lambda c: c['_number'], reverse=True):
2181 if revision_info['_number'] in dry_run:
2182 patchset = revision_info['_number']
2183 break
2184 if revision_info.get('kind', '') not in \
2185 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2186 break
2187 self.SetPatchset(patchset)
2188 return patchset
2189
Aaron Gable636b13f2017-07-14 10:42:48 -07002190 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002191 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002192 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002193 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002194
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002195 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002196 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002197 # CURRENT_REVISION is included to get the latest patchset so that
2198 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002199 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002200 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2201 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002202 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002203 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002204 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002205 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002206
2207 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002208 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002209 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002210 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002211 line_comments = file_comments.setdefault(path, [])
2212 line_comments.extend(
2213 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002214
2215 # Build dictionary of file comments for easy access and sorting later.
2216 # {author+date: {path: {patchset: {line: url+message}}}}
2217 comments = collections.defaultdict(
2218 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002219
2220 server = self.GetCodereviewServer()
2221 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2222 # /c/ is automatically added by short URL server.
2223 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2224 self.GetIssue())
2225 else:
2226 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2227
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002228 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002229 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002230 tag = comment.get('tag', '')
2231 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002232 continue
2233 key = (comment['author']['email'], comment['updated'])
2234 if comment.get('side', 'REVISION') == 'PARENT':
2235 patchset = 'Base'
2236 else:
2237 patchset = 'PS%d' % comment['patch_set']
2238 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002239 url = ('%s/%s/%s#%s%s' %
2240 (url_prefix, comment['patch_set'], path,
2241 'b' if comment.get('side') == 'PARENT' else '',
2242 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002243 comments[key][path][patchset][line] = (url, comment['message'])
2244
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002245 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002246 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002247 summary = self._BuildCommentSummary(msg, comments, readable)
2248 if summary:
2249 summaries.append(summary)
2250 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002251
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002252 @staticmethod
2253 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002254 if 'email' not in msg['author']:
2255 # Some bot accounts may not have an email associated.
2256 return None
2257
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002258 key = (msg['author']['email'], msg['date'])
2259 # Don't bother showing autogenerated messages that don't have associated
2260 # file or line comments. this will filter out most autogenerated
2261 # messages, but will keep robot comments like those from Tricium.
2262 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2263 if is_autogenerated and not comments.get(key):
2264 return None
2265 message = msg['message']
2266 # Gerrit spits out nanoseconds.
2267 assert len(msg['date'].split('.')[-1]) == 9
2268 date = datetime.datetime.strptime(msg['date'][:-3],
2269 '%Y-%m-%d %H:%M:%S.%f')
2270 if key in comments:
2271 message += '\n'
2272 for path, patchsets in sorted(comments.get(key, {}).items()):
2273 if readable:
2274 message += '\n%s' % path
2275 for patchset, lines in sorted(patchsets.items()):
2276 for line, (url, content) in sorted(lines.items()):
2277 if line:
2278 line_str = 'Line %d' % line
2279 path_str = '%s:%d:' % (path, line)
2280 else:
2281 line_str = 'File comment'
2282 path_str = '%s:0:' % path
2283 if readable:
2284 message += '\n %s, %s: %s' % (patchset, line_str, url)
2285 message += '\n %s\n' % content
2286 else:
2287 message += '\n%s ' % path_str
2288 message += '\n%s\n' % content
2289
2290 return _CommentSummary(
2291 date=date,
2292 message=message,
2293 sender=msg['author']['email'],
2294 autogenerated=is_autogenerated,
2295 # These could be inferred from the text messages and correlated with
2296 # Code-Review label maximum, however this is not reliable.
2297 # Leaving as is until the need arises.
2298 approval=False,
2299 disapproval=False,
2300 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002301
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002302 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002303 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002304 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002305
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002306 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002307 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002308 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002309
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002310 def _GetChangeDetail(self, options=None):
2311 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002313 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002314
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002315 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002316 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002317 options.append('CURRENT_COMMIT')
2318
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002319 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002320 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002321 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002322
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002323 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2324 # Assumption: data fetched before with extra options is suitable
2325 # for return for a smaller set of options.
2326 # For example, if we cached data for
2327 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2328 # and request is for options=[CURRENT_REVISION],
2329 # THEN we can return prior cached data.
2330 if options_set.issubset(cached_options_set):
2331 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002332
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002333 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002334 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002335 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002336 except gerrit_util.GerritError as e:
2337 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002338 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002339 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002340
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002341 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002342 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002343
Gavin Mak4e5e3992022-11-14 22:40:12 +00002344 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002345 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002346 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002347 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2348 self._GerritChangeIdentifier(),
2349 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002350 except gerrit_util.GerritError as e:
2351 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002352 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002353 raise
agable32978d92016-11-01 12:55:02 -07002354 return data
2355
Karen Qian40c19422019-03-13 21:28:29 +00002356 def _IsCqConfigured(self):
2357 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002358 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002359
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002360 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002361 if git_common.is_dirty_git_tree('land'):
2362 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002363
tandriid60367b2016-06-22 05:25:12 -07002364 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002365 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002366 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002367 'which can test and land changes for you. '
2368 'Are you sure you wish to bypass it?\n',
2369 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002370 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002371 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002372 # Note: git diff outputs nothing if there is no diff.
2373 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002374 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002375 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002376 if detail['current_revision'] == last_upload:
2377 differs = False
2378 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002379 print('WARNING: Local branch contents differ from latest uploaded '
2380 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002381 if differs:
2382 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002383 confirm_or_exit(
2384 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2385 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002386 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002387 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002388 upstream = self.GetCommonAncestorWithUpstream()
2389 if self.GetIssue():
2390 description = self.FetchDescription()
2391 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002392 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002393 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002394 committing=True,
2395 may_prompt=not force,
2396 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002397 parallel=parallel,
2398 upstream=upstream,
2399 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002400 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002401 resultdb=resultdb,
2402 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002403
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002404 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002405 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002406 links = self._GetChangeCommit().get('web_links', [])
2407 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002408 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002409 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002410 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002411 return 0
2412
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002413 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2414 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002415 assert parsed_issue_arg.valid
2416
Edward Lemur125d60a2019-09-13 18:25:41 +00002417 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002418
2419 if parsed_issue_arg.hostname:
2420 self._gerrit_host = parsed_issue_arg.hostname
2421 self._gerrit_server = 'https://%s' % self._gerrit_host
2422
tandriic2405f52016-10-10 08:13:15 -07002423 try:
2424 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002425 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002426 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002427
2428 if not parsed_issue_arg.patchset:
2429 # Use current revision by default.
2430 revision_info = detail['revisions'][detail['current_revision']]
2431 patchset = int(revision_info['_number'])
2432 else:
2433 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002434 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002435 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2436 break
2437 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002438 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002439 (parsed_issue_arg.patchset, self.GetIssue()))
2440
Edward Lemur125d60a2019-09-13 18:25:41 +00002441 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002442 if remote_url.endswith('.git'):
2443 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002444 remote_url = remote_url.rstrip('/')
2445
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002446 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002447 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002448
2449 if remote_url != fetch_info['url']:
2450 DieWithError('Trying to patch a change from %s but this repo appears '
2451 'to be %s.' % (fetch_info['url'], remote_url))
2452
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002453 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002454
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002455 # If we have created a new branch then do the "set issue" immediately in
2456 # case the cherry-pick fails, which happens when resolving conflicts.
2457 if newbranch:
2458 self.SetIssue(parsed_issue_arg.issue)
2459
Aaron Gable62619a32017-06-16 08:22:09 -07002460 if force:
2461 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2462 print('Checked out commit for change %i patchset %i locally' %
2463 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002464 elif nocommit:
2465 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2466 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002467 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002468 RunGit(['cherry-pick', 'FETCH_HEAD'])
2469 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002470 (parsed_issue_arg.issue, patchset))
2471 print('Note: this created a local commit which does not have '
2472 'the same hash as the one uploaded for review. This will make '
2473 'uploading changes based on top of this branch difficult.\n'
2474 'If you want to do that, use "git cl patch --force" instead.')
2475
Stefan Zagerd08043c2017-10-12 12:07:02 -07002476 if self.GetBranch():
2477 self.SetIssue(parsed_issue_arg.issue)
2478 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002479 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002480 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2481 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002482 else:
2483 print('WARNING: You are in detached HEAD state.\n'
2484 'The patch has been applied to your checkout, but you will not be '
2485 'able to upload a new patch set to the gerrit issue.\n'
2486 'Try using the \'-b\' option if you would like to work on a '
2487 'branch and/or upload a new patch set.')
2488
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002489 return 0
2490
Joanna Wang18de1f62023-01-21 01:24:24 +00002491 @staticmethod
2492 def _GerritCommitMsgHookCheck(offer_removal):
2493 # type: (bool) -> None
2494 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002495 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2496 if not os.path.exists(hook):
2497 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002498 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2499 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002500 data = gclient_utils.FileRead(hook)
2501 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2502 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002503 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002504 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002505 'and may interfere with it in subtle ways.\n'
2506 'We recommend you remove the commit-msg hook.')
2507 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002508 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002509 gclient_utils.rm_file_or_tree(hook)
2510 print('Gerrit commit-msg hook removed.')
2511 else:
2512 print('OK, will keep Gerrit commit-msg hook in place.')
2513
Edward Lemur1b52d872019-05-09 21:12:12 +00002514 def _CleanUpOldTraces(self):
2515 """Keep only the last |MAX_TRACES| traces."""
2516 try:
2517 traces = sorted([
2518 os.path.join(TRACES_DIR, f)
2519 for f in os.listdir(TRACES_DIR)
2520 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2521 and not f.startswith('tmp'))
2522 ])
2523 traces_to_delete = traces[:-MAX_TRACES]
2524 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002525 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002526 except OSError:
2527 print('WARNING: Failed to remove old git traces from\n'
2528 ' %s'
2529 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002530
Edward Lemur5737f022019-05-17 01:24:00 +00002531 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002532 """Zip and write the git push traces stored in traces_dir."""
2533 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002534 traces_zip = trace_name + '-traces'
2535 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002536 # Create a temporary dir to store git config and gitcookies in. It will be
2537 # compressed and stored next to the traces.
2538 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002539 git_info_zip = trace_name + '-git-info'
2540
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002541 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002542
Edward Lemur1b52d872019-05-09 21:12:12 +00002543 git_push_metadata['trace_name'] = trace_name
2544 gclient_utils.FileWrite(
2545 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2546
2547 # Keep only the first 6 characters of the git hashes on the packet
2548 # trace. This greatly decreases size after compression.
2549 packet_traces = os.path.join(traces_dir, 'trace-packet')
2550 if os.path.isfile(packet_traces):
2551 contents = gclient_utils.FileRead(packet_traces)
2552 gclient_utils.FileWrite(
2553 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2554 shutil.make_archive(traces_zip, 'zip', traces_dir)
2555
2556 # Collect and compress the git config and gitcookies.
2557 git_config = RunGit(['config', '-l'])
2558 gclient_utils.FileWrite(
2559 os.path.join(git_info_dir, 'git-config'),
2560 git_config)
2561
2562 cookie_auth = gerrit_util.Authenticator.get()
2563 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2564 gitcookies_path = cookie_auth.get_gitcookies_path()
2565 if os.path.isfile(gitcookies_path):
2566 gitcookies = gclient_utils.FileRead(gitcookies_path)
2567 gclient_utils.FileWrite(
2568 os.path.join(git_info_dir, 'gitcookies'),
2569 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2570 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2571
Edward Lemur1b52d872019-05-09 21:12:12 +00002572 gclient_utils.rmtree(git_info_dir)
2573
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002574 def _RunGitPushWithTraces(self,
2575 refspec,
2576 refspec_opts,
2577 git_push_metadata,
2578 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002579 """Run git push and collect the traces resulting from the execution."""
2580 # Create a temporary directory to store traces in. Traces will be compressed
2581 # and stored in a 'traces' dir inside depot_tools.
2582 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002583 trace_name = os.path.join(
2584 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002585
2586 env = os.environ.copy()
2587 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2588 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002589 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002590 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2591 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2592 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2593
2594 try:
2595 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002596 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002597 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002598 push_cmd = ['git', 'push', remote_url, refspec]
2599 if git_push_options:
2600 for opt in git_push_options:
2601 push_cmd.extend(['-o', opt])
2602
Edward Lemur0f58ae42019-04-30 17:24:12 +00002603 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002604 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002605 env=env,
2606 print_stdout=True,
2607 # Flush after every line: useful for seeing progress when running as
2608 # recipe.
2609 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002610 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002611 except subprocess2.CalledProcessError as e:
2612 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002613 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002614 raise GitPushError(
2615 'Failed to create a change, very likely due to blocked keyword. '
2616 'Please examine output above for the reason of the failure.\n'
2617 'If this is a false positive, you can try to bypass blocked '
2618 'keyword by using push option '
2619 '-o uploadvalidator~skip, e.g.:\n'
2620 'git cl upload -o uploadvalidator~skip\n\n'
2621 'If git-cl is not working correctly, file a bug under the '
2622 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002623 if 'git push -o nokeycheck' in str(e.stdout):
2624 raise GitPushError(
2625 'Failed to create a change, very likely due to a private key being '
2626 'detected. Please examine output above for the reason of the '
2627 'failure.\n'
2628 'If this is a false positive, you can try to bypass private key '
2629 'detection by using push option '
2630 '-o nokeycheck, e.g.:\n'
2631 'git cl upload -o nokeycheck\n\n'
2632 'If git-cl is not working correctly, file a bug under the '
2633 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002634
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002635 raise GitPushError(
2636 'Failed to create a change. Please examine output above for the '
2637 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002638 'For emergencies, Googlers can escalate to '
2639 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002640 'Hint: run command below to diagnose common Git/Gerrit '
2641 'credential problems:\n'
2642 ' git cl creds-check\n'
2643 '\n'
2644 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2645 'component including the files below.\n'
2646 'Review the files before upload, since they might contain sensitive '
2647 'information.\n'
2648 'Set the Restrict-View-Google label so that they are not publicly '
2649 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002650 finally:
2651 execution_time = time_time() - before_push
2652 metrics.collector.add_repeated('sub_commands', {
2653 'command': 'git push',
2654 'execution_time': execution_time,
2655 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002656 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002657 })
2658
Edward Lemur1b52d872019-05-09 21:12:12 +00002659 git_push_metadata['execution_time'] = execution_time
2660 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002661 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002662
Edward Lemur1b52d872019-05-09 21:12:12 +00002663 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002664 gclient_utils.rmtree(traces_dir)
2665
2666 return push_stdout
2667
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002668 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2669 change_desc):
2670 """Upload the current branch to Gerrit, retry if new remote HEAD is
2671 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002672 remote, remote_branch = self.GetRemoteBranch()
2673 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2674
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002675 try:
2676 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002677 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002678 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002679 # Repository might be in the middle of transition to main branch as
2680 # default, and uploads to old default might be blocked.
2681 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002682 DieWithError(str(e), change_desc)
2683
Josip Sokcevicb631a882021-01-06 18:18:10 +00002684 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2685 self.GetGerritProject())
2686 if project_head == branch:
2687 DieWithError(str(e), change_desc)
2688 branch = project_head
2689
2690 print("WARNING: Fetching remote state and retrying upload to default "
2691 "branch...")
2692 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002693 options.edit_description = False
2694 options.force = True
2695 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002696 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2697 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002698 except GitPushError as e:
2699 DieWithError(str(e), change_desc)
2700
2701 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002702 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002703 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002704 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002705 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002706 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002707 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002708 # User requested to change description
2709 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002710 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002711 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2712 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002713 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002714
2715 # Check if changes outside of this workspace have been uploaded.
2716 current_rev = change_detail['current_revision']
2717 last_uploaded_rev = self._GitGetBranchConfigValue(
2718 GERRIT_SQUASH_HASH_CONFIG_KEY)
2719 if last_uploaded_rev and current_rev != last_uploaded_rev:
2720 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002721 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002722 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002723 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002724 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002725 if len(change_ids) == 1:
2726 change_id = change_ids[0]
2727 else:
2728 change_id = GenerateGerritChangeId(change_desc.description)
2729 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002730
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002731 if options.preserve_tryjobs:
2732 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002733
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002734 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002735 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002736 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002737 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002738 with gclient_utils.temporary_file() as desc_tempfile:
2739 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2740 ref_to_push = RunGit(
2741 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002742 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002743 if options.no_add_changeid:
2744 pass
2745 else: # adding Change-Ids is okay.
2746 if not git_footers.get_footer_change_id(change_desc.description):
2747 DownloadGerritHook(False)
2748 change_desc.set_description(
2749 self._AddChangeIdToCommitMessage(change_desc.description,
2750 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002751 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002752 # For no-squash mode, we assume the remote called "origin" is the one we
2753 # want. It is not worthwhile to support different workflows for
2754 # no-squash mode.
2755 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002756 # attempt to extract the changeid from the current description
2757 # fail informatively if not possible.
2758 change_id_candidates = git_footers.get_footer_change_id(
2759 change_desc.description)
2760 if not change_id_candidates:
2761 DieWithError("Unable to extract change-id from message.")
2762 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002763
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002764 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002765 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2766 ref_to_push)]).splitlines()
2767 if len(commits) > 1:
2768 print('WARNING: This will upload %d commits. Run the following command '
2769 'to see which commits will be uploaded: ' % len(commits))
2770 print('git log %s..%s' % (parent, ref_to_push))
2771 print('You can also use `git squash-branch` to squash these into a '
2772 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002773 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002774
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002775 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002776 cc = []
Joanna Wangc8f23e22023-01-19 21:18:10 +00002777 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
Edward Lemur4508b422019-10-03 21:56:35 +00002778 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2779 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002780 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002781 if len(cc) > 100:
2782 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2783 'process/lsc/lsc_workflow.md')
2784 print('WARNING: This will auto-CC %s users.' % len(cc))
2785 print('LSC may be more appropriate: %s' % lsc)
2786 print('You can also use the --no-autocc flag to disable auto-CC.')
2787 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002788 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002789 if options.cc:
2790 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002791 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002792 if change_desc.get_cced():
2793 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002794 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002795 valid_accounts = set(reviewers + cc)
2796 # TODO(crbug/877717): relax this for all hosts.
2797 else:
2798 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002799 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002800 logging.info('accounts %s are recognized, %s invalid',
2801 sorted(valid_accounts),
2802 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002803
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002804 # Extra options that can be specified at push time. Doc:
2805 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002806 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002807
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002808 for r in sorted(reviewers):
2809 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002810 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002811 reviewers.remove(r)
2812 else:
2813 # TODO(tandrii): this should probably be a hard failure.
2814 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2815 % r)
2816 for c in sorted(cc):
2817 # refspec option will be rejected if cc doesn't correspond to an
2818 # account, even though REST call to add such arbitrary cc may succeed.
2819 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002820 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002821 cc.remove(c)
2822
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002823 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002824 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002825 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002826 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002827 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2828
2829 refspec_suffix = ''
2830 if refspec_opts:
2831 refspec_suffix = '%' + ','.join(refspec_opts)
2832 assert ' ' not in refspec_suffix, (
2833 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2834 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002835
Edward Lemur1b52d872019-05-09 21:12:12 +00002836 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002837 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002838 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002839 'change_id': change_id,
2840 'description': change_desc.description,
2841 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002842
Gavin Mak4e5e3992022-11-14 22:40:12 +00002843 # Gerrit may or may not update fast enough to return the correct patchset
2844 # number after we push. Get the pre-upload patchset and increment later.
2845 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2846
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002847 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002848 git_push_metadata,
2849 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002850
2851 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002852 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002853 change_numbers = [m.group(1)
2854 for m in map(regex.match, push_stdout.splitlines())
2855 if m]
2856 if len(change_numbers) != 1:
2857 DieWithError(
2858 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002859 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002860 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002861 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002862 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002863
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002864 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002865 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002866 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002867 gerrit_util.AddReviewers(self.GetGerritHost(),
2868 self._GerritChangeIdentifier(),
2869 reviewers,
2870 cc,
2871 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002872
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002873 return 0
2874
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002875 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2876 change_desc):
2877 """Computes parent of the generated commit to be uploaded to Gerrit.
2878
2879 Returns revision or a ref name.
2880 """
2881 if custom_cl_base:
2882 # Try to avoid creating additional unintended CLs when uploading, unless
2883 # user wants to take this risk.
2884 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2885 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2886 local_ref_of_target_remote])
2887 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002888 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002889 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2890 'If you proceed with upload, more than 1 CL may be created by '
2891 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2892 'If you are certain that specified base `%s` has already been '
2893 'uploaded to Gerrit as another CL, you may proceed.\n' %
2894 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2895 if not force:
2896 confirm_or_exit(
2897 'Do you take responsibility for cleaning up potential mess '
2898 'resulting from proceeding with upload?',
2899 action='upload')
2900 return custom_cl_base
2901
Aaron Gablef97e33d2017-03-30 15:44:27 -07002902 if remote != '.':
2903 return self.GetCommonAncestorWithUpstream()
2904
2905 # If our upstream branch is local, we base our squashed commit on its
2906 # squashed version.
2907 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2908
Aaron Gablef97e33d2017-03-30 15:44:27 -07002909 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002910 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002911 if upstream_branch_name == 'main':
2912 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002913
2914 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002915 # TODO(tandrii): consider checking parent change in Gerrit and using its
2916 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2917 # the tree hash of the parent branch. The upside is less likely bogus
2918 # requests to reupload parent change just because it's uploadhash is
2919 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002920 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2921 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002922 # Verify that the upstream branch has been uploaded too, otherwise
2923 # Gerrit will create additional CLs when uploading.
2924 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2925 RunGitSilent(['rev-parse', parent + ':'])):
2926 DieWithError(
2927 '\nUpload upstream branch %s first.\n'
2928 'It is likely that this branch has been rebased since its last '
2929 'upload, so you just need to upload it again.\n'
2930 '(If you uploaded it with --no-squash, then branch dependencies '
2931 'are not supported, and you should reupload with --squash.)'
2932 % upstream_branch_name,
2933 change_desc)
2934 return parent
2935
Gavin Mak4e5e3992022-11-14 22:40:12 +00002936 def _UpdateWithExternalChanges(self):
2937 """Updates workspace with external changes.
2938
2939 Returns the commit hash that should be used as the merge base on upload.
2940 """
2941 local_ps = self.GetPatchset()
2942 if local_ps is None:
2943 return
2944
2945 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002946 if external_ps is None or local_ps == external_ps or \
2947 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002948 return
2949
2950 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002951 if num_changes > 1:
2952 change_words = 'changes were'
2953 else:
2954 change_words = 'change was'
2955 print('\n%d external %s published to %s:\n' %
2956 (num_changes, change_words, self.GetIssueURL(short=True)))
2957
2958 # Print an overview of external changes.
2959 ps_to_commit = {}
2960 ps_to_info = {}
2961 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2962 for commit_id, revision_info in revisions.get('revisions', {}).items():
2963 ps_num = revision_info['_number']
2964 ps_to_commit[ps_num] = commit_id
2965 ps_to_info[ps_num] = revision_info
2966
2967 for ps in range(external_ps, local_ps, -1):
2968 commit = ps_to_commit[ps][:8]
2969 desc = ps_to_info[ps].get('description', '')
2970 print('Patchset %d [%s] %s' % (ps, commit, desc))
2971
2972 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2973 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002974 return
2975
2976 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2977 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2978 external_base = external_parent['commit']
2979
2980 branch = git_common.current_branch()
2981 local_base = self.GetCommonAncestorWithUpstream()
2982 if local_base != external_base:
2983 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2984 (local_base, external_base))
2985 if git_common.upstream(branch):
2986 DieWithError('Upstream branch set. Consider using `git rebase-update` '
2987 'to make these the same.')
2988 print('No upstream branch set. Consider setting it and using '
2989 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
2990
2991 # Fetch Gerrit's CL base if it doesn't exist locally.
2992 remote, _ = self.GetRemoteBranch()
2993 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
2994 RunGitSilent(['fetch', remote, external_base])
2995
2996 # Get the diff between local_ps and external_ps.
2997 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00002998 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002999 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3000 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3001 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3002 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3003 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3004
3005 # Diff can be empty in the case of trivial rebases.
3006 if not diff:
3007 return external_base
3008
3009 # Apply the diff.
3010 with gclient_utils.temporary_file() as diff_tempfile:
3011 gclient_utils.FileWrite(diff_tempfile, diff)
3012 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3013 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3014 if not clean_patch:
3015 # Normally patchset is set after upload. But because we exit, that never
3016 # happens. Updating here makes sure that subsequent uploads don't need
3017 # to fetch/apply the same diff again.
3018 self.SetPatchset(external_ps)
3019 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3020 'conflicts and reupload.')
3021
3022 message = 'Incorporate external changes from '
3023 if num_changes == 1:
3024 message += 'patchset %d' % external_ps
3025 else:
3026 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3027 RunGitSilent(['commit', '-am', message])
3028 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3029 # patchset title instead of this 'Incorporate' message.
3030 return external_base
3031
Edward Lemura12175c2020-03-09 16:58:26 +00003032 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003033 """Re-commits using the current message, assumes the commit hook is in
3034 place.
3035 """
Edward Lemura12175c2020-03-09 16:58:26 +00003036 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003037 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003038 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003039 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003040 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003041
3042 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003043
tandriie113dfd2016-10-11 10:20:12 -07003044 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003045 try:
3046 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003047 except GerritChangeNotExists:
3048 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003049
3050 if data['status'] in ('ABANDONED', 'MERGED'):
3051 return 'CL %s is closed' % self.GetIssue()
3052
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003053 def GetGerritChange(self, patchset=None):
3054 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003055 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003056 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003057 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003058 data = self._GetChangeDetail(['ALL_REVISIONS'])
3059
3060 assert host and issue and patchset, 'CL must be uploaded first'
3061
3062 has_patchset = any(
3063 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003064 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003065 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003066 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003067 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003068
tandrii8c5a3532016-11-04 07:52:02 -07003069 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003070 'host': host,
3071 'change': issue,
3072 'project': data['project'],
3073 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003074 }
tandriie113dfd2016-10-11 10:20:12 -07003075
tandriide281ae2016-10-12 06:02:30 -07003076 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003077 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003078
Edward Lemur707d70b2018-02-07 00:50:14 +01003079 def GetReviewers(self):
3080 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003081 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003082
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003083
Lei Zhang8a0efc12020-08-05 19:58:45 +00003084def _get_bug_line_values(default_project_prefix, bugs):
3085 """Given default_project_prefix and comma separated list of bugs, yields bug
3086 line values.
tandriif9aefb72016-07-01 09:06:51 -07003087
3088 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003089 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003090 * string, which is left as is.
3091
3092 This function may produce more than one line, because bugdroid expects one
3093 project per line.
3094
Lei Zhang8a0efc12020-08-05 19:58:45 +00003095 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003096 ['v8:123', 'chromium:789']
3097 """
3098 default_bugs = []
3099 others = []
3100 for bug in bugs.split(','):
3101 bug = bug.strip()
3102 if bug:
3103 try:
3104 default_bugs.append(int(bug))
3105 except ValueError:
3106 others.append(bug)
3107
3108 if default_bugs:
3109 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003110 if default_project_prefix:
3111 if not default_project_prefix.endswith(':'):
3112 default_project_prefix += ':'
3113 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003114 else:
3115 yield default_bugs
3116 for other in sorted(others):
3117 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3118 yield other
3119
3120
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003121class ChangeDescription(object):
3122 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003123 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003124 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003125 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003126 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003127 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003128 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3129 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003130 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003131 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003132
Dan Beamd8b04ca2019-10-10 21:23:26 +00003133 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003134 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003135 if bug:
3136 regexp = re.compile(self.BUG_LINE)
3137 prefix = settings.GetBugPrefix()
3138 if not any((regexp.match(line) for line in self._description_lines)):
3139 values = list(_get_bug_line_values(prefix, bug))
3140 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003141 if fixed:
3142 regexp = re.compile(self.FIXED_LINE)
3143 prefix = settings.GetBugPrefix()
3144 if not any((regexp.match(line) for line in self._description_lines)):
3145 values = list(_get_bug_line_values(prefix, fixed))
3146 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003147
agable@chromium.org42c20792013-09-12 17:34:49 +00003148 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003149 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003150 return '\n'.join(self._description_lines)
3151
3152 def set_description(self, desc):
3153 if isinstance(desc, basestring):
3154 lines = desc.splitlines()
3155 else:
3156 lines = [line.rstrip() for line in desc]
3157 while lines and not lines[0]:
3158 lines.pop(0)
3159 while lines and not lines[-1]:
3160 lines.pop(-1)
3161 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003162
Edward Lemur5a644f82020-03-18 16:44:57 +00003163 def ensure_change_id(self, change_id):
3164 description = self.description
3165 footer_change_ids = git_footers.get_footer_change_id(description)
3166 # Make sure that the Change-Id in the description matches the given one.
3167 if footer_change_ids != [change_id]:
3168 if footer_change_ids:
3169 # Remove any existing Change-Id footers since they don't match the
3170 # expected change_id footer.
3171 description = git_footers.remove_footer(description, 'Change-Id')
3172 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3173 'if you want to set a new one.')
3174 # Add the expected Change-Id footer.
3175 description = git_footers.add_footer_change_id(description, change_id)
3176 self.set_description(description)
3177
Joanna Wang39811b12023-01-20 23:09:48 +00003178 def update_reviewers(self, reviewers):
3179 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003180
3181 Args:
3182 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003183 """
Joanna Wang39811b12023-01-20 23:09:48 +00003184 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003185 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003186
3187 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003188
Joanna Wang39811b12023-01-20 23:09:48 +00003189 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003190 regexp = re.compile(self.R_LINE)
3191 matches = [regexp.match(line) for line in self._description_lines]
3192 new_desc = [l for i, l in enumerate(self._description_lines)
3193 if not matches[i]]
3194 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003195
Joanna Wang39811b12023-01-20 23:09:48 +00003196 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003197
Joanna Wang39811b12023-01-20 23:09:48 +00003198 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003199 for match in matches:
3200 if not match:
3201 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003202 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003203
Joanna Wang39811b12023-01-20 23:09:48 +00003204 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003205
3206 # Put the new lines in the description where the old first R= line was.
3207 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3208 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003209 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003210 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003211 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003212
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003213 def set_preserve_tryjobs(self):
3214 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3215 footers = git_footers.parse_footers(self.description)
3216 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3217 if v.lower() == 'true':
3218 return
3219 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3220
Anthony Polito8b955342019-09-24 19:01:36 +00003221 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003222 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003223 self.set_description([
3224 '# Enter a description of the change.',
3225 '# This will be displayed on the codereview site.',
3226 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003227 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003228 '--------------------',
3229 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003230 bug_regexp = re.compile(self.BUG_LINE)
3231 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003232 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003233 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003234
Dan Beamd8b04ca2019-10-10 21:23:26 +00003235 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003236 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003237
Bruce Dawsonfc487042020-10-27 19:11:37 +00003238 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003239 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003240 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003241 if not content:
3242 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003243 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003244
Bruce Dawson2377b012018-01-11 16:46:49 -08003245 # Strip off comments and default inserted "Bug:" line.
3246 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003247 (line.startswith('#') or
3248 line.rstrip() == "Bug:" or
3249 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003250 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003251 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003252 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003253
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003254 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003255 """Adds a footer line to the description.
3256
3257 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3258 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3259 that Gerrit footers are always at the end.
3260 """
3261 parsed_footer_line = git_footers.parse_footer(line)
3262 if parsed_footer_line:
3263 # Line is a gerrit footer in the form: Footer-Key: any value.
3264 # Thus, must be appended observing Gerrit footer rules.
3265 self.set_description(
3266 git_footers.add_footer(self.description,
3267 key=parsed_footer_line[0],
3268 value=parsed_footer_line[1]))
3269 return
3270
3271 if not self._description_lines:
3272 self._description_lines.append(line)
3273 return
3274
3275 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3276 if gerrit_footers:
3277 # git_footers.split_footers ensures that there is an empty line before
3278 # actual (gerrit) footers, if any. We have to keep it that way.
3279 assert top_lines and top_lines[-1] == ''
3280 top_lines, separator = top_lines[:-1], top_lines[-1:]
3281 else:
3282 separator = [] # No need for separator if there are no gerrit_footers.
3283
3284 prev_line = top_lines[-1] if top_lines else ''
3285 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3286 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3287 top_lines.append('')
3288 top_lines.append(line)
3289 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003290
tandrii99a72f22016-08-17 14:33:24 -07003291 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003292 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003293 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003294 reviewers = [match.group(2).strip()
3295 for match in matches
3296 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003297 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003298
bradnelsond975b302016-10-23 12:20:23 -07003299 def get_cced(self):
3300 """Retrieves the list of reviewers."""
3301 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3302 cced = [match.group(2).strip() for match in matches if match]
3303 return cleanup_list(cced)
3304
Nodir Turakulov23b82142017-11-16 11:04:25 -08003305 def get_hash_tags(self):
3306 """Extracts and sanitizes a list of Gerrit hashtags."""
3307 subject = (self._description_lines or ('',))[0]
3308 subject = re.sub(
3309 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3310
3311 tags = []
3312 start = 0
3313 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3314 while True:
3315 m = bracket_exp.match(subject, start)
3316 if not m:
3317 break
3318 tags.append(self.sanitize_hash_tag(m.group(1)))
3319 start = m.end()
3320
3321 if not tags:
3322 # Try "Tag: " prefix.
3323 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3324 if m:
3325 tags.append(self.sanitize_hash_tag(m.group(1)))
3326 return tags
3327
3328 @classmethod
3329 def sanitize_hash_tag(cls, tag):
3330 """Returns a sanitized Gerrit hash tag.
3331
3332 A sanitized hashtag can be used as a git push refspec parameter value.
3333 """
3334 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3335
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003336
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003337def FindCodereviewSettingsFile(filename='codereview.settings'):
3338 """Finds the given file starting in the cwd and going up.
3339
3340 Only looks up to the top of the repository unless an
3341 'inherit-review-settings-ok' file exists in the root of the repository.
3342 """
3343 inherit_ok_file = 'inherit-review-settings-ok'
3344 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003345 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003346 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003347 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003348 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003349 if os.path.isfile(os.path.join(cwd, filename)):
3350 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003351 if cwd == root:
3352 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003353 parent_dir = os.path.dirname(cwd)
3354 if parent_dir == cwd:
3355 # We hit the system root directory.
3356 break
3357 cwd = parent_dir
3358 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003359
3360
3361def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003362 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003363 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003364
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003365 def SetProperty(name, setting, unset_error_ok=False):
3366 fullname = 'rietveld.' + name
3367 if setting in keyvals:
3368 RunGit(['config', fullname, keyvals[setting]])
3369 else:
3370 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3371
tandrii48df5812016-10-17 03:55:37 -07003372 if not keyvals.get('GERRIT_HOST', False):
3373 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003374 # Only server setting is required. Other settings can be absent.
3375 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003376 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003377 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3378 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003379 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003380 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3381 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003382 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3383 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003384 SetProperty(
3385 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003386 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003387
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003388 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003389 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003390
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003391 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003392 RunGit(['config', 'gerrit.squash-uploads',
3393 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003394
tandrii@chromium.org28253532016-04-14 13:46:56 +00003395 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003396 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003397 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3398
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003399 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003400 # should be of the form
3401 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3402 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003403 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3404 keyvals['ORIGIN_URL_CONFIG']])
3405
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003406
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003407def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003408 """Downloads a network object to a local file, like urllib.urlretrieve.
3409
3410 This is necessary because urllib is broken for SSL connections via a proxy.
3411 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003412 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003413 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003414
3415
ukai@chromium.org712d6102013-11-27 00:52:58 +00003416def hasSheBang(fname):
3417 """Checks fname is a #! script."""
3418 with open(fname) as f:
3419 return f.read(2).startswith('#!')
3420
3421
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003422def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003423 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003424
3425 Args:
3426 force: True to update hooks. False to install hooks if not present.
3427 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003428 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003429 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3430 if not os.access(dst, os.X_OK):
3431 if os.path.exists(dst):
3432 if not force:
3433 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003434 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003435 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003436 if not hasSheBang(dst):
3437 DieWithError('Not a script: %s\n'
3438 'You need to download from\n%s\n'
3439 'into .git/hooks/commit-msg and '
3440 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003441 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3442 except Exception:
3443 if os.path.exists(dst):
3444 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003445 DieWithError('\nFailed to download hooks.\n'
3446 'You need to download from\n%s\n'
3447 'into .git/hooks/commit-msg and '
3448 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003449
3450
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003451class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003452 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003453
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003454 def __init__(self):
3455 # Cached list of [host, identity, source], where source is either
3456 # .gitcookies or .netrc.
3457 self._all_hosts = None
3458
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003459 def ensure_configured_gitcookies(self):
3460 """Runs checks and suggests fixes to make git use .gitcookies from default
3461 path."""
3462 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3463 configured_path = RunGitSilent(
3464 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003465 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003466 if configured_path:
3467 self._ensure_default_gitcookies_path(configured_path, default)
3468 else:
3469 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003470
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003471 @staticmethod
3472 def _ensure_default_gitcookies_path(configured_path, default_path):
3473 assert configured_path
3474 if configured_path == default_path:
3475 print('git is already configured to use your .gitcookies from %s' %
3476 configured_path)
3477 return
3478
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003479 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003480 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3481 (configured_path, default_path))
3482
3483 if not os.path.exists(configured_path):
3484 print('However, your configured .gitcookies file is missing.')
3485 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3486 action='reconfigure')
3487 RunGit(['config', '--global', 'http.cookiefile', default_path])
3488 return
3489
3490 if os.path.exists(default_path):
3491 print('WARNING: default .gitcookies file already exists %s' %
3492 default_path)
3493 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3494 default_path)
3495
3496 confirm_or_exit('Move existing .gitcookies to default location?',
3497 action='move')
3498 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003499 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003500 print('Moved and reconfigured git to use .gitcookies from %s' %
3501 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003502
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003503 @staticmethod
3504 def _configure_gitcookies_path(default_path):
3505 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3506 if os.path.exists(netrc_path):
3507 print('You seem to be using outdated .netrc for git credentials: %s' %
3508 netrc_path)
3509 print('This tool will guide you through setting up recommended '
3510 '.gitcookies store for git credentials.\n'
3511 '\n'
3512 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3513 ' git config --global --unset http.cookiefile\n'
3514 ' mv %s %s.backup\n\n' % (default_path, default_path))
3515 confirm_or_exit(action='setup .gitcookies')
3516 RunGit(['config', '--global', 'http.cookiefile', default_path])
3517 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003518
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003519 def get_hosts_with_creds(self, include_netrc=False):
3520 if self._all_hosts is None:
3521 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003522 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3523 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3524 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3525 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003526
3527 if include_netrc:
3528 return self._all_hosts
3529 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3530
3531 def print_current_creds(self, include_netrc=False):
3532 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3533 if not hosts:
3534 print('No Git/Gerrit credentials found')
3535 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003536 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003537 header = [('Host', 'User', 'Which file'),
3538 ['=' * l for l in lengths]]
3539 for row in (header + hosts):
3540 print('\t'.join((('%%+%ds' % l) % s)
3541 for l, s in zip(lengths, row)))
3542
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003543 @staticmethod
3544 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003545 """Parses identity "git-<username>.domain" into <username> and domain."""
3546 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003547 # distinguishable from sub-domains. But we do know typical domains:
3548 if identity.endswith('.chromium.org'):
3549 domain = 'chromium.org'
3550 username = identity[:-len('.chromium.org')]
3551 else:
3552 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003553 if username.startswith('git-'):
3554 username = username[len('git-'):]
3555 return username, domain
3556
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003557 def has_generic_host(self):
3558 """Returns whether generic .googlesource.com has been configured.
3559
3560 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3561 """
3562 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003563 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003564 return True
3565 return False
3566
3567 def _get_git_gerrit_identity_pairs(self):
3568 """Returns map from canonic host to pair of identities (Git, Gerrit).
3569
3570 One of identities might be None, meaning not configured.
3571 """
3572 host_to_identity_pairs = {}
3573 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003574 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003575 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3576 idx = 0 if canonical == host else 1
3577 pair[idx] = identity
3578 return host_to_identity_pairs
3579
3580 def get_partially_configured_hosts(self):
3581 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003582 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003583 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003584 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003585
3586 def get_conflicting_hosts(self):
3587 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003588 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003589 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003590 if None not in (i1, i2) and i1 != i2)
3591
3592 def get_duplicated_hosts(self):
3593 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003594 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003595
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003596
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003597 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003598 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003599 hosts = sorted(hosts)
3600 assert hosts
3601 if extra_column_func is None:
3602 extras = [''] * len(hosts)
3603 else:
3604 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003605 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3606 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003607 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003608 lines.append(tmpl % he)
3609 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003610
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003611 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003612 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003613 yield ('.googlesource.com wildcard record detected',
3614 ['Chrome Infrastructure team recommends to list full host names '
3615 'explicitly.'],
3616 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003617
3618 dups = self.get_duplicated_hosts()
3619 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003620 yield ('The following hosts were defined twice',
3621 self._format_hosts(dups),
3622 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003623
3624 partial = self.get_partially_configured_hosts()
3625 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003626 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3627 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003628 self._format_hosts(
3629 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3630 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003631
3632 conflicting = self.get_conflicting_hosts()
3633 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003634 yield ('The following Git hosts have differing credentials from their '
3635 'Gerrit counterparts',
3636 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3637 tuple(self._get_git_gerrit_identity_pairs()[host])),
3638 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003639
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003640 def find_and_report_problems(self):
3641 """Returns True if there was at least one problem, else False."""
3642 found = False
3643 bad_hosts = set()
3644 for title, sublines, hosts in self._find_problems():
3645 if not found:
3646 found = True
3647 print('\n\n.gitcookies problem report:\n')
3648 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003649 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003650 if sublines:
3651 print()
3652 print(' %s' % '\n '.join(sublines))
3653 print()
3654
3655 if bad_hosts:
3656 assert found
3657 print(' You can manually remove corresponding lines in your %s file and '
3658 'visit the following URLs with correct account to generate '
3659 'correct credential lines:\n' %
3660 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003661 print(' %s' % '\n '.join(
3662 sorted(
3663 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3664 _canonical_git_googlesource_host(host))
3665 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003666 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003667
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003668
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003669@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003670def CMDcreds_check(parser, args):
3671 """Checks credentials and suggests changes."""
3672 _, _ = parser.parse_args(args)
3673
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003674 # Code below checks .gitcookies. Abort if using something else.
3675 authn = gerrit_util.Authenticator.get()
3676 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003677 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003678 'This command is not designed for bot environment. It checks '
3679 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003680 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3681 if isinstance(authn, gerrit_util.GceAuthenticator):
3682 message += (
3683 '\n'
3684 'If you need to run this on GCE or a cloudtop instance, '
3685 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3686 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003687
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003688 checker = _GitCookiesChecker()
3689 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003690
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003691 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003692 checker.print_current_creds(include_netrc=True)
3693
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003694 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003695 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003696 return 0
3697 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003698
3699
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003700@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003701def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003702 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003703 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003704 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003705 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003706 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003707 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003708 return RunGit(['config', 'branch.%s.base-url' % branch],
3709 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003710
3711 print('Setting base-url to %s' % args[0])
3712 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3713 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003714
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003715
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003716def color_for_status(status):
3717 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003718 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003719 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003720 'unsent': BOLD + Fore.YELLOW,
3721 'waiting': BOLD + Fore.RED,
3722 'reply': BOLD + Fore.YELLOW,
3723 'not lgtm': BOLD + Fore.RED,
3724 'lgtm': BOLD + Fore.GREEN,
3725 'commit': BOLD + Fore.MAGENTA,
3726 'closed': BOLD + Fore.CYAN,
3727 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003728 }.get(status, Fore.WHITE)
3729
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003730
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003731def get_cl_statuses(changes, fine_grained, max_processes=None):
3732 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003733
3734 If fine_grained is true, this will fetch CL statuses from the server.
3735 Otherwise, simply indicate if there's a matching url for the given branches.
3736
3737 If max_processes is specified, it is used as the maximum number of processes
3738 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3739 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003740
3741 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003742 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003743 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003744 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003745
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003746 if not fine_grained:
3747 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003748 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003749 for cl in changes:
3750 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003751 return
3752
3753 # First, sort out authentication issues.
3754 logging.debug('ensuring credentials exist')
3755 for cl in changes:
3756 cl.EnsureAuthenticated(force=False, refresh=True)
3757
3758 def fetch(cl):
3759 try:
3760 return (cl, cl.GetStatus())
3761 except:
3762 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003763 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003764 raise
3765
3766 threads_count = len(changes)
3767 if max_processes:
3768 threads_count = max(1, min(threads_count, max_processes))
3769 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3770
Edward Lemur61bf4172020-02-24 23:22:37 +00003771 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003772 fetched_cls = set()
3773 try:
3774 it = pool.imap_unordered(fetch, changes).__iter__()
3775 while True:
3776 try:
3777 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003778 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003779 break
3780 fetched_cls.add(cl)
3781 yield cl, status
3782 finally:
3783 pool.close()
3784
3785 # Add any branches that failed to fetch.
3786 for cl in set(changes) - fetched_cls:
3787 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003788
rmistry@google.com2dd99862015-06-22 12:22:18 +00003789
Jose Lopes3863fc52020-04-07 17:00:25 +00003790def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003791 """Uploads CLs of local branches that are dependents of the current branch.
3792
3793 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003794
3795 test1 -> test2.1 -> test3.1
3796 -> test3.2
3797 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003798
3799 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3800 run on the dependent branches in this order:
3801 test2.1, test3.1, test3.2, test2.2, test3.3
3802
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003803 Note: This function does not rebase your local dependent branches. Use it
3804 when you make a change to the parent branch that will not conflict
3805 with its dependent branches, and you would like their dependencies
3806 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003807 """
3808 if git_common.is_dirty_git_tree('upload-branch-deps'):
3809 return 1
3810
3811 root_branch = cl.GetBranch()
3812 if root_branch is None:
3813 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3814 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003815 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003816 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3817 'patchset dependencies without an uploaded CL.')
3818
3819 branches = RunGit(['for-each-ref',
3820 '--format=%(refname:short) %(upstream:short)',
3821 'refs/heads'])
3822 if not branches:
3823 print('No local branches found.')
3824 return 0
3825
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003826 # Create a dictionary of all local branches to the branches that are
3827 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003828 tracked_to_dependents = collections.defaultdict(list)
3829 for b in branches.splitlines():
3830 tokens = b.split()
3831 if len(tokens) == 2:
3832 branch_name, tracked = tokens
3833 tracked_to_dependents[tracked].append(branch_name)
3834
vapiera7fbd5a2016-06-16 09:17:49 -07003835 print()
3836 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003837 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003838
rmistry@google.com2dd99862015-06-22 12:22:18 +00003839 def traverse_dependents_preorder(branch, padding=''):
3840 dependents_to_process = tracked_to_dependents.get(branch, [])
3841 padding += ' '
3842 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003843 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003844 dependents.append(dependent)
3845 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003846
rmistry@google.com2dd99862015-06-22 12:22:18 +00003847 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003848 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003849
3850 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003851 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003852 return 0
3853
Jose Lopes3863fc52020-04-07 17:00:25 +00003854 if not force:
3855 confirm_or_exit('This command will checkout all dependent branches and run '
3856 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003857
rmistry@google.com2dd99862015-06-22 12:22:18 +00003858 # Record all dependents that failed to upload.
3859 failures = {}
3860 # Go through all dependents, checkout the branch and upload.
3861 try:
3862 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003863 print()
3864 print('--------------------------------------')
3865 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003866 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003867 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003868 try:
3869 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003870 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003871 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003872 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003873 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003874 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003875 finally:
3876 # Swap back to the original root branch.
3877 RunGit(['checkout', '-q', root_branch])
3878
vapiera7fbd5a2016-06-16 09:17:49 -07003879 print()
3880 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003881 for dependent_branch in dependents:
3882 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003883 print(' %s : %s' % (dependent_branch, upload_status))
3884 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885
3886 return 0
3887
3888
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003889def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003890 """Given a proposed tag name, returns a tag name that is guaranteed to be
3891 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3892 or 'foo-3', and so on."""
3893
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003894 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003895 for suffix_num in itertools.count(1):
3896 if suffix_num == 1:
3897 to_check = proposed_tag
3898 else:
3899 to_check = '%s-%d' % (proposed_tag, suffix_num)
3900
3901 if to_check not in existing_tags:
3902 return to_check
3903
3904
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003905@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003906def CMDarchive(parser, args):
3907 """Archives and deletes branches associated with closed changelists."""
3908 parser.add_option(
3909 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003910 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003911 parser.add_option(
3912 '-f', '--force', action='store_true',
3913 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003914 parser.add_option(
3915 '-d', '--dry-run', action='store_true',
3916 help='Skip the branch tagging and removal steps.')
3917 parser.add_option(
3918 '-t', '--notags', action='store_true',
3919 help='Do not tag archived branches. '
3920 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003921 parser.add_option(
3922 '-p',
3923 '--pattern',
3924 default='git-cl-archived-{issue}-{branch}',
3925 help='Format string for archive tags. '
3926 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003927
kmarshall3bff56b2016-06-06 18:31:47 -07003928 options, args = parser.parse_args(args)
3929 if args:
3930 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003931
3932 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3933 if not branches:
3934 return 0
3935
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003936 tags = RunGit(['for-each-ref', '--format=%(refname)',
3937 'refs/tags']).splitlines() or []
3938 tags = [t.split('/')[-1] for t in tags]
3939
vapiera7fbd5a2016-06-16 09:17:49 -07003940 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003941 changes = [Changelist(branchref=b)
3942 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003943 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3944 statuses = get_cl_statuses(changes,
3945 fine_grained=True,
3946 max_processes=options.maxjobs)
3947 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003948 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3949 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003950 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003951 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003952 proposal.sort()
3953
3954 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003955 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003956 return 0
3957
Edward Lemur85153282020-02-14 22:06:29 +00003958 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003959
vapiera7fbd5a2016-06-16 09:17:49 -07003960 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003961 if options.notags:
3962 for next_item in proposal:
3963 print(' ' + next_item[0])
3964 else:
3965 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3966 for next_item in proposal:
3967 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003968
kmarshall9249e012016-08-23 12:02:16 -07003969 # Quit now on precondition failure or if instructed by the user, either
3970 # via an interactive prompt or by command line flags.
3971 if options.dry_run:
3972 print('\nNo changes were made (dry run).\n')
3973 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003974
3975 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003976 print('You are currently on a branch \'%s\' which is associated with a '
3977 'closed codereview issue, so archive cannot proceed. Please '
3978 'checkout another branch and run this command again.' %
3979 current_branch)
3980 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003981
3982 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003983 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003984 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003985 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003986 return 1
3987
3988 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003989 if not options.notags:
3990 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003991
3992 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3993 # Clean up the tag if we failed to delete the branch.
3994 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003995
vapiera7fbd5a2016-06-16 09:17:49 -07003996 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003997
3998 return 0
3999
4000
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004001@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004002def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004003 """Show status of changelists.
4004
4005 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004006 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004007 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004008 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004009 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004010 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004011 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004012 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004013
4014 Also see 'git cl comments'.
4015 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004016 parser.add_option(
4017 '--no-branch-color',
4018 action='store_true',
4019 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004020 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004021 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004022 parser.add_option('-f', '--fast', action='store_true',
4023 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004024 parser.add_option(
4025 '-j', '--maxjobs', action='store', type=int,
4026 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004027 parser.add_option(
4028 '-i', '--issue', type=int,
4029 help='Operate on this issue instead of the current branch\'s implicit '
4030 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004031 parser.add_option('-d',
4032 '--date-order',
4033 action='store_true',
4034 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004035 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004036 if args:
4037 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004038
iannuccie53c9352016-08-17 14:40:40 -07004039 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004040 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004041
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004042 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004043 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004044 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004045 if cl.GetIssue():
4046 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004047 elif options.field == 'id':
4048 issueid = cl.GetIssue()
4049 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004050 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004051 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004052 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004053 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004054 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004055 elif options.field == 'status':
4056 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004057 elif options.field == 'url':
4058 url = cl.GetIssueURL()
4059 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004060 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004061 return 0
4062
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004063 branches = RunGit([
4064 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4065 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004066 if not branches:
4067 print('No local branch found.')
4068 return 0
4069
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004070 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004071 Changelist(branchref=b, commit_date=ct)
4072 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4073 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004074 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004075 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004076 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004077 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004078
Edward Lemur85153282020-02-14 22:06:29 +00004079 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004080
4081 def FormatBranchName(branch, colorize=False):
4082 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4083 an asterisk when it is the current branch."""
4084
4085 asterisk = ""
4086 color = Fore.RESET
4087 if branch == current_branch:
4088 asterisk = "* "
4089 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004090 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004091
4092 if colorize:
4093 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004094 return asterisk + branch_name
4095
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004096 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004097
4098 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004099
4100 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004101 sorted_changes = sorted(changes,
4102 key=lambda c: c.GetCommitDate(),
4103 reverse=True)
4104 else:
4105 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4106 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004107 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004108 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004109 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004110 branch_statuses[c.GetBranch()] = status
4111 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004112 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004113 if url and (not status or status == 'error'):
4114 # The issue probably doesn't exist anymore.
4115 url += ' (broken)'
4116
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004117 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004118 # Turn off bold as well as colors.
4119 END = '\033[0m'
4120 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004121 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004122 color = ''
4123 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004124 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004125
Alan Cuttera3be9a52019-03-04 18:50:33 +00004126 branch_display = FormatBranchName(branch)
4127 padding = ' ' * (alignment - len(branch_display))
4128 if not options.no_branch_color:
4129 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004130
Alan Cuttera3be9a52019-03-04 18:50:33 +00004131 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4132 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004133
vapiera7fbd5a2016-06-16 09:17:49 -07004134 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004135 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004136 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004137 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004138 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004139 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004140 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004141 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004142 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004143 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004144 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004145 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004146 return 0
4147
4148
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004149def colorize_CMDstatus_doc():
4150 """To be called once in main() to add colors to git cl status help."""
4151 colors = [i for i in dir(Fore) if i[0].isupper()]
4152
4153 def colorize_line(line):
4154 for color in colors:
4155 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004156 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004157 indent = len(line) - len(line.lstrip(' ')) + 1
4158 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4159 return line
4160
4161 lines = CMDstatus.__doc__.splitlines()
4162 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4163
4164
phajdan.jre328cf92016-08-22 04:12:17 -07004165def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004166 if path == '-':
4167 json.dump(contents, sys.stdout)
4168 else:
4169 with open(path, 'w') as f:
4170 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004171
4172
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004173@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004174@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004175def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004176 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004177
4178 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004179 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004180 parser.add_option('-r', '--reverse', action='store_true',
4181 help='Lookup the branch(es) for the specified issues. If '
4182 'no issues are specified, all branches with mapped '
4183 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004184 parser.add_option('--json',
4185 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004186 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004187
dnj@chromium.org406c4402015-03-03 17:22:28 +00004188 if options.reverse:
4189 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004190 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004191 # Reverse issue lookup.
4192 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004193
4194 git_config = {}
4195 for config in RunGit(['config', '--get-regexp',
4196 r'branch\..*issue']).splitlines():
4197 name, _space, val = config.partition(' ')
4198 git_config[name] = val
4199
dnj@chromium.org406c4402015-03-03 17:22:28 +00004200 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004201 issue = git_config.get(
4202 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004203 if issue:
4204 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004205 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004206 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004207 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004208 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004209 try:
4210 issue_num = int(issue)
4211 except ValueError:
4212 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004213 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004214 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004215 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004216 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004217 if options.json:
4218 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004219 return 0
4220
4221 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004222 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004223 if not issue.valid:
4224 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4225 'or no argument to list it.\n'
4226 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004227 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004228 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004229 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004230 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004231 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4232 if options.json:
4233 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004234 'gerrit_host': cl.GetGerritHost(),
4235 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004236 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004237 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004238 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004239 return 0
4240
4241
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004242@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004243def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004244 """Shows or posts review comments for any changelist."""
4245 parser.add_option('-a', '--add-comment', dest='comment',
4246 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004247 parser.add_option('-p', '--publish', action='store_true',
4248 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004249 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004250 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004251 parser.add_option('-m', '--machine-readable', dest='readable',
4252 action='store_false', default=True,
4253 help='output comments in a format compatible with '
4254 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004255 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004256 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004257 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004258
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004259 issue = None
4260 if options.issue:
4261 try:
4262 issue = int(options.issue)
4263 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004264 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004265
Edward Lemur934836a2019-09-09 20:16:54 +00004266 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004267
4268 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004269 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004270 return 0
4271
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004272 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4273 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004274 for comment in summary:
4275 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004276 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004277 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004278 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004279 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004280 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004281 elif comment.autogenerated:
4282 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004283 else:
4284 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004285 print('\n%s%s %s%s\n%s' % (
4286 color,
4287 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4288 comment.sender,
4289 Fore.RESET,
4290 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4291
smut@google.comc85ac942015-09-15 16:34:43 +00004292 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004293 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004294 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004295 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4296 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004297 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004298 return 0
4299
4300
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004301@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004302@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004303def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004304 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004305 parser.add_option('-d', '--display', action='store_true',
4306 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004307 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004308 help='New description to set for this issue (- for stdin, '
4309 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004310 parser.add_option('-f', '--force', action='store_true',
4311 help='Delete any unpublished Gerrit edits for this issue '
4312 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004313
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004314 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004315
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004316 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004317 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004318 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004319 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004320 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004321
Edward Lemur934836a2019-09-09 20:16:54 +00004322 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004323 if target_issue_arg:
4324 kwargs['issue'] = target_issue_arg.issue
4325 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004326
4327 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004328 if not cl.GetIssue():
4329 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004330
Edward Lemur678a6842019-10-03 22:25:05 +00004331 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004332 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004333
Edward Lemur6c6827c2020-02-06 21:15:18 +00004334 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004335
smut@google.com34fb6b12015-07-13 20:03:26 +00004336 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004337 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004338 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004339
4340 if options.new_description:
4341 text = options.new_description
4342 if text == '-':
4343 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004344 elif text == '+':
4345 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004346 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004347
4348 description.set_description(text)
4349 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004350 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004351 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004352 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004353 return 0
4354
4355
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004356@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004357def CMDlint(parser, args):
4358 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004359 parser.add_option('--filter', action='append', metavar='-x,+y',
4360 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004361 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004362
4363 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004364 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004365 try:
4366 import cpplint
4367 import cpplint_chromium
4368 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004369 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004370 return 1
4371
4372 # Change the current working directory before calling lint so that it
4373 # shows the correct base.
4374 previous_cwd = os.getcwd()
4375 os.chdir(settings.GetRoot())
4376 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004377 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004378 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004379 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004380 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004381 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004382
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004383 # Process cpplint arguments, if any.
4384 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4385 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004386 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004387
Lei Zhang379d1ad2020-07-15 19:40:06 +00004388 include_regex = re.compile(settings.GetLintRegex())
4389 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004390 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4391 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004392 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004393 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004394 continue
4395
4396 if ignore_regex.match(filename):
4397 print('Ignoring file %s' % filename)
4398 continue
4399
4400 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4401 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004402 finally:
4403 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004404 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004405 if cpplint._cpplint_state.error_count != 0:
4406 return 1
4407 return 0
4408
4409
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004410@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004411def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004412 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004413 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004414 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004415 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004416 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004417 parser.add_option('--all', action='store_true',
4418 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004419 parser.add_option('--files',
4420 nargs=1,
4421 help='Semicolon-separated list of files to be marked as '
4422 'modified when executing presubmit or post-upload hooks. '
4423 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004424 parser.add_option('--parallel', action='store_true',
4425 help='Run all tests specified by input_api.RunTests in all '
4426 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004427 parser.add_option('--resultdb', action='store_true',
4428 help='Run presubmit checks in the ResultSink environment '
4429 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004430 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004431 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004432
sbc@chromium.org71437c02015-04-09 19:29:40 +00004433 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004434 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004435 return 1
4436
Edward Lemur934836a2019-09-09 20:16:54 +00004437 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004438 if args:
4439 base_branch = args[0]
4440 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004441 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004442 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004443
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004444 start = time.time()
4445 try:
4446 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4447 description = cl.FetchDescription()
4448 else:
4449 description = _create_description_from_log([base_branch])
4450 except Exception as e:
4451 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004452 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004453 elapsed = time.time() - start
4454 if elapsed > 5:
4455 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004456
Bruce Dawson13acea32022-05-03 22:13:08 +00004457 if not base_branch:
4458 if not options.force:
4459 print('use --force to check even when not on a branch.')
4460 return 1
4461 base_branch = 'HEAD'
4462
Josip Sokcevic017544d2022-03-31 23:47:53 +00004463 cl.RunHook(committing=not options.upload,
4464 may_prompt=False,
4465 verbose=options.verbose,
4466 parallel=options.parallel,
4467 upstream=base_branch,
4468 description=description,
4469 all_files=options.all,
4470 files=options.files,
4471 resultdb=options.resultdb,
4472 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004473 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004474
4475
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004476def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004477 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004478
4479 Works the same way as
4480 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4481 but can be called on demand on all platforms.
4482
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004483 The basic idea is to generate git hash of a state of the tree, original
4484 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004485 """
4486 lines = []
4487 tree_hash = RunGitSilent(['write-tree'])
4488 lines.append('tree %s' % tree_hash.strip())
4489 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4490 if code == 0:
4491 lines.append('parent %s' % parent.strip())
4492 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4493 lines.append('author %s' % author.strip())
4494 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4495 lines.append('committer %s' % committer.strip())
4496 lines.append('')
4497 # Note: Gerrit's commit-hook actually cleans message of some lines and
4498 # whitespace. This code is not doing this, but it clearly won't decrease
4499 # entropy.
4500 lines.append(message)
4501 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004502 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004503 return 'I%s' % change_hash.strip()
4504
4505
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004506def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004507 """Computes the remote branch ref to use for the CL.
4508
4509 Args:
4510 remote (str): The git remote for the CL.
4511 remote_branch (str): The git remote branch for the CL.
4512 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004513 """
4514 if not (remote and remote_branch):
4515 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004516
wittman@chromium.org455dc922015-01-26 20:15:50 +00004517 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004518 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004519 # refs, which are then translated into the remote full symbolic refs
4520 # below.
4521 if '/' not in target_branch:
4522 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4523 else:
4524 prefix_replacements = (
4525 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4526 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4527 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4528 )
4529 match = None
4530 for regex, replacement in prefix_replacements:
4531 match = re.search(regex, target_branch)
4532 if match:
4533 remote_branch = target_branch.replace(match.group(0), replacement)
4534 break
4535 if not match:
4536 # This is a branch path but not one we recognize; use as-is.
4537 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004538 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004539 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004540 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004541 # Handle the refs that need to land in different refs.
4542 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004543
wittman@chromium.org455dc922015-01-26 20:15:50 +00004544 # Create the true path to the remote branch.
4545 # Does the following translation:
4546 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004547 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004548 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4549 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4550 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4551 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4552 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4553 'refs/heads/')
4554 elif remote_branch.startswith('refs/remotes/branch-heads'):
4555 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004556
wittman@chromium.org455dc922015-01-26 20:15:50 +00004557 return remote_branch
4558
4559
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004560def cleanup_list(l):
4561 """Fixes a list so that comma separated items are put as individual items.
4562
4563 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4564 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4565 """
4566 items = sum((i.split(',') for i in l), [])
4567 stripped_items = (i.strip() for i in items)
4568 return sorted(filter(None, stripped_items))
4569
4570
Aaron Gable4db38df2017-11-03 14:59:07 -07004571@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004572@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004573def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004574 """Uploads the current changelist to codereview.
4575
4576 Can skip dependency patchset uploads for a branch by running:
4577 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004578 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004579 git config --unset branch.branch_name.skip-deps-uploads
4580 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004581
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004582 If the name of the checked out branch starts with "bug-" or "fix-" followed
4583 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004584 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004585
4586 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004587 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004588 [git-cl] add support for hashtags
4589 Foo bar: implement foo
4590 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004591 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004592 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4593 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004594 parser.add_option('--bypass-watchlists', action='store_true',
4595 dest='bypass_watchlists',
4596 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004597 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004598 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004599 parser.add_option('--message', '-m', dest='message',
4600 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004601 parser.add_option('-b', '--bug',
4602 help='pre-populate the bug number(s) for this issue. '
4603 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004604 parser.add_option('--message-file', dest='message_file',
4605 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004606 parser.add_option('--title', '-t', dest='title',
4607 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004608 parser.add_option('-T', '--skip-title', action='store_true',
4609 dest='skip_title',
4610 help='Use the most recent commit message as the title of '
4611 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004612 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004613 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004614 help='reviewer email addresses')
4615 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004616 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004617 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004618 parser.add_option('--hashtag', dest='hashtags',
4619 action='append', default=[],
4620 help=('Gerrit hashtag for new CL; '
4621 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004622 parser.add_option('-s',
4623 '--send-mail',
4624 '--send-email',
4625 dest='send_mail',
4626 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004627 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004628 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004629 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004630 metavar='TARGET',
4631 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004632 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004633 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004634 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004635 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004636 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004637 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004638 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004639 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4640 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004641 parser.add_option('-c',
4642 '--use-commit-queue',
4643 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004644 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004645 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004646 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004647 parser.add_option('-d', '--cq-dry-run',
4648 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004649 help='Send the patchset to do a CQ dry run right after '
4650 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004651 parser.add_option(
4652 '-q',
4653 '--cq-quick-run',
4654 action='store_true',
4655 default=False,
4656 help='Send the patchset to do a CQ quick run right after '
4657 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4658 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004659 parser.add_option('--set-bot-commit', action='store_true',
4660 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004661 parser.add_option('--preserve-tryjobs', action='store_true',
4662 help='instruct the CQ to let tryjobs running even after '
4663 'new patchsets are uploaded instead of canceling '
4664 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004665 parser.add_option('--dependencies', action='store_true',
4666 help='Uploads CLs of all the local branches that depend on '
4667 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004668 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4669 help='Sends your change to the CQ after an approval. Only '
4670 'works on repos that have the Auto-Submit label '
4671 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004672 parser.add_option('--parallel', action='store_true',
4673 help='Run all tests specified by input_api.RunTests in all '
4674 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004675 parser.add_option('--no-autocc', action='store_true',
4676 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004677 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004678 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004679 parser.add_option('-R', '--retry-failed', action='store_true',
4680 help='Retry failed tryjobs from old patchset immediately '
4681 'after uploading new patchset. Cannot be used with '
4682 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004683 parser.add_option('--fixed', '-x',
4684 help='List of bugs that will be commented on and marked '
4685 'fixed (pre-populates "Fixed:" tag). Same format as '
4686 '-b option / "Bug:" tag. If fixing several issues, '
4687 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004688 parser.add_option('--edit-description', action='store_true', default=False,
4689 help='Modify description before upload. Cannot be used '
4690 'with --force. It is a noop when --no-squash is set '
4691 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004692 parser.add_option('--git-completion-helper', action="store_true",
4693 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004694 parser.add_option('-o',
4695 '--push-options',
4696 action='append',
4697 default=[],
4698 help='Transmit the given string to the server when '
4699 'performing git push (pass-through). See git-push '
4700 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004701 parser.add_option('--no-add-changeid',
4702 action='store_true',
4703 dest='no_add_changeid',
4704 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004705 parser.add_option('--no-python2-post-upload-hooks',
4706 action='store_true',
4707 help='Only run post-upload hooks in Python 3.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004708 parser.add_option('--stacked-exp',
4709 action='store_true',
4710 help=optparse.SUPPRESS_HELP)
Joanna Wanga1abbed2023-01-24 01:41:05 +00004711 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004712
rmistry@google.com2dd99862015-06-22 12:22:18 +00004713 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004714 (options, args) = parser.parse_args(args)
4715
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004716 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004717 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4718 if opt.help != optparse.SUPPRESS_HELP))
4719 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004720
sbc@chromium.org71437c02015-04-09 19:29:40 +00004721 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004722 return 1
4723
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004724 options.reviewers = cleanup_list(options.reviewers)
4725 options.cc = cleanup_list(options.cc)
4726
Josipe827b0f2020-01-30 00:07:20 +00004727 if options.edit_description and options.force:
4728 parser.error('Only one of --force and --edit-description allowed')
4729
tandriib80458a2016-06-23 12:20:07 -07004730 if options.message_file:
4731 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004732 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004733 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004734
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004735 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004736 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004737 options.use_commit_queue,
4738 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004739 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4740 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004741
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004742 if options.skip_title and options.title:
4743 parser.error('Only one of --title and --skip-title allowed.')
4744
Aaron Gableedbc4132017-09-11 13:22:28 -07004745 if options.use_commit_queue:
4746 options.send_mail = True
4747
Edward Lesmes0dd54822020-03-26 18:24:25 +00004748 if options.squash is None:
4749 # Load default for user, repo, squash=true, in this order.
4750 options.squash = settings.GetSquashGerritUploads()
4751
Joanna Wang18de1f62023-01-21 01:24:24 +00004752 if options.stacked_exp:
4753 orig_args.remove('--stacked-exp')
4754
4755 UploadAllSquashed(options, orig_args)
4756 return 0
4757
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004758 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004759 # Warm change details cache now to avoid RPCs later, reducing latency for
4760 # developers.
4761 if cl.GetIssue():
4762 cl._GetChangeDetail(
4763 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4764
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004765 if options.retry_failed and not cl.GetIssue():
4766 print('No previous patchsets, so --retry-failed has no effect.')
4767 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004768
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004769 # cl.GetMostRecentPatchset uses cached information, and can return the last
4770 # patchset before upload. Calling it here makes it clear that it's the
4771 # last patchset before upload. Note that GetMostRecentPatchset will fail
4772 # if no CL has been uploaded yet.
4773 if options.retry_failed:
4774 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004775
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004776 ret = cl.CMDUpload(options, args, orig_args)
4777
4778 if options.retry_failed:
4779 if ret != 0:
4780 print('Upload failed, so --retry-failed has no effect.')
4781 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004782 builds, _ = _fetch_latest_builds(cl,
4783 DEFAULT_BUILDBUCKET_HOST,
4784 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004785 jobs = _filter_failed_for_retry(builds)
4786 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004787 print('No failed tryjobs, so --retry-failed has no effect.')
4788 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004789 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004790
4791 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004792
4793
Joanna Wang18de1f62023-01-21 01:24:24 +00004794def UploadAllSquashed(options, orig_args):
4795 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4796 """Uploads the current and upstream branches (if necessary)."""
4797 _cls, _cherry_pick_current = _UploadAllPrecheck(options, orig_args)
4798
4799 # TODO(b/265929888): parse cls and create commits.
4800
4801
4802def _UploadAllPrecheck(options, orig_args):
4803 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4804 """Checks the state of the tree and gives the user uploading options
4805
4806 Returns: A tuple of the ordered list of changes that have new commits
4807 since their last upload and a boolean of whether the user wants to
4808 cherry-pick and upload the current branch instead of uploading all cls.
4809 """
4810 branch_ref = None
4811 cls = []
4812 must_upload_upstream = False
4813
4814 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4815
4816 while True:
4817 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4818 DieWithError(
4819 'More than %s branches in the stack have not been uploaded.\n'
4820 'Are your branches in a misconfigured state?\n'
4821 'If not, please upload some upstream changes first.' %
4822 (_MAX_STACKED_BRANCHES_UPLOAD))
4823
4824 cl = Changelist(branchref=branch_ref)
4825 cls.append(cl)
4826
4827 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
4828 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4829 branch_ref = upstream_branch_ref # set branch for next run.
4830
4831 # Case 1: We've reached the beginning of the tree.
4832 if origin != '.':
4833 break
4834
4835 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
4836 upstream_branch,
4837 LAST_UPLOAD_HASH_CONFIG_KEY)
4838
4839 # Case 2: If any upstream branches have never been uploaded,
4840 # the user MUST upload them.
4841 if not upstream_last_upload:
4842 must_upload_upstream = True
4843 continue
4844
4845 base_commit = cl.GetCommonAncestorWithUpstream()
4846
4847 # Case 3: If upstream's last_upload == cl.base_commit we do
4848 # not need to upload any more upstreams from this point on.
4849 # (Even if there may be diverged branches higher up the tree)
4850 if base_commit == upstream_last_upload:
4851 break
4852
4853 # Case 4: If upstream's last_upload < cl.base_commit we are
4854 # uploading cl and upstream_cl.
4855 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004856 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00004857 continue
4858
4859 # Case 5: If cl.base_commit < upstream's last_upload the user
4860 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004861 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00004862 DieWithError(
4863 'At least one branch in the stack has diverged from its upstream '
4864 'branch and does not contain its upstream\'s last upload.\n'
4865 'Please rebase the stack with `git rebase-update` before uploading.')
4866
4867 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
4868 # any relation to commits in the tree. Continue up the tree until we hit
4869 # the root.
4870
4871 # We assume all cls in the stack have the same auth requirements and only
4872 # check this once.
4873 cls[0].EnsureAuthenticated(force=options.force)
4874
4875 cherry_pick = False
4876 if len(cls) > 1:
4877 message = ''
4878 if len(orig_args):
4879 message = ('options %s will be used for all uploads.\n' % orig_args)
4880 if must_upload_upstream:
4881 confirm_or_exit('\n' + message +
4882 'There are upstream branches that must be uploaded.\n')
4883 else:
4884 answer = gclient_utils.AskForData(
4885 '\n' + message +
4886 'Press enter to update branches %s.\nOr type `n` to upload only '
4887 '`%s` cherry-picked on %s\'s last upload:' %
4888 ([cl.branch for cl in cls], cls[0].branch, cls[1].branch))
4889 if answer.lower() == 'n':
4890 cherry_pick = True
4891 return cls, cherry_pick
4892
4893
Francois Dorayd42c6812017-05-30 15:10:20 -04004894@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004895@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004896def CMDsplit(parser, args):
4897 """Splits a branch into smaller branches and uploads CLs.
4898
4899 Creates a branch and uploads a CL for each group of files modified in the
4900 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004901 comment, the string '$directory', is replaced with the directory containing
4902 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004903 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004904 parser.add_option('-d', '--description', dest='description_file',
4905 help='A text file containing a CL description in which '
4906 '$directory will be replaced by each CL\'s directory.')
4907 parser.add_option('-c', '--comment', dest='comment_file',
4908 help='A text file containing a CL comment.')
4909 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004910 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004911 help='List the files and reviewers for each CL that would '
4912 'be created, but don\'t create branches or CLs.')
4913 parser.add_option('--cq-dry-run', action='store_true',
4914 help='If set, will do a cq dry run for each uploaded CL. '
4915 'Please be careful when doing this; more than ~10 CLs '
4916 'has the potential to overload our build '
4917 'infrastructure. Try to upload these not during high '
4918 'load times (usually 11-3 Mountain View time). Email '
4919 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004920 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4921 default=True,
4922 help='Sends your change to the CQ after an approval. Only '
4923 'works on repos that have the Auto-Submit label '
4924 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00004925 parser.add_option('--max-depth',
4926 type='int',
4927 default=0,
4928 help='The max depth to look for OWNERS files. Useful for '
4929 'controlling the granularity of the split CLs, e.g. '
4930 '--max-depth=1 will only split by top-level '
4931 'directory. Specifying a value less than 1 means no '
4932 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04004933 options, _ = parser.parse_args(args)
4934
4935 if not options.description_file:
4936 parser.error('No --description flag specified.')
4937
4938 def WrappedCMDupload(args):
4939 return CMDupload(OptionParser(), args)
4940
Daniel Cheng403c44e2022-10-05 22:24:58 +00004941 return split_cl.SplitCl(options.description_file, options.comment_file,
4942 Changelist, WrappedCMDupload, options.dry_run,
4943 options.cq_dry_run, options.enable_auto_submit,
4944 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004945
4946
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004947@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004948@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004949def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004950 """DEPRECATED: Used to commit the current changelist via git-svn."""
4951 message = ('git-cl no longer supports committing to SVN repositories via '
4952 'git-svn. You probably want to use `git cl land` instead.')
4953 print(message)
4954 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004955
4956
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004957@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004958@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004959def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004960 """Commits the current changelist via git.
4961
4962 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4963 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004964 """
4965 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4966 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004967 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004968 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004969 parser.add_option('--parallel', action='store_true',
4970 help='Run all tests specified by input_api.RunTests in all '
4971 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004972 parser.add_option('--resultdb', action='store_true',
4973 help='Run presubmit checks in the ResultSink environment '
4974 'and send results to the ResultDB database.')
4975 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004976 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004977
Edward Lemur934836a2019-09-09 20:16:54 +00004978 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004979
Robert Iannucci2e73d432018-03-14 01:10:47 -07004980 if not cl.GetIssue():
4981 DieWithError('You must upload the change first to Gerrit.\n'
4982 ' If you would rather have `git cl land` upload '
4983 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004984 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4985 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004986
4987
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004988@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004989@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004990def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004991 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004992 parser.add_option('-b', dest='newbranch',
4993 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004994 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004995 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004996 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004997 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004998
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004999 group = optparse.OptionGroup(
5000 parser,
5001 'Options for continuing work on the current issue uploaded from a '
5002 'different clone (e.g. different machine). Must be used independently '
5003 'from the other options. No issue number should be specified, and the '
5004 'branch must have an issue number associated with it')
5005 group.add_option('--reapply', action='store_true', dest='reapply',
5006 help='Reset the branch and reapply the issue.\n'
5007 'CAUTION: This will undo any local changes in this '
5008 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005009
5010 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005011 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005012 parser.add_option_group(group)
5013
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005014 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005015
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005016 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005017 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005018 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005019 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005020 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005021
Edward Lemur934836a2019-09-09 20:16:54 +00005022 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005023 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005024 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005025
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005026 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005027 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005028 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005029
5030 RunGit(['reset', '--hard', upstream])
5031 if options.pull:
5032 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005033
Edward Lemur678a6842019-10-03 22:25:05 +00005034 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005035 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
5036 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005037
5038 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005039 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005040
Edward Lemurf38bc172019-09-03 21:02:13 +00005041 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005042 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005043 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005044
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005045 # We don't want uncommitted changes mixed up with the patch.
5046 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005047 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005048
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005049 if options.newbranch:
5050 if options.force:
5051 RunGit(['branch', '-D', options.newbranch],
5052 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005053 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005054
Edward Lemur678a6842019-10-03 22:25:05 +00005055 cl = Changelist(
5056 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005057
Edward Lemur678a6842019-10-03 22:25:05 +00005058 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005059 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005060
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005061 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5062 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005063
5064
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005065def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005066 """Fetches the tree status and returns either 'open', 'closed',
5067 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005068 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005069 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005070 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005071 if status.find('closed') != -1 or status == '0':
5072 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005073
5074 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005075 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005076
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005077 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005078 return 'unset'
5079
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005080
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005081def GetTreeStatusReason():
5082 """Fetches the tree status from a json url and returns the message
5083 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005084 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005085 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005086 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005087 status = json.loads(connection.read())
5088 connection.close()
5089 return status['message']
5090
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005091
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005092@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005093def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005094 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005095 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005096 status = GetTreeStatus()
5097 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005098 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005099 return 2
5100
vapiera7fbd5a2016-06-16 09:17:49 -07005101 print('The tree is %s' % status)
5102 print()
5103 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005104 if status != 'open':
5105 return 1
5106 return 0
5107
5108
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005109@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005110def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005111 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5112 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005113 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005114 '-b', '--bot', action='append',
5115 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5116 'times to specify multiple builders. ex: '
5117 '"-b win_rel -b win_layout". See '
5118 'the try server waterfall for the builders name and the tests '
5119 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005120 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005121 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005122 help=('Buildbucket bucket to send the try requests. Format: '
5123 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005124 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005125 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005126 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005127 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005128 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005129 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005130 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005131 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005132 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005133 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005134 '-q',
5135 '--quick-run',
5136 action='store_true',
5137 default=False,
5138 help='trigger in quick run mode '
5139 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5140 'uick_run.md) (chromium only).')
5141 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005142 '--category', default='git_cl_try', help='Specify custom build category.')
5143 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005144 '--project',
5145 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005146 'in recipe to determine to which repository or directory to '
5147 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005148 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005149 '-p', '--property', dest='properties', action='append', default=[],
5150 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005151 'key2=value2 etc. The value will be treated as '
5152 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005153 'NOTE: using this may make your tryjob not usable for CQ, '
5154 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005155 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005156 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5157 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005158 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005159 parser.add_option(
5160 '-R', '--retry-failed', action='store_true', default=False,
5161 help='Retry failed jobs from the latest set of tryjobs. '
5162 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005163 parser.add_option(
5164 '-i', '--issue', type=int,
5165 help='Operate on this issue instead of the current branch\'s implicit '
5166 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005167 options, args = parser.parse_args(args)
5168
machenbach@chromium.org45453142015-09-15 08:45:22 +00005169 # Make sure that all properties are prop=value pairs.
5170 bad_params = [x for x in options.properties if '=' not in x]
5171 if bad_params:
5172 parser.error('Got properties with missing "=": %s' % bad_params)
5173
maruel@chromium.org15192402012-09-06 12:38:29 +00005174 if args:
5175 parser.error('Unknown arguments: %s' % args)
5176
Edward Lemur934836a2019-09-09 20:16:54 +00005177 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005178 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005179 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005180
Edward Lemurf38bc172019-09-03 21:02:13 +00005181 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005182 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005183
tandriie113dfd2016-10-11 10:20:12 -07005184 error_message = cl.CannotTriggerTryJobReason()
5185 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005186 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005187
Edward Lemur45768512020-03-02 19:03:14 +00005188 if options.bot:
5189 if options.retry_failed:
5190 parser.error('--bot is not compatible with --retry-failed.')
5191 if not options.bucket:
5192 parser.error('A bucket (e.g. "chromium/try") is required.')
5193
5194 triggered = [b for b in options.bot if 'triggered' in b]
5195 if triggered:
5196 parser.error(
5197 'Cannot schedule builds on triggered bots: %s.\n'
5198 'This type of bot requires an initial job from a parent (usually a '
5199 'builder). Schedule a job on the parent instead.\n' % triggered)
5200
5201 if options.bucket.startswith('.master'):
5202 parser.error('Buildbot masters are not supported.')
5203
5204 project, bucket = _parse_bucket(options.bucket)
5205 if project is None or bucket is None:
5206 parser.error('Invalid bucket: %s.' % options.bucket)
5207 jobs = sorted((project, bucket, bot) for bot in options.bot)
5208 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005209 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005210 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005211 if options.verbose:
5212 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005213 jobs = _filter_failed_for_retry(builds)
5214 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005215 print('There are no failed jobs in the latest set of jobs '
5216 '(patchset #%d), doing nothing.' % patchset)
5217 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005218 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005219 if num_builders > 10:
5220 confirm_or_exit('There are %d builders with failed builds.'
5221 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005222 elif options.quick_run:
5223 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5224 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005225 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005226 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005227 print('git cl try with no bots now defaults to CQ dry run.')
5228 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5229 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005230
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005231 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005232 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005233 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005234 except BuildbucketResponseException as ex:
5235 print('ERROR: %s' % ex)
5236 return 1
5237 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005238
5239
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005240@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005241def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005242 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005243 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005244 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005245 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005246 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005247 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005248 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005249 '--color', action='store_true', default=setup_color.IS_TTY,
5250 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005251 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005252 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5253 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005254 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005255 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005256 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005257 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005258 parser.add_option(
5259 '-i', '--issue', type=int,
5260 help='Operate on this issue instead of the current branch\'s implicit '
5261 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005262 options, args = parser.parse_args(args)
5263 if args:
5264 parser.error('Unrecognized args: %s' % ' '.join(args))
5265
Edward Lemur934836a2019-09-09 20:16:54 +00005266 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005267 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005268 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005269
tandrii221ab252016-10-06 08:12:04 -07005270 patchset = options.patchset
5271 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005272 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005273 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005274 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005275 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005276 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005277 cl.GetIssue())
5278
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005279 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005280 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005281 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005282 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005283 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005284 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005285 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005286 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005287 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005288 return 0
5289
5290
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005291@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005292@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005293def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005294 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005295 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005296 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005297 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005298
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005299 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005300 if args:
5301 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005302 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005303 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005304 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005305 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005306
5307 # Clear configured merge-base, if there is one.
5308 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005309 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005310 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005311 return 0
5312
5313
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005314@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005315def CMDweb(parser, args):
5316 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005317 parser.add_option('-p',
5318 '--print-only',
5319 action='store_true',
5320 dest='print_only',
5321 help='Only print the Gerrit URL, don\'t open it in the '
5322 'browser.')
5323 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005324 if args:
5325 parser.error('Unrecognized args: %s' % ' '.join(args))
5326
5327 issue_url = Changelist().GetIssueURL()
5328 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005329 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005330 return 1
5331
Orr Bernstein0b960582022-12-22 20:16:18 +00005332 if options.print_only:
5333 print(issue_url)
5334 return 0
5335
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005336 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005337 # allows us to hide the "Created new window in existing browser session."
5338 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005339 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005340 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005341 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005342 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005343 os.open(os.devnull, os.O_RDWR)
5344 try:
5345 webbrowser.open(issue_url)
5346 finally:
5347 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005348 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005349 return 0
5350
5351
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005352@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005353def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005354 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005355 parser.add_option('-d', '--dry-run', action='store_true',
5356 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005357 parser.add_option(
5358 '-q',
5359 '--quick-run',
5360 action='store_true',
5361 help='trigger in quick run mode '
5362 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5363 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005364 parser.add_option('-c', '--clear', action='store_true',
5365 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005366 parser.add_option(
5367 '-i', '--issue', type=int,
5368 help='Operate on this issue instead of the current branch\'s implicit '
5369 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005370 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005371 if args:
5372 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005373 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5374 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005375
Edward Lemur934836a2019-09-09 20:16:54 +00005376 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005377 if not cl.GetIssue():
5378 parser.error('Must upload the issue first.')
5379
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005380 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005381 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005382 elif options.quick_run:
5383 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005384 elif options.dry_run:
5385 state = _CQState.DRY_RUN
5386 else:
5387 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005388 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005389 return 0
5390
5391
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005392@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005393def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005394 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005395 parser.add_option(
5396 '-i', '--issue', type=int,
5397 help='Operate on this issue instead of the current branch\'s implicit '
5398 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005399 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005400 if args:
5401 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005402 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005403 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005404 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005405 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005406 cl.CloseIssue()
5407 return 0
5408
5409
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005410@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005411def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005412 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005413 parser.add_option(
5414 '--stat',
5415 action='store_true',
5416 dest='stat',
5417 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005418 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005419 if args:
5420 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005421
Edward Lemur934836a2019-09-09 20:16:54 +00005422 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005423 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005424 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005425 if not issue:
5426 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005427
Gavin Makbe2e9262022-11-08 23:41:55 +00005428 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005429 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005430 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005431 if not base:
5432 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5433 revision_info = detail['revisions'][detail['current_revision']]
5434 fetch_info = revision_info['fetch']['http']
5435 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5436 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005437
Aaron Gablea718c3e2017-08-28 17:47:28 -07005438 cmd = ['git', 'diff']
5439 if options.stat:
5440 cmd.append('--stat')
5441 cmd.append(base)
5442 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005443
5444 return 0
5445
5446
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005447@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005448def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005449 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005450 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005451 '--ignore-current',
5452 action='store_true',
5453 help='Ignore the CL\'s current reviewers and start from scratch.')
5454 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005455 '--ignore-self',
5456 action='store_true',
5457 help='Do not consider CL\'s author as an owners.')
5458 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005459 '--no-color',
5460 action='store_true',
5461 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005462 parser.add_option(
5463 '--batch',
5464 action='store_true',
5465 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005466 # TODO: Consider moving this to another command, since other
5467 # git-cl owners commands deal with owners for a given CL.
5468 parser.add_option(
5469 '--show-all',
5470 action='store_true',
5471 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005472 options, args = parser.parse_args(args)
5473
Edward Lemur934836a2019-09-09 20:16:54 +00005474 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005475 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005476
Yang Guo6e269a02019-06-26 11:17:02 +00005477 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005478 if len(args) == 0:
5479 print('No files specified for --show-all. Nothing to do.')
5480 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005481 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005482 for path in args:
5483 print('Owners for %s:' % path)
5484 print('\n'.join(
5485 ' - %s' % owner
5486 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005487 return 0
5488
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005489 if args:
5490 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005491 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005492 base_branch = args[0]
5493 else:
5494 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005495 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005496
Edward Lemur2c62b332020-03-12 22:12:33 +00005497 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005498
5499 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005500 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5501 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005502 return 0
5503
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005504 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005505 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005506 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005507 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005508 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005509 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005510 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005511
5512
Aiden Bennerc08566e2018-10-03 17:52:42 +00005513def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005514 """Generates a diff command."""
5515 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005516 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5517
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005518 if allow_prefix:
5519 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5520 # case that diff.noprefix is set in the user's git config.
5521 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5522 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005523 diff_cmd += ['--no-prefix']
5524
5525 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005526
5527 if args:
5528 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005529 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005530 diff_cmd.append(arg)
5531 else:
5532 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005533
5534 return diff_cmd
5535
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005536
Jamie Madill5e96ad12020-01-13 16:08:35 +00005537def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5538 """Runs clang-format-diff and sets a return value if necessary."""
5539
5540 if not clang_diff_files:
5541 return 0
5542
5543 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5544 # formatted. This is used to block during the presubmit.
5545 return_value = 0
5546
5547 # Locate the clang-format binary in the checkout
5548 try:
5549 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5550 except clang_format.NotFoundError as e:
5551 DieWithError(e)
5552
5553 if opts.full or settings.GetFormatFullByDefault():
5554 cmd = [clang_format_tool]
5555 if not opts.dry_run and not opts.diff:
5556 cmd.append('-i')
5557 if opts.dry_run:
5558 for diff_file in clang_diff_files:
5559 with open(diff_file, 'r') as myfile:
5560 code = myfile.read().replace('\r\n', '\n')
5561 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5562 stdout = stdout.replace('\r\n', '\n')
5563 if opts.diff:
5564 sys.stdout.write(stdout)
5565 if code != stdout:
5566 return_value = 2
5567 else:
5568 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5569 if opts.diff:
5570 sys.stdout.write(stdout)
5571 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005572 try:
5573 script = clang_format.FindClangFormatScriptInChromiumTree(
5574 'clang-format-diff.py')
5575 except clang_format.NotFoundError as e:
5576 DieWithError(e)
5577
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005578 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005579 if not opts.dry_run and not opts.diff:
5580 cmd.append('-i')
5581
5582 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005583 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005584
Edward Lesmes89624cd2020-04-06 17:51:56 +00005585 env = os.environ.copy()
5586 env['PATH'] = (
5587 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5588 stdout = RunCommand(
5589 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005590 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005591 if opts.diff:
5592 sys.stdout.write(stdout)
5593 if opts.dry_run and len(stdout) > 0:
5594 return_value = 2
5595
5596 return return_value
5597
5598
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005599def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5600 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5601 presubmit checks have failed (and returns 0 otherwise)."""
5602
5603 if not rust_diff_files:
5604 return 0
5605
5606 # Locate the rustfmt binary.
5607 try:
5608 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5609 except rustfmt.NotFoundError as e:
5610 DieWithError(e)
5611
5612 # TODO(crbug.com/1231317): Support formatting only the changed lines
5613 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5614 # https://github.com/emilio/rustfmt-format-diff
5615 cmd = [rustfmt_tool]
5616 if opts.dry_run:
5617 cmd.append('--check')
5618 cmd += rust_diff_files
5619 rustfmt_exitcode = subprocess2.call(cmd)
5620
5621 if opts.presubmit and rustfmt_exitcode != 0:
5622 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005623
5624 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005625
5626
Olivier Robin0a6b5442022-04-07 07:25:04 +00005627def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5628 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5629 that presubmit checks have failed (and returns 0 otherwise)."""
5630
5631 if not swift_diff_files:
5632 return 0
5633
5634 # Locate the swift-format binary.
5635 try:
5636 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5637 except swift_format.NotFoundError as e:
5638 DieWithError(e)
5639
5640 cmd = [swift_format_tool]
5641 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005642 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005643 else:
5644 cmd += ['format', '-i']
5645 cmd += swift_diff_files
5646 swift_format_exitcode = subprocess2.call(cmd)
5647
5648 if opts.presubmit and swift_format_exitcode != 0:
5649 return 2
5650
5651 return 0
5652
5653
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005654def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005655 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005656 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005657
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005658
enne@chromium.org555cfe42014-01-29 18:21:39 +00005659@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005660@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005661def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005662 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005663 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005664 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005665 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005666 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005667 parser.add_option('--full', action='store_true',
5668 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005669 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005670 parser.add_option('--dry-run', action='store_true',
5671 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005672 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005673 '--no-clang-format',
5674 dest='clang_format',
5675 action='store_false',
5676 default=True,
5677 help='Disables formatting of various file types using clang-format.')
5678 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005679 '--python',
5680 action='store_true',
5681 default=None,
5682 help='Enables python formatting on all python files.')
5683 parser.add_option(
5684 '--no-python',
5685 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005686 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005687 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005688 'If neither --python or --no-python are set, python files that have a '
5689 '.style.yapf file in an ancestor directory will be formatted. '
5690 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005691 parser.add_option(
5692 '--js',
5693 action='store_true',
5694 help='Format javascript code with clang-format. '
5695 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005696 parser.add_option('--diff', action='store_true',
5697 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005698 parser.add_option('--presubmit', action='store_true',
5699 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005700
5701 parser.add_option('--rust-fmt',
5702 dest='use_rust_fmt',
5703 action='store_true',
5704 default=rustfmt.IsRustfmtSupported(),
5705 help='Enables formatting of Rust file types using rustfmt.')
5706 parser.add_option(
5707 '--no-rust-fmt',
5708 dest='use_rust_fmt',
5709 action='store_false',
5710 help='Disables formatting of Rust file types using rustfmt.')
5711
Olivier Robin0a6b5442022-04-07 07:25:04 +00005712 parser.add_option(
5713 '--swift-format',
5714 dest='use_swift_format',
5715 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005716 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005717 help='Enables formatting of Swift file types using swift-format '
5718 '(macOS host only).')
5719 parser.add_option(
5720 '--no-swift-format',
5721 dest='use_swift_format',
5722 action='store_false',
5723 help='Disables formatting of Swift file types using swift-format.')
5724
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005725 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005726
Garrett Beaty91a6f332020-01-06 16:57:24 +00005727 if opts.python is not None and opts.no_python:
5728 raise parser.error('Cannot set both --python and --no-python')
5729 if opts.no_python:
5730 opts.python = False
5731
Daniel Chengc55eecf2016-12-30 03:11:02 -08005732 # Normalize any remaining args against the current path, so paths relative to
5733 # the current directory are still resolved as expected.
5734 args = [os.path.join(os.getcwd(), arg) for arg in args]
5735
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005736 # git diff generates paths against the root of the repository. Change
5737 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005738 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005739 if rel_base_path:
5740 os.chdir(rel_base_path)
5741
digit@chromium.org29e47272013-05-17 17:01:46 +00005742 # Grab the merge-base commit, i.e. the upstream commit of the current
5743 # branch when it was created or the last time it was rebased. This is
5744 # to cover the case where the user may have called "git fetch origin",
5745 # moving the origin branch to a newer commit, but hasn't rebased yet.
5746 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005747 upstream_branch = opts.upstream
5748 if not upstream_branch:
5749 cl = Changelist()
5750 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005751 if upstream_branch:
5752 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5753 upstream_commit = upstream_commit.strip()
5754
5755 if not upstream_commit:
5756 DieWithError('Could not find base commit for this branch. '
5757 'Are you in detached state?')
5758
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005759 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5760 diff_output = RunGit(changed_files_cmd)
5761 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005762 # Filter out files deleted by this CL
5763 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005764
Andreas Haas417d89c2020-02-06 10:24:27 +00005765 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005766 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005767
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005768 clang_diff_files = []
5769 if opts.clang_format:
5770 clang_diff_files = [
5771 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5772 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005773 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005774 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005775 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005776 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005777
Edward Lesmes50da7702020-03-30 19:23:43 +00005778 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005779
Jamie Madill5e96ad12020-01-13 16:08:35 +00005780 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5781 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005782
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005783 if opts.use_rust_fmt:
5784 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5785 upstream_commit)
5786 if rust_fmt_return_value == 2:
5787 return_value = 2
5788
Olivier Robin0a6b5442022-04-07 07:25:04 +00005789 if opts.use_swift_format:
5790 if sys.platform != 'darwin':
5791 DieWithError('swift-format is only supported on macOS.')
5792 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5793 upstream_commit)
5794 if swift_format_return_value == 2:
5795 return_value = 2
5796
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005797 # Similar code to above, but using yapf on .py files rather than clang-format
5798 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005799 py_explicitly_disabled = opts.python is not None and not opts.python
5800 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005801 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5802 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005803
Aiden Bennerc08566e2018-10-03 17:52:42 +00005804 # Used for caching.
5805 yapf_configs = {}
5806 for f in python_diff_files:
5807 # Find the yapf style config for the current file, defaults to depot
5808 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005809 _FindYapfConfigFile(f, yapf_configs, top_dir)
5810
5811 # Turn on python formatting by default if a yapf config is specified.
5812 # This breaks in the case of this repo though since the specified
5813 # style file is also the global default.
5814 if opts.python is None:
5815 filtered_py_files = []
5816 for f in python_diff_files:
5817 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5818 filtered_py_files.append(f)
5819 else:
5820 filtered_py_files = python_diff_files
5821
5822 # Note: yapf still seems to fix indentation of the entire file
5823 # even if line ranges are specified.
5824 # See https://github.com/google/yapf/issues/499
5825 if not opts.full and filtered_py_files:
5826 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5827
Brian Sheedyb4307d52019-12-02 19:18:17 +00005828 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5829 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5830 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005831
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005832 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005833 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5834 # Default to pep8 if not .style.yapf is found.
5835 if not yapf_style:
5836 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005837
Peter Wend9399922020-06-17 17:33:49 +00005838 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005839 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005840 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005841 else:
5842 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005843
5844 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005845
5846 has_formattable_lines = False
5847 if not opts.full:
5848 # Only run yapf over changed line ranges.
5849 for diff_start, diff_len in py_line_diffs[f]:
5850 diff_end = diff_start + diff_len - 1
5851 # Yapf errors out if diff_end < diff_start but this
5852 # is a valid line range diff for a removal.
5853 if diff_end >= diff_start:
5854 has_formattable_lines = True
5855 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5856 # If all line diffs were removals we have nothing to format.
5857 if not has_formattable_lines:
5858 continue
5859
5860 if opts.diff or opts.dry_run:
5861 cmd += ['--diff']
5862 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005863 stdout = RunCommand(cmd,
5864 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005865 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005866 cwd=top_dir,
5867 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005868 if opts.diff:
5869 sys.stdout.write(stdout)
5870 elif len(stdout) > 0:
5871 return_value = 2
5872 else:
5873 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005874 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005875
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005876 # Format GN build files. Always run on full build files for canonical form.
5877 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005878 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005879 if opts.dry_run or opts.diff:
5880 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005881 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005882 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005883 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005884 cwd=top_dir)
5885 if opts.dry_run and gn_ret == 2:
5886 return_value = 2 # Not formatted.
5887 elif opts.diff and gn_ret == 2:
5888 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005889 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005890 elif gn_ret != 0:
5891 # For non-dry run cases (and non-2 return values for dry-run), a
5892 # nonzero error code indicates a failure, probably because the file
5893 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005894 DieWithError('gn format failed on ' + gn_diff_file +
5895 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005896
Ilya Shermane081cbe2017-08-15 17:51:04 -07005897 # Skip the metrics formatting from the global presubmit hook. These files have
5898 # a separate presubmit hook that issues an error if the files need formatting,
5899 # whereas the top-level presubmit script merely issues a warning. Formatting
5900 # these files is somewhat slow, so it's important not to duplicate the work.
5901 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005902 for diff_xml in GetDiffXMLs(diff_files):
5903 xml_dir = GetMetricsDir(diff_xml)
5904 if not xml_dir:
5905 continue
5906
Ilya Shermane081cbe2017-08-15 17:51:04 -07005907 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005908 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00005909 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005910
5911 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5912 # command as histograms/pretty_print.py now needs a relative path argument
5913 # after splitting the histograms into multiple directories.
5914 # For example, in tools/metrics/ukm, pretty-print could be run using:
5915 # $ python pretty_print.py
5916 # But in tools/metrics/histogrmas, pretty-print should be run with an
5917 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005918 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005919 # $ python pretty_print.py enums.xml
5920
Weilun Shib92c4b72020-08-27 17:45:11 +00005921 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00005922 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005923 cmd.append(diff_xml)
5924
Ilya Shermane081cbe2017-08-15 17:51:04 -07005925 if opts.dry_run or opts.diff:
5926 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005927
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005928 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5929 # `shell` param and instead replace `'vpython'` with
5930 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005931 stdout = RunCommand(cmd,
5932 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005933 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005934 if opts.diff:
5935 sys.stdout.write(stdout)
5936 if opts.dry_run and stdout:
5937 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005938
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005939 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005940
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005941
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005942def GetDiffXMLs(diff_files):
5943 return [
5944 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5945 ]
5946
5947
5948def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005949 metrics_xml_dirs = [
5950 os.path.join('tools', 'metrics', 'actions'),
5951 os.path.join('tools', 'metrics', 'histograms'),
5952 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005953 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005954 os.path.join('tools', 'metrics', 'ukm'),
5955 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005956 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005957 if diff_xml.startswith(xml_dir):
5958 return xml_dir
5959 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005960
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005961
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005962@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005963@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005964def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005965 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005966 _, args = parser.parse_args(args)
5967
5968 if len(args) != 1:
5969 parser.print_help()
5970 return 1
5971
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005972 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005973 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005974 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005975
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005976 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005977
Edward Lemur52969c92020-02-06 18:15:28 +00005978 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005979 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005980 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005981
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005982 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005983 for key, issue in [x.split() for x in output.splitlines()]:
5984 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005985 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005986
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005987 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005988 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005989 return 1
5990 if len(branches) == 1:
5991 RunGit(['checkout', branches[0]])
5992 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005993 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005994 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005995 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005996 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005997 try:
5998 RunGit(['checkout', branches[int(which)]])
5999 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006000 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006001 return 1
6002
6003 return 0
6004
6005
maruel@chromium.org29404b52014-09-08 22:58:00 +00006006def CMDlol(parser, args):
6007 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006008 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006009 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6010 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6011 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006012 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006013 return 0
6014
6015
Josip Sokcevic0399e172022-03-21 23:11:51 +00006016def CMDversion(parser, args):
6017 import utils
6018 print(utils.depot_tools_version())
6019
6020
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006021class OptionParser(optparse.OptionParser):
6022 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006023
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006024 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006025 optparse.OptionParser.__init__(
6026 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006027 self.add_option(
6028 '-v', '--verbose', action='count', default=0,
6029 help='Use 2 times for more debugging info')
6030
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006031 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006032 try:
6033 return self._parse_args(args)
6034 finally:
6035 # Regardless of success or failure of args parsing, we want to report
6036 # metrics, but only after logging has been initialized (if parsing
6037 # succeeded).
6038 global settings
6039 settings = Settings()
6040
Edward Lesmes9c349062021-05-06 20:02:39 +00006041 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006042 # GetViewVCUrl ultimately calls logging method.
6043 project_url = settings.GetViewVCUrl().strip('/+')
6044 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6045 metrics.collector.add('project_urls', [project_url])
6046
6047 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006048 # Create an optparse.Values object that will store only the actual passed
6049 # options, without the defaults.
6050 actual_options = optparse.Values()
6051 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6052 # Create an optparse.Values object with the default options.
6053 options = optparse.Values(self.get_default_values().__dict__)
6054 # Update it with the options passed by the user.
6055 options._update_careful(actual_options.__dict__)
6056 # Store the options passed by the user in an _actual_options attribute.
6057 # We store only the keys, and not the values, since the values can contain
6058 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006059 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006060
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006061 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006062 logging.basicConfig(
6063 level=levels[min(options.verbose, len(levels) - 1)],
6064 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6065 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006066
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006067 return options, args
6068
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006069
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006070def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006071 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006072 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006073 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006074 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006075
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006076 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006077 dispatcher = subcommand.CommandDispatcher(__name__)
6078 try:
6079 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006080 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006081 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006082 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006083 if e.code != 500:
6084 raise
6085 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006086 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006087 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006088 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006089
6090
6091if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006092 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6093 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006094 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006095 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006096 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006097 sys.exit(main(sys.argv[1:]))