blob: 29c03267c641496eeba869ddaa7fac43eeac0707 [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 Wang6215dd02023-02-07 15:58:03 +00001004# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001005_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001006 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wange8523912023-01-21 02:05:40 +00001007 'change_desc'
1008])
1009
1010
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001011class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001012 """Changelist works with one changelist in local branch.
1013
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001014 Notes:
1015 * Not safe for concurrent multi-{thread,process} use.
1016 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001017 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001018 """
1019
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001020 def __init__(self,
1021 branchref=None,
1022 issue=None,
1023 codereview_host=None,
1024 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001025 """Create a new ChangeList instance.
1026
Edward Lemurf38bc172019-09-03 21:02:13 +00001027 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001028 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001030 global settings
1031 if not settings:
1032 # Happens when git_cl.py is used as a utility library.
1033 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001034
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001035 self.branchref = branchref
1036 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001037 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001038 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001039 else:
1040 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001041 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001042 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001043 self.lookedup_issue = False
1044 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001045 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001046 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001048 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001049 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001050 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001051 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001052
Edward Lemur125d60a2019-09-13 18:25:41 +00001053 # Lazily cached values.
1054 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1055 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001056 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001057 # Map from change number (issue) to its detail cache.
1058 self._detail_cache = {}
1059
1060 if codereview_host is not None:
1061 assert not codereview_host.startswith('https://'), codereview_host
1062 self._gerrit_host = codereview_host
1063 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001064
Edward Lesmese1576912021-02-16 21:53:34 +00001065 @property
1066 def owners_client(self):
1067 if self._owners_client is None:
1068 remote, remote_branch = self.GetRemoteBranch()
1069 branch = GetTargetRef(remote, remote_branch, None)
1070 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001071 host=self.GetGerritHost(),
1072 project=self.GetGerritProject(),
1073 branch=branch)
1074 return self._owners_client
1075
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001076 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001077 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001078
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001079 The return value is a string suitable for passing to git cl with the --cc
1080 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001081 """
1082 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001083 base_cc = settings.GetDefaultCCList()
1084 more_cc = ','.join(self.more_cc)
1085 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001086 return self.cc
1087
Daniel Cheng7227d212017-11-17 08:12:37 -08001088 def ExtendCC(self, more_cc):
1089 """Extends the list of users to cc on this CL based on the changed files."""
1090 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001091
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001092 def GetCommitDate(self):
1093 """Returns the commit date as provided in the constructor"""
1094 return self.commit_date
1095
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001096 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001097 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001099 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001100 if not branchref:
1101 return None
1102 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001103 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001104 return self.branch
1105
1106 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001107 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108 self.GetBranch() # Poke the lazy loader.
1109 return self.branchref
1110
Edward Lemur85153282020-02-14 22:06:29 +00001111 def _GitGetBranchConfigValue(self, key, default=None):
1112 return scm.GIT.GetBranchConfig(
1113 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001114
Edward Lemur85153282020-02-14 22:06:29 +00001115 def _GitSetBranchConfigValue(self, key, value):
1116 action = 'set %s to %r' % (key, value)
1117 if not value:
1118 action = 'unset %s' % key
1119 assert self.GetBranch(), 'a branch is needed to ' + action
1120 return scm.GIT.SetBranchConfig(
1121 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001122
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001123 @staticmethod
1124 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001125 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001126 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001127 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001128 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1129 settings.GetRoot(), branch)
1130 if not remote or not upstream_branch:
1131 DieWithError(
1132 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001133 'Verify this branch is set up to track another \n'
1134 '(via the --track argument to "git checkout -b ..."). \n'
1135 'or pass complete "git diff"-style arguments if supported, like\n'
1136 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001137
1138 return remote, upstream_branch
1139
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001140 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001141 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001142 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001143 DieWithError('The upstream for the current branch (%s) does not exist '
1144 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001145 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001146 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001147
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001148 def GetUpstreamBranch(self):
1149 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001150 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001151 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001152 upstream_branch = upstream_branch.replace('refs/heads/',
1153 'refs/remotes/%s/' % remote)
1154 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1155 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001156 self.upstream_branch = upstream_branch
1157 return self.upstream_branch
1158
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001159 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001160 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001161 remote, branch = None, self.GetBranch()
1162 seen_branches = set()
1163 while branch not in seen_branches:
1164 seen_branches.add(branch)
1165 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001166 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 if remote != '.' or branch.startswith('refs/remotes'):
1168 break
1169 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001170 remotes = RunGit(['remote'], error_ok=True).split()
1171 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001173 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001175 logging.warning('Could not determine which remote this change is '
1176 'associated with, so defaulting to "%s".' %
1177 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001178 else:
Gavin Make6a62332020-12-04 21:57:10 +00001179 logging.warning('Could not determine which remote this change is '
1180 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001181 branch = 'HEAD'
1182 if branch.startswith('refs/remotes'):
1183 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001184 elif branch.startswith('refs/branch-heads/'):
1185 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001186 else:
1187 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001188 return self._remote
1189
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001190 def GetRemoteUrl(self):
1191 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1192
1193 Returns None if there is no remote.
1194 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001195 is_cached, value = self._cached_remote_url
1196 if is_cached:
1197 return value
1198
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001199 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001200 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001201
Edward Lemur298f2cf2019-02-22 21:40:39 +00001202 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001203 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001204 if host:
1205 self._cached_remote_url = (True, url)
1206 return url
1207
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001208 # If it cannot be parsed as an url, assume it is a local directory,
1209 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001210 logging.warning('"%s" doesn\'t appear to point to a git host. '
1211 'Interpreting it as a local directory.', url)
1212 if not os.path.isdir(url):
1213 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001214 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1215 'but it doesn\'t exist.',
1216 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001217 return None
1218
1219 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001220 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001221
Edward Lemur79d4f992019-11-11 23:49:02 +00001222 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001223 if not host:
1224 logging.error(
1225 'Remote "%(remote)s" for branch "%(branch)s" points to '
1226 '"%(cache_path)s", but it is misconfigured.\n'
1227 '"%(cache_path)s" must be a git repo and must have a remote named '
1228 '"%(remote)s" pointing to the git host.', {
1229 'remote': remote,
1230 'cache_path': cache_path,
1231 'branch': self.GetBranch()})
1232 return None
1233
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001234 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001235 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001236
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001237 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001238 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001239 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001240 if self.GetBranch():
1241 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001242 if self.issue is not None:
1243 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001244 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001245 return self.issue
1246
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001247 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001248 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001249 issue = self.GetIssue()
1250 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001251 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001252 server = self.GetCodereviewServer()
1253 if short:
1254 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1255 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001256
Dirk Pranke6f0df682021-06-25 00:42:33 +00001257 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001258 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001259
Edward Lemur6c6827c2020-02-06 21:15:18 +00001260 def FetchDescription(self, pretty=False):
1261 assert self.GetIssue(), 'issue is required to query Gerrit'
1262
Edward Lemur9aa1a962020-02-25 00:58:38 +00001263 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001264 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1265 current_rev = data['current_revision']
1266 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001267
1268 if not pretty:
1269 return self.description
1270
1271 # Set width to 72 columns + 2 space indent.
1272 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1273 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1274 lines = self.description.splitlines()
1275 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001276
1277 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001278 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001279 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001280 if self.GetBranch():
1281 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001282 if self.patchset is not None:
1283 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001284 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001285 return self.patchset
1286
Edward Lemur9aa1a962020-02-25 00:58:38 +00001287 def GetAuthor(self):
1288 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1289
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001290 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001291 """Set this branch's patchset. If patchset=0, clears the patchset."""
1292 assert self.GetBranch()
1293 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001294 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001295 else:
1296 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001297 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001299 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001300 """Set this branch's issue. If issue isn't given, clears the issue."""
1301 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001302 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001303 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001304 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001305 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001306 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001307 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001308 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001309 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001310 else:
tandrii5d48c322016-08-18 16:19:37 -07001311 # Reset all of these just to be clean.
1312 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001313 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001314 ISSUE_CONFIG_KEY,
1315 PATCHSET_CONFIG_KEY,
1316 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001317 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001318 ]
tandrii5d48c322016-08-18 16:19:37 -07001319 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001320 try:
1321 self._GitSetBranchConfigValue(prop, None)
1322 except subprocess2.CalledProcessError:
1323 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001324 msg = RunGit(['log', '-1', '--format=%B']).strip()
1325 if msg and git_footers.get_footer_change_id(msg):
1326 print('WARNING: The change patched into this branch has a Change-Id. '
1327 'Removing it.')
1328 RunGit(['commit', '--amend', '-m',
1329 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001330 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001331 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001332 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001333
Joanna Wangb46232e2023-01-21 01:58:46 +00001334 def GetAffectedFiles(self, upstream, end_commit=None):
1335 # type: (str, Optional[str]) -> Sequence[str]
1336 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001337 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001338 return [
1339 f for _, f in scm.GIT.CaptureStatus(
1340 settings.GetRoot(), upstream, end_commit=end_commit)
1341 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001342 except subprocess2.CalledProcessError:
1343 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001344 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001345 'This branch probably doesn\'t exist anymore. To reset the\n'
1346 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001347 ' git branch --set-upstream-to origin/main %s\n'
1348 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001349 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001350
dsansomee2d6fd92016-09-08 00:10:47 -07001351 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001352 assert self.GetIssue(), 'issue is required to update description'
1353
1354 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001355 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001356 if not force:
1357 confirm_or_exit(
1358 'The description cannot be modified while the issue has a pending '
1359 'unpublished edit. Either publish the edit in the Gerrit web UI '
1360 'or delete it.\n\n', action='delete the unpublished edit')
1361
1362 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001363 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001364 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001365 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001366 description, notify='NONE')
1367
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001368 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001369
Edward Lemur75526302020-02-27 22:31:05 +00001370 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001371 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001372 '--root', settings.GetRoot(),
1373 '--upstream', upstream,
1374 ]
1375
1376 args.extend(['--verbose'] * verbose)
1377
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001378 remote, remote_branch = self.GetRemoteBranch()
1379 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001380 if settings.GetIsGerrit():
1381 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1382 args.extend(['--gerrit_project', self.GetGerritProject()])
1383 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001384
Edward Lemur99df04e2020-03-05 19:39:43 +00001385 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001386 issue = self.GetIssue()
1387 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001388 if author:
1389 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001390 if issue:
1391 args.extend(['--issue', str(issue)])
1392 if patchset:
1393 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001394
Edward Lemur75526302020-02-27 22:31:05 +00001395 return args
1396
Josip Sokcevic017544d2022-03-31 23:47:53 +00001397 def RunHook(self,
1398 committing,
1399 may_prompt,
1400 verbose,
1401 parallel,
1402 upstream,
1403 description,
1404 all_files,
1405 files=None,
1406 resultdb=False,
1407 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001408 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1409 args = self._GetCommonPresubmitArgs(verbose, upstream)
1410 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001411 if may_prompt:
1412 args.append('--may_prompt')
1413 if parallel:
1414 args.append('--parallel')
1415 if all_files:
1416 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001417 if files:
1418 args.extend(files.split(';'))
1419 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001420 if files or all_files:
1421 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001422
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001423 if resultdb and not realm:
1424 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1425 # it is not required to pass the realm flag
1426 print('Note: ResultDB reporting will NOT be performed because --realm'
1427 ' was not specified. To enable ResultDB, please run the command'
1428 ' again with the --realm argument to specify the LUCI realm.')
1429
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001430 py3_results = self._RunPresubmit(args,
1431 description,
1432 use_python3=True,
1433 resultdb=resultdb,
1434 realm=realm)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001435 if py3_results.get('skipped_presubmits', 1) == 0:
1436 print('No more presubmits to run - skipping Python 2 presubmits.')
1437 return py3_results
1438
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001439 py2_results = self._RunPresubmit(args,
1440 description,
1441 use_python3=False,
1442 resultdb=resultdb,
1443 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001444 return self._MergePresubmitResults(py2_results, py3_results)
1445
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001446 def _RunPresubmit(self,
1447 args,
1448 description,
1449 use_python3,
1450 resultdb=None,
1451 realm=None):
1452 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1453 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001454 args = args[:]
1455 vpython = 'vpython3' if use_python3 else 'vpython'
1456
Edward Lemur227d5102020-02-25 23:45:35 +00001457 with gclient_utils.temporary_file() as description_file:
1458 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001459 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001460 args.extend(['--json_output', json_output])
1461 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001462 if self.GetUsePython3():
1463 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001464 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001465 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001466 if resultdb and realm:
1467 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001468
1469 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001470 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001471
Edward Lemur227d5102020-02-25 23:45:35 +00001472 metrics.collector.add_repeated('sub_commands', {
1473 'command': 'presubmit',
1474 'execution_time': time_time() - start,
1475 'exit_code': exit_code,
1476 })
1477
1478 if exit_code:
1479 sys.exit(exit_code)
1480
1481 json_results = gclient_utils.FileRead(json_output)
1482 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001483
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001484 def _MergePresubmitResults(self, py2_results, py3_results):
1485 return {
1486 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1487 py3_results.get('more_cc', []))),
1488 'errors': (
1489 py2_results.get('errors', []) + py3_results.get('errors', [])),
1490 'notifications': (
1491 py2_results.get('notifications', []) +
1492 py3_results.get('notifications', [])),
1493 'warnings': (
1494 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1495 }
1496
Brian Sheedy7326ca22022-11-02 18:36:17 +00001497 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001498 args = self._GetCommonPresubmitArgs(verbose, upstream)
1499 args.append('--post_upload')
1500
1501 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001502 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001503 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001504 if not py3_only:
1505 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001506 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1507 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001508 if not py3_only:
1509 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001510 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001511
Edward Lemur5a644f82020-03-18 16:44:57 +00001512 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001513 # type: (optparse.Values, Sequence[str], Sequence[str]
1514 # ) -> ChangeDescription
1515 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001516 if self.GetIssue():
1517 description = self.FetchDescription()
1518 elif options.message:
1519 description = options.message
1520 else:
1521 description = _create_description_from_log(git_diff_args)
1522 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001523 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001524
Edward Lemur5a644f82020-03-18 16:44:57 +00001525 bug = options.bug
1526 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001527 if not self.GetIssue():
1528 # Extract bug number from branch name, but only if issue is being created.
1529 # It must start with bug or fix, followed by _ or - and number.
1530 # Optionally, it may contain _ or - after number with arbitrary text.
1531 # Examples:
1532 # bug-123
1533 # bug_123
1534 # fix-123
1535 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001536 branch = self.GetBranch()
1537 if branch is not None:
1538 match = re.match(
1539 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1540 if not bug and not fixed and match:
1541 if match.group('type') == 'bug':
1542 bug = match.group('bugnum')
1543 else:
1544 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001545
1546 change_description = ChangeDescription(description, bug, fixed)
1547
Joanna Wang39811b12023-01-20 23:09:48 +00001548 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001549 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001550 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001551 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001552 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001553 missing_files = [
1554 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001555 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001556 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001557 owners = self.owners_client.SuggestOwners(
1558 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001559 assert isinstance(options.reviewers, list), options.reviewers
1560 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001561
Edward Lemur5a644f82020-03-18 16:44:57 +00001562 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001563 if options.reviewers:
1564 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001565
1566 return change_description
1567
Joanna Wanga1abbed2023-01-24 01:41:05 +00001568 def _GetTitleForUpload(self, options, multi_change_upload=False):
1569 # type: (optparse.Values, Optional[bool]) -> str
1570
1571 # Getting titles for multipl commits is not supported so we return the
1572 # default.
1573 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001574 return options.title
1575
1576 # On first upload, patchset title is always this string, while options.title
1577 # gets converted to first line of message.
1578 if not self.GetIssue():
1579 return 'Initial upload'
1580
1581 # When uploading subsequent patchsets, options.message is taken as the title
1582 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001583 if options.message:
1584 return options.message.strip()
1585
1586 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001587 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001588 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001589 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001590 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001591
1592 # Use the default title if the user confirms the default with a 'y'.
1593 if user_title.lower() == 'y':
1594 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001595 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001596
Joanna Wang562481d2023-01-26 21:57:14 +00001597 def _GetRefSpecOptions(self,
1598 options,
1599 change_desc,
1600 multi_change_upload=False,
1601 dogfood_path=False):
1602 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1603 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001604
1605 # Extra options that can be specified at push time. Doc:
1606 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1607 refspec_opts = []
1608
1609 # By default, new changes are started in WIP mode, and subsequent patchsets
1610 # don't send email. At any time, passing --send-mail or --send-email will
1611 # mark the change ready and send email for that particular patch.
1612 if options.send_mail:
1613 refspec_opts.append('ready')
1614 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001615 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001616 refspec_opts.append('wip')
1617 else:
1618 refspec_opts.append('notify=NONE')
1619
1620 # TODO(tandrii): options.message should be posted as a comment if
1621 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1622 # to do it.
1623
1624 # Set options.title in case user was prompted in _GetTitleForUpload and
1625 # _CMDUploadChange needs to be called again.
1626 options.title = self._GetTitleForUpload(
1627 options, multi_change_upload=multi_change_upload)
1628
1629 if options.title:
1630 # Punctuation and whitespace in |title| must be percent-encoded.
1631 refspec_opts.append('m=' +
1632 gerrit_util.PercentEncodeForGitRef(options.title))
1633
1634 if options.private:
1635 refspec_opts.append('private')
1636
1637 if options.topic:
1638 # Documentation on Gerrit topics is here:
1639 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1640 refspec_opts.append('topic=%s' % options.topic)
1641
1642 if options.enable_auto_submit:
1643 refspec_opts.append('l=Auto-Submit+1')
1644 if options.set_bot_commit:
1645 refspec_opts.append('l=Bot-Commit+1')
1646 if options.use_commit_queue:
1647 refspec_opts.append('l=Commit-Queue+2')
1648 elif options.cq_dry_run:
1649 refspec_opts.append('l=Commit-Queue+1')
1650 elif options.cq_quick_run:
1651 refspec_opts.append('l=Commit-Queue+1')
1652 refspec_opts.append('l=Quick-Run+1')
1653
1654 if change_desc.get_reviewers(tbr_only=True):
1655 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1656 self.GetGerritProject())
1657 refspec_opts.append('l=Code-Review+%s' % score)
1658
Joanna Wang40497912023-01-24 21:18:16 +00001659 # Gerrit sorts hashtags, so order is not important.
1660 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1661 # We check GetIssue because we only add hashtags from the
1662 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001663 # TODO(b/265929888): When we fully launch the new path:
1664 # 1) remove fetching hashtags from description alltogether
1665 # 2) Or use descrtiption hashtags for:
1666 # `not (self.GetIssue() and multi_change_upload)`
1667 # 3) Or enabled change description tags for multi and single changes
1668 # by adding them post `git push`.
1669 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001670 hashtags.update(change_desc.get_hash_tags())
1671 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001672
1673 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001674 # branch/change.
1675 return refspec_opts
1676
Joanna Wang6215dd02023-02-07 15:58:03 +00001677 def PrepareSquashedCommit(self, options, parent, end_commit=None):
1678 # type: (optparse.Values, str, Optional[str]) -> _NewUpload()
Joanna Wangb88a4342023-01-24 01:28:22 +00001679 """Create a squashed commit to upload."""
Joanna Wangb88a4342023-01-24 01:28:22 +00001680
1681 if end_commit is None:
1682 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1683
1684 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1685 end_commit)
1686 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1687 with gclient_utils.temporary_file() as desc_tempfile:
1688 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1689 commit_to_push = RunGit(
1690 ['commit-tree', latest_tree, '-p', parent, '-F',
1691 desc_tempfile]).strip()
1692
Joanna Wang40497912023-01-24 21:18:16 +00001693 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
1694 change_desc)
Joanna Wangb88a4342023-01-24 01:28:22 +00001695
Joanna Wang6215dd02023-02-07 15:58:03 +00001696 def PrepareCherryPickSquashedCommit(self, options, parent):
1697 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001698 """Create a commit cherry-picked on parent to push."""
1699
Joanna Wang6215dd02023-02-07 15:58:03 +00001700 # The `parent` is what we will cherry-pick on top of.
1701 # The `cherry_pick_base` is the beginning range of what
1702 # we are cherry-picking.
1703 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1704 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001705 self.branchref)
1706
1707 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1708 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1709 with gclient_utils.temporary_file() as desc_tempfile:
1710 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001711 commit_to_cp = RunGit([
1712 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1713 desc_tempfile
1714 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001715
Joanna Wang6215dd02023-02-07 15:58:03 +00001716 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001717 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1718 if ret:
1719 RunGit(['cherry-pick', '--abort'])
1720 RunGit(['checkout', '-q', self.branch])
1721 DieWithError('Could not cleanly cherry-pick')
1722
Joanna Wang6215dd02023-02-07 15:58:03 +00001723 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001724 RunGit(['checkout', '-q', self.branch])
1725
Joanna Wang6215dd02023-02-07 15:58:03 +00001726 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
1727 cherry_pick_base, change_desc)
Joanna Wange8523912023-01-21 02:05:40 +00001728
Joanna Wangb46232e2023-01-21 01:58:46 +00001729 def _PrepareChange(self, options, parent, end_commit):
1730 # type: (optparse.Values, str, str) ->
1731 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1732 """Prepares the change to be uploaded."""
1733 self.EnsureCanUploadPatchset(options.force)
1734
1735 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1736 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1737 files)
1738
1739 watchlist = watchlists.Watchlists(settings.GetRoot())
1740 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1741 if not options.bypass_hooks:
1742 hook_results = self.RunHook(committing=False,
1743 may_prompt=not options.force,
1744 verbose=options.verbose,
1745 parallel=options.parallel,
1746 upstream=parent,
1747 description=change_desc.description,
1748 all_files=False)
1749 self.ExtendCC(hook_results['more_cc'])
1750
1751 # Update the change description and ensure we have a Change Id.
1752 if self.GetIssue():
1753 if options.edit_description:
1754 change_desc.prompt()
1755 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1756 change_id = change_detail['change_id']
1757 change_desc.ensure_change_id(change_id)
1758
1759 # TODO(b/265929888): Pull in external changes for the current branch
1760 # only. No clear way to pull in external changes for upstream branches
1761 # yet. Potentially offer a separate command to pull in external changes.
1762 else: # No change issue. First time uploading
1763 if not options.force and not options.message_file:
1764 change_desc.prompt()
1765
1766 # Check if user added a change_id in the descripiton.
1767 change_ids = git_footers.get_footer_change_id(change_desc.description)
1768 if len(change_ids) == 1:
1769 change_id = change_ids[0]
1770 else:
1771 change_id = GenerateGerritChangeId(change_desc.description)
1772 change_desc.ensure_change_id(change_id)
1773
1774 if options.preserve_tryjobs:
1775 change_desc.set_preserve_tryjobs()
1776
1777 SaveDescriptionBackup(change_desc)
1778
1779 # Add ccs
1780 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001781 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001782 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001783 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001784 ccs = self.GetCCList().split(',')
1785 if len(ccs) > 100:
1786 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1787 'process/lsc/lsc_workflow.md')
1788 print('WARNING: This will auto-CC %s users.' % len(ccs))
1789 print('LSC may be more appropriate: %s' % lsc)
1790 print('You can also use the --no-autocc flag to disable auto-CC.')
1791 confirm_or_exit(action='continue')
1792
1793 # Add ccs from the --cc flag.
1794 if options.cc:
1795 ccs.extend(options.cc)
1796
1797 ccs = [email.strip() for email in ccs if email.strip()]
1798 if change_desc.get_cced():
1799 ccs.extend(change_desc.get_cced())
1800
1801 return change_desc.get_reviewers(), ccs, change_desc
1802
Joanna Wang40497912023-01-24 21:18:16 +00001803 def PostUploadUpdates(self, options, new_upload, change_number):
1804 # type: (optparse.Values, _NewUpload, change_number) -> None
1805 """Makes necessary post upload changes to the local and remote cl."""
1806 if not self.GetIssue():
1807 self.SetIssue(change_number)
1808
1809 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1810 new_upload.commit_to_push)
1811 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1812 new_upload.new_last_uploaded_commit)
1813
1814 if settings.GetRunPostUploadHook():
1815 self.RunPostUploadHook(options.verbose, new_upload.parent,
1816 new_upload.change_desc.description,
1817 options.no_python2_post_upload_hooks)
1818
1819 if new_upload.reviewers or new_upload.ccs:
1820 gerrit_util.AddReviewers(self.GetGerritHost(),
1821 self._GerritChangeIdentifier(),
1822 reviewers=new_upload.reviewers,
1823 ccs=new_upload.ccs,
1824 notify=bool(options.send_mail))
1825
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001826 def CMDUpload(self, options, git_diff_args, orig_args):
1827 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001828 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001829 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001830 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001831 else:
1832 if self.GetBranch() is None:
1833 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1834
1835 # Default to diffing against common ancestor of upstream branch
1836 base_branch = self.GetCommonAncestorWithUpstream()
1837 git_diff_args = [base_branch, 'HEAD']
1838
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001839 # Fast best-effort checks to abort before running potentially expensive
1840 # hooks if uploading is likely to fail anyway. Passing these checks does
1841 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001842 self.EnsureAuthenticated(force=options.force)
1843 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001844
1845 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001846 watchlist = watchlists.Watchlists(settings.GetRoot())
1847 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001848 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001849 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001850
Edward Lemur5a644f82020-03-18 16:44:57 +00001851 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001852 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001853 hook_results = self.RunHook(committing=False,
1854 may_prompt=not options.force,
1855 verbose=options.verbose,
1856 parallel=options.parallel,
1857 upstream=base_branch,
1858 description=change_desc.description,
1859 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001860 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001861
Aaron Gable13101a62018-02-09 13:20:41 -08001862 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001863 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001864 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001865 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001866 if self.GetBranch() is not None:
1867 self._GitSetBranchConfigValue(
1868 LAST_UPLOAD_HASH_CONFIG_KEY,
1869 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001870 # Run post upload hooks, if specified.
1871 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001872 self.RunPostUploadHook(options.verbose, base_branch,
1873 change_desc.description,
1874 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001875
1876 # Upload all dependencies if specified.
1877 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001878 print()
1879 print('--dependencies has been specified.')
1880 print('All dependent local branches will be re-uploaded.')
1881 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001882 # Remove the dependencies flag from args so that we do not end up in a
1883 # loop.
1884 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001885 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001886 return ret
1887
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001888 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001889 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001890
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001891 Issue must have been already uploaded and known. Optionally allows for
1892 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001893 """
1894 assert new_state in _CQState.ALL_STATES
1895 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001896 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001897 vote_map = {
1898 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001899 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001900 _CQState.DRY_RUN: 1,
1901 _CQState.COMMIT: 2,
1902 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001903 if new_state == _CQState.QUICK_RUN:
1904 labels = {
1905 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1906 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1907 }
1908 else:
1909 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001910 notify = False if new_state == _CQState.DRY_RUN else None
1911 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001912 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001913 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001914 return 0
1915 except KeyboardInterrupt:
1916 raise
1917 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001918 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001919 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001920 ' * Your project has no CQ,\n'
1921 ' * You don\'t have permission to change the CQ state,\n'
1922 ' * There\'s a bug in this code (see stack trace below).\n'
1923 'Consider specifying which bots to trigger manually or asking your '
1924 'project owners for permissions or contacting Chrome Infra at:\n'
1925 'https://www.chromium.org/infra\n\n' %
1926 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001927 # Still raise exception so that stack trace is printed.
1928 raise
1929
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001930 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001931 # Lazy load of configs.
1932 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001933 if self._gerrit_host and '.' not in self._gerrit_host:
1934 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1935 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001936 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001937 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001938 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001939 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001940 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1941 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001942 return self._gerrit_host
1943
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001944 def _GetGitHost(self):
1945 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001946 remote_url = self.GetRemoteUrl()
1947 if not remote_url:
1948 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001949 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001950
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001951 def GetCodereviewServer(self):
1952 if not self._gerrit_server:
1953 # If we're on a branch then get the server potentially associated
1954 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001955 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001956 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001957 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001958 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001959 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001960 if not self._gerrit_server:
1961 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1962 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001963 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001964 parts[0] = parts[0] + '-review'
1965 self._gerrit_host = '.'.join(parts)
1966 self._gerrit_server = 'https://%s' % self._gerrit_host
1967 return self._gerrit_server
1968
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001969 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001970 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001971 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001972 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001973 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001974 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001975 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001976 if project.endswith('.git'):
1977 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001978 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1979 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1980 # gitiles/git-over-https protocol. E.g.,
1981 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1982 # as
1983 # https://chromium.googlesource.com/v8/v8
1984 if project.startswith('a/'):
1985 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001986 return project
1987
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001988 def _GerritChangeIdentifier(self):
1989 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1990
1991 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001992 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001993 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001994 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001995 if project:
1996 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1997 # Fall back on still unique, but less efficient change number.
1998 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001999
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002000 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002001 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002002 if settings.GetGerritSkipEnsureAuthenticated():
2003 # For projects with unusual authentication schemes.
2004 # See http://crbug.com/603378.
2005 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002006
2007 # Check presence of cookies only if using cookies-based auth method.
2008 cookie_auth = gerrit_util.Authenticator.get()
2009 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002010 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002011
Florian Mayerae510e82020-01-30 21:04:48 +00002012 remote_url = self.GetRemoteUrl()
2013 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002014 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002015 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002016 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2017 logging.warning(
2018 'Ignoring branch %(branch)s with non-https/sso remote '
2019 '%(remote)s', {
2020 'branch': self.branch,
2021 'remote': self.GetRemoteUrl()
2022 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002023 return
2024
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002025 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002026 self.GetCodereviewServer()
2027 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002028 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002029
2030 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2031 git_auth = cookie_auth.get_auth_header(git_host)
2032 if gerrit_auth and git_auth:
2033 if gerrit_auth == git_auth:
2034 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002035 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002036 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002037 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002038 ' %s\n'
2039 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002040 ' Consider running the following command:\n'
2041 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002042 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002043 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002044 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002045 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002046 cookie_auth.get_new_password_message(git_host)))
2047 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002048 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002049 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002050
2051 missing = (
2052 ([] if gerrit_auth else [self._gerrit_host]) +
2053 ([] if git_auth else [git_host]))
2054 DieWithError('Credentials for the following hosts are required:\n'
2055 ' %s\n'
2056 'These are read from %s (or legacy %s)\n'
2057 '%s' % (
2058 '\n '.join(missing),
2059 cookie_auth.get_gitcookies_path(),
2060 cookie_auth.get_netrc_path(),
2061 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002062
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002063 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002064 if not self.GetIssue():
2065 return
2066
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002067 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002068 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002069 DieWithError(
2070 'Change %s has been abandoned, new uploads are not allowed' %
2071 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002072 if status == 'MERGED':
2073 answer = gclient_utils.AskForData(
2074 'Change %s has been submitted, new uploads are not allowed. '
2075 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2076 ).lower()
2077 if answer not in ('y', ''):
2078 DieWithError('New uploads are not allowed.')
2079 self.SetIssue()
2080 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002081
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002082 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2083 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2084 # Apparently this check is not very important? Otherwise get_auth_email
2085 # could have been added to other implementations of Authenticator.
2086 cookies_auth = gerrit_util.Authenticator.get()
2087 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002088 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002089
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002090 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002091 if self.GetIssueOwner() == cookies_user:
2092 return
2093 logging.debug('change %s owner is %s, cookies user is %s',
2094 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002095 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002096 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002097 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002098 if details['email'] == self.GetIssueOwner():
2099 return
2100 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002101 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002102 'as %s.\n'
2103 'Uploading may fail due to lack of permissions.' %
2104 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2105 confirm_or_exit(action='upload')
2106
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002107 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002108 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002109 or CQ status, assuming adherence to a common workflow.
2110
2111 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002112 * 'error' - error from review tool (including deleted issues)
2113 * 'unsent' - no reviewers added
2114 * 'waiting' - waiting for review
2115 * 'reply' - waiting for uploader to reply to review
2116 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002117 * 'dry-run' - dry-running in the CQ
2118 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002119 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002120 """
2121 if not self.GetIssue():
2122 return None
2123
2124 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002125 data = self._GetChangeDetail([
2126 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002127 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002128 return 'error'
2129
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002130 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002131 return 'closed'
2132
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002133 cq_label = data['labels'].get('Commit-Queue', {})
2134 max_cq_vote = 0
2135 for vote in cq_label.get('all', []):
2136 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2137 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002138 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002139 if max_cq_vote == 1:
2140 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002141
Aaron Gable9ab38c62017-04-06 14:36:33 -07002142 if data['labels'].get('Code-Review', {}).get('approved'):
2143 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002144
2145 if not data.get('reviewers', {}).get('REVIEWER', []):
2146 return 'unsent'
2147
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002148 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002149 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002150 while messages:
2151 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002152 if (m.get('tag', '').startswith('autogenerated:cq') or
2153 m.get('tag', '').startswith('autogenerated:cv')):
2154 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002155 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002156 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002157 # Most recent message was by owner.
2158 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002159
2160 # Some reply from non-owner.
2161 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002162
2163 # Somehow there are no messages even though there are reviewers.
2164 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002165
Gavin Mak4e5e3992022-11-14 22:40:12 +00002166 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002167 if not self.GetIssue():
2168 return None
2169
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002170 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002171 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002172 if update:
2173 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002174 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002175
Gavin Makf35a9eb2022-11-17 18:34:36 +00002176 def _IsPatchsetRangeSignificant(self, lower, upper):
2177 """Returns True if the inclusive range of patchsets contains any reworks or
2178 rebases."""
2179 if not self.GetIssue():
2180 return False
2181
2182 data = self._GetChangeDetail(['ALL_REVISIONS'])
2183 ps_kind = {}
2184 for rev_info in data.get('revisions', {}).values():
2185 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2186
2187 for ps in range(lower, upper + 1):
2188 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2189 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2190 return True
2191 return False
2192
Gavin Make61ccc52020-11-13 00:12:57 +00002193 def GetMostRecentDryRunPatchset(self):
2194 """Get patchsets equivalent to the most recent patchset and return
2195 the patchset with the latest dry run. If none have been dry run, return
2196 the latest patchset."""
2197 if not self.GetIssue():
2198 return None
2199
2200 data = self._GetChangeDetail(['ALL_REVISIONS'])
2201 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002202 dry_run = {int(m['_revision_number'])
2203 for m in data.get('messages', [])
2204 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002205
2206 for revision_info in sorted(data.get('revisions', {}).values(),
2207 key=lambda c: c['_number'], reverse=True):
2208 if revision_info['_number'] in dry_run:
2209 patchset = revision_info['_number']
2210 break
2211 if revision_info.get('kind', '') not in \
2212 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2213 break
2214 self.SetPatchset(patchset)
2215 return patchset
2216
Aaron Gable636b13f2017-07-14 10:42:48 -07002217 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002218 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002219 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002220 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002221
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002222 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002223 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002224 # CURRENT_REVISION is included to get the latest patchset so that
2225 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002226 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002227 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2228 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002229 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002230 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002231 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002232 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002233
2234 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002235 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002236 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002237 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002238 line_comments = file_comments.setdefault(path, [])
2239 line_comments.extend(
2240 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002241
2242 # Build dictionary of file comments for easy access and sorting later.
2243 # {author+date: {path: {patchset: {line: url+message}}}}
2244 comments = collections.defaultdict(
2245 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002246
2247 server = self.GetCodereviewServer()
2248 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2249 # /c/ is automatically added by short URL server.
2250 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2251 self.GetIssue())
2252 else:
2253 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2254
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002255 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002256 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002257 tag = comment.get('tag', '')
2258 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002259 continue
2260 key = (comment['author']['email'], comment['updated'])
2261 if comment.get('side', 'REVISION') == 'PARENT':
2262 patchset = 'Base'
2263 else:
2264 patchset = 'PS%d' % comment['patch_set']
2265 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002266 url = ('%s/%s/%s#%s%s' %
2267 (url_prefix, comment['patch_set'], path,
2268 'b' if comment.get('side') == 'PARENT' else '',
2269 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002270 comments[key][path][patchset][line] = (url, comment['message'])
2271
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002272 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002273 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002274 summary = self._BuildCommentSummary(msg, comments, readable)
2275 if summary:
2276 summaries.append(summary)
2277 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002278
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002279 @staticmethod
2280 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002281 if 'email' not in msg['author']:
2282 # Some bot accounts may not have an email associated.
2283 return None
2284
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002285 key = (msg['author']['email'], msg['date'])
2286 # Don't bother showing autogenerated messages that don't have associated
2287 # file or line comments. this will filter out most autogenerated
2288 # messages, but will keep robot comments like those from Tricium.
2289 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2290 if is_autogenerated and not comments.get(key):
2291 return None
2292 message = msg['message']
2293 # Gerrit spits out nanoseconds.
2294 assert len(msg['date'].split('.')[-1]) == 9
2295 date = datetime.datetime.strptime(msg['date'][:-3],
2296 '%Y-%m-%d %H:%M:%S.%f')
2297 if key in comments:
2298 message += '\n'
2299 for path, patchsets in sorted(comments.get(key, {}).items()):
2300 if readable:
2301 message += '\n%s' % path
2302 for patchset, lines in sorted(patchsets.items()):
2303 for line, (url, content) in sorted(lines.items()):
2304 if line:
2305 line_str = 'Line %d' % line
2306 path_str = '%s:%d:' % (path, line)
2307 else:
2308 line_str = 'File comment'
2309 path_str = '%s:0:' % path
2310 if readable:
2311 message += '\n %s, %s: %s' % (patchset, line_str, url)
2312 message += '\n %s\n' % content
2313 else:
2314 message += '\n%s ' % path_str
2315 message += '\n%s\n' % content
2316
2317 return _CommentSummary(
2318 date=date,
2319 message=message,
2320 sender=msg['author']['email'],
2321 autogenerated=is_autogenerated,
2322 # These could be inferred from the text messages and correlated with
2323 # Code-Review label maximum, however this is not reliable.
2324 # Leaving as is until the need arises.
2325 approval=False,
2326 disapproval=False,
2327 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002328
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002329 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002330 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002331 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002332
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002333 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002334 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002335 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002336
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002337 def _GetChangeDetail(self, options=None):
2338 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002339 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002340 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002341
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002342 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002343 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002344 options.append('CURRENT_COMMIT')
2345
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002346 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002347 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002348 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002349
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002350 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2351 # Assumption: data fetched before with extra options is suitable
2352 # for return for a smaller set of options.
2353 # For example, if we cached data for
2354 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2355 # and request is for options=[CURRENT_REVISION],
2356 # THEN we can return prior cached data.
2357 if options_set.issubset(cached_options_set):
2358 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002359
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002360 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002361 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002362 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002363 except gerrit_util.GerritError as e:
2364 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002365 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002366 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002367
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002368 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002369 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002370
Gavin Mak4e5e3992022-11-14 22:40:12 +00002371 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002372 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002373 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002374 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2375 self._GerritChangeIdentifier(),
2376 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002377 except gerrit_util.GerritError as e:
2378 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002379 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002380 raise
agable32978d92016-11-01 12:55:02 -07002381 return data
2382
Karen Qian40c19422019-03-13 21:28:29 +00002383 def _IsCqConfigured(self):
2384 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002385 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002386
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002387 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002388 if git_common.is_dirty_git_tree('land'):
2389 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002390
tandriid60367b2016-06-22 05:25:12 -07002391 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002392 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002393 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002394 'which can test and land changes for you. '
2395 'Are you sure you wish to bypass it?\n',
2396 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002397 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002398 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002399 # Note: git diff outputs nothing if there is no diff.
2400 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002401 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002402 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002403 if detail['current_revision'] == last_upload:
2404 differs = False
2405 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002406 print('WARNING: Local branch contents differ from latest uploaded '
2407 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002408 if differs:
2409 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002410 confirm_or_exit(
2411 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2412 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002413 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002414 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002415 upstream = self.GetCommonAncestorWithUpstream()
2416 if self.GetIssue():
2417 description = self.FetchDescription()
2418 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002419 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002420 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002421 committing=True,
2422 may_prompt=not force,
2423 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002424 parallel=parallel,
2425 upstream=upstream,
2426 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002427 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002428 resultdb=resultdb,
2429 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002430
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002431 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002432 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002433 links = self._GetChangeCommit().get('web_links', [])
2434 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002435 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002436 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002437 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002438 return 0
2439
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002440 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2441 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002442 assert parsed_issue_arg.valid
2443
Edward Lemur125d60a2019-09-13 18:25:41 +00002444 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002445
2446 if parsed_issue_arg.hostname:
2447 self._gerrit_host = parsed_issue_arg.hostname
2448 self._gerrit_server = 'https://%s' % self._gerrit_host
2449
tandriic2405f52016-10-10 08:13:15 -07002450 try:
2451 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002452 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002453 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002454
2455 if not parsed_issue_arg.patchset:
2456 # Use current revision by default.
2457 revision_info = detail['revisions'][detail['current_revision']]
2458 patchset = int(revision_info['_number'])
2459 else:
2460 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002461 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002462 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2463 break
2464 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002465 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002466 (parsed_issue_arg.patchset, self.GetIssue()))
2467
Edward Lemur125d60a2019-09-13 18:25:41 +00002468 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002469 if remote_url.endswith('.git'):
2470 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002471 remote_url = remote_url.rstrip('/')
2472
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002473 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002474 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002475
2476 if remote_url != fetch_info['url']:
2477 DieWithError('Trying to patch a change from %s but this repo appears '
2478 'to be %s.' % (fetch_info['url'], remote_url))
2479
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002480 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002481
Joanna Wangc023a632023-01-26 17:59:25 +00002482 # Set issue immediately in case the cherry-pick fails, which happens
2483 # when resolving conflicts.
2484 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002485 self.SetIssue(parsed_issue_arg.issue)
2486
Aaron Gable62619a32017-06-16 08:22:09 -07002487 if force:
2488 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2489 print('Checked out commit for change %i patchset %i locally' %
2490 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002491 elif nocommit:
2492 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2493 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002494 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002495 RunGit(['cherry-pick', 'FETCH_HEAD'])
2496 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002497 (parsed_issue_arg.issue, patchset))
2498 print('Note: this created a local commit which does not have '
2499 'the same hash as the one uploaded for review. This will make '
2500 'uploading changes based on top of this branch difficult.\n'
2501 'If you want to do that, use "git cl patch --force" instead.')
2502
Stefan Zagerd08043c2017-10-12 12:07:02 -07002503 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002504 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002505 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002506 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2507 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002508 else:
2509 print('WARNING: You are in detached HEAD state.\n'
2510 'The patch has been applied to your checkout, but you will not be '
2511 'able to upload a new patch set to the gerrit issue.\n'
2512 'Try using the \'-b\' option if you would like to work on a '
2513 'branch and/or upload a new patch set.')
2514
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002515 return 0
2516
Joanna Wang18de1f62023-01-21 01:24:24 +00002517 @staticmethod
2518 def _GerritCommitMsgHookCheck(offer_removal):
2519 # type: (bool) -> None
2520 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002521 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2522 if not os.path.exists(hook):
2523 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002524 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2525 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002526 data = gclient_utils.FileRead(hook)
2527 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2528 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002529 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002530 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002531 'and may interfere with it in subtle ways.\n'
2532 'We recommend you remove the commit-msg hook.')
2533 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002534 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002535 gclient_utils.rm_file_or_tree(hook)
2536 print('Gerrit commit-msg hook removed.')
2537 else:
2538 print('OK, will keep Gerrit commit-msg hook in place.')
2539
Edward Lemur1b52d872019-05-09 21:12:12 +00002540 def _CleanUpOldTraces(self):
2541 """Keep only the last |MAX_TRACES| traces."""
2542 try:
2543 traces = sorted([
2544 os.path.join(TRACES_DIR, f)
2545 for f in os.listdir(TRACES_DIR)
2546 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2547 and not f.startswith('tmp'))
2548 ])
2549 traces_to_delete = traces[:-MAX_TRACES]
2550 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002551 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002552 except OSError:
2553 print('WARNING: Failed to remove old git traces from\n'
2554 ' %s'
2555 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002556
Edward Lemur5737f022019-05-17 01:24:00 +00002557 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002558 """Zip and write the git push traces stored in traces_dir."""
2559 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002560 traces_zip = trace_name + '-traces'
2561 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002562 # Create a temporary dir to store git config and gitcookies in. It will be
2563 # compressed and stored next to the traces.
2564 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002565 git_info_zip = trace_name + '-git-info'
2566
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002567 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002568
Edward Lemur1b52d872019-05-09 21:12:12 +00002569 git_push_metadata['trace_name'] = trace_name
2570 gclient_utils.FileWrite(
2571 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2572
2573 # Keep only the first 6 characters of the git hashes on the packet
2574 # trace. This greatly decreases size after compression.
2575 packet_traces = os.path.join(traces_dir, 'trace-packet')
2576 if os.path.isfile(packet_traces):
2577 contents = gclient_utils.FileRead(packet_traces)
2578 gclient_utils.FileWrite(
2579 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2580 shutil.make_archive(traces_zip, 'zip', traces_dir)
2581
2582 # Collect and compress the git config and gitcookies.
2583 git_config = RunGit(['config', '-l'])
2584 gclient_utils.FileWrite(
2585 os.path.join(git_info_dir, 'git-config'),
2586 git_config)
2587
2588 cookie_auth = gerrit_util.Authenticator.get()
2589 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2590 gitcookies_path = cookie_auth.get_gitcookies_path()
2591 if os.path.isfile(gitcookies_path):
2592 gitcookies = gclient_utils.FileRead(gitcookies_path)
2593 gclient_utils.FileWrite(
2594 os.path.join(git_info_dir, 'gitcookies'),
2595 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2596 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2597
Edward Lemur1b52d872019-05-09 21:12:12 +00002598 gclient_utils.rmtree(git_info_dir)
2599
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002600 def _RunGitPushWithTraces(self,
2601 refspec,
2602 refspec_opts,
2603 git_push_metadata,
2604 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002605 """Run git push and collect the traces resulting from the execution."""
2606 # Create a temporary directory to store traces in. Traces will be compressed
2607 # and stored in a 'traces' dir inside depot_tools.
2608 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002609 trace_name = os.path.join(
2610 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002611
2612 env = os.environ.copy()
2613 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2614 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002615 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002616 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2617 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2618 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2619
2620 try:
2621 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002622 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002623 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002624 push_cmd = ['git', 'push', remote_url, refspec]
2625 if git_push_options:
2626 for opt in git_push_options:
2627 push_cmd.extend(['-o', opt])
2628
Edward Lemur0f58ae42019-04-30 17:24:12 +00002629 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002630 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002631 env=env,
2632 print_stdout=True,
2633 # Flush after every line: useful for seeing progress when running as
2634 # recipe.
2635 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002636 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002637 except subprocess2.CalledProcessError as e:
2638 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002639 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002640 raise GitPushError(
2641 'Failed to create a change, very likely due to blocked keyword. '
2642 'Please examine output above for the reason of the failure.\n'
2643 'If this is a false positive, you can try to bypass blocked '
2644 'keyword by using push option '
2645 '-o uploadvalidator~skip, e.g.:\n'
2646 'git cl upload -o uploadvalidator~skip\n\n'
2647 'If git-cl is not working correctly, file a bug under the '
2648 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002649 if 'git push -o nokeycheck' in str(e.stdout):
2650 raise GitPushError(
2651 'Failed to create a change, very likely due to a private key being '
2652 'detected. Please examine output above for the reason of the '
2653 'failure.\n'
2654 'If this is a false positive, you can try to bypass private key '
2655 'detection by using push option '
2656 '-o nokeycheck, e.g.:\n'
2657 'git cl upload -o nokeycheck\n\n'
2658 'If git-cl is not working correctly, file a bug under the '
2659 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002660
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002661 raise GitPushError(
2662 'Failed to create a change. Please examine output above for the '
2663 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002664 'For emergencies, Googlers can escalate to '
2665 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002666 'Hint: run command below to diagnose common Git/Gerrit '
2667 'credential problems:\n'
2668 ' git cl creds-check\n'
2669 '\n'
2670 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2671 'component including the files below.\n'
2672 'Review the files before upload, since they might contain sensitive '
2673 'information.\n'
2674 'Set the Restrict-View-Google label so that they are not publicly '
2675 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002676 finally:
2677 execution_time = time_time() - before_push
2678 metrics.collector.add_repeated('sub_commands', {
2679 'command': 'git push',
2680 'execution_time': execution_time,
2681 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002682 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002683 })
2684
Edward Lemur1b52d872019-05-09 21:12:12 +00002685 git_push_metadata['execution_time'] = execution_time
2686 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002687 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002688
Edward Lemur1b52d872019-05-09 21:12:12 +00002689 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002690 gclient_utils.rmtree(traces_dir)
2691
2692 return push_stdout
2693
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002694 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2695 change_desc):
2696 """Upload the current branch to Gerrit, retry if new remote HEAD is
2697 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002698 remote, remote_branch = self.GetRemoteBranch()
2699 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2700
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002701 try:
2702 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002703 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002704 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002705 # Repository might be in the middle of transition to main branch as
2706 # default, and uploads to old default might be blocked.
2707 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002708 DieWithError(str(e), change_desc)
2709
Josip Sokcevicb631a882021-01-06 18:18:10 +00002710 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2711 self.GetGerritProject())
2712 if project_head == branch:
2713 DieWithError(str(e), change_desc)
2714 branch = project_head
2715
2716 print("WARNING: Fetching remote state and retrying upload to default "
2717 "branch...")
2718 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002719 options.edit_description = False
2720 options.force = True
2721 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002722 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2723 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002724 except GitPushError as e:
2725 DieWithError(str(e), change_desc)
2726
2727 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002728 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002729 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002730 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002731 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002732 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002733 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002734 # User requested to change description
2735 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002736 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002737 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2738 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002739 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002740
2741 # Check if changes outside of this workspace have been uploaded.
2742 current_rev = change_detail['current_revision']
2743 last_uploaded_rev = self._GitGetBranchConfigValue(
2744 GERRIT_SQUASH_HASH_CONFIG_KEY)
2745 if last_uploaded_rev and current_rev != last_uploaded_rev:
2746 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002747 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002748 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002749 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002750 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002751 if len(change_ids) == 1:
2752 change_id = change_ids[0]
2753 else:
2754 change_id = GenerateGerritChangeId(change_desc.description)
2755 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002756
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002757 if options.preserve_tryjobs:
2758 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002759
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002760 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002761 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002762 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002763 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002764 with gclient_utils.temporary_file() as desc_tempfile:
2765 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2766 ref_to_push = RunGit(
2767 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002768 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002769 if options.no_add_changeid:
2770 pass
2771 else: # adding Change-Ids is okay.
2772 if not git_footers.get_footer_change_id(change_desc.description):
2773 DownloadGerritHook(False)
2774 change_desc.set_description(
2775 self._AddChangeIdToCommitMessage(change_desc.description,
2776 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002777 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002778 # For no-squash mode, we assume the remote called "origin" is the one we
2779 # want. It is not worthwhile to support different workflows for
2780 # no-squash mode.
2781 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002782 # attempt to extract the changeid from the current description
2783 # fail informatively if not possible.
2784 change_id_candidates = git_footers.get_footer_change_id(
2785 change_desc.description)
2786 if not change_id_candidates:
2787 DieWithError("Unable to extract change-id from message.")
2788 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002789
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002790 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002791 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2792 ref_to_push)]).splitlines()
2793 if len(commits) > 1:
2794 print('WARNING: This will upload %d commits. Run the following command '
2795 'to see which commits will be uploaded: ' % len(commits))
2796 print('git log %s..%s' % (parent, ref_to_push))
2797 print('You can also use `git squash-branch` to squash these into a '
2798 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002799 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002800
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002801 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002802 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002803 # Add default, watchlist, presubmit ccs if this is the initial upload
2804 # and CL is not private and auto-ccing has not been disabled.
2805 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002806 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002807 if len(cc) > 100:
2808 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2809 'process/lsc/lsc_workflow.md')
2810 print('WARNING: This will auto-CC %s users.' % len(cc))
2811 print('LSC may be more appropriate: %s' % lsc)
2812 print('You can also use the --no-autocc flag to disable auto-CC.')
2813 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002814 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002815 if options.cc:
2816 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002817 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002818 if change_desc.get_cced():
2819 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002820 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002821 valid_accounts = set(reviewers + cc)
2822 # TODO(crbug/877717): relax this for all hosts.
2823 else:
2824 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002825 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002826 logging.info('accounts %s are recognized, %s invalid',
2827 sorted(valid_accounts),
2828 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002829
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002830 # Extra options that can be specified at push time. Doc:
2831 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002832 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002833
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002834 for r in sorted(reviewers):
2835 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002836 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002837 reviewers.remove(r)
2838 else:
2839 # TODO(tandrii): this should probably be a hard failure.
2840 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2841 % r)
2842 for c in sorted(cc):
2843 # refspec option will be rejected if cc doesn't correspond to an
2844 # account, even though REST call to add such arbitrary cc may succeed.
2845 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002846 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002847 cc.remove(c)
2848
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002849 refspec_suffix = ''
2850 if refspec_opts:
2851 refspec_suffix = '%' + ','.join(refspec_opts)
2852 assert ' ' not in refspec_suffix, (
2853 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2854 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002855
Edward Lemur1b52d872019-05-09 21:12:12 +00002856 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002857 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002858 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002859 'change_id': change_id,
2860 'description': change_desc.description,
2861 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002862
Gavin Mak4e5e3992022-11-14 22:40:12 +00002863 # Gerrit may or may not update fast enough to return the correct patchset
2864 # number after we push. Get the pre-upload patchset and increment later.
2865 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2866
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002867 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002868 git_push_metadata,
2869 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002870
2871 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002872 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002873 change_numbers = [m.group(1)
2874 for m in map(regex.match, push_stdout.splitlines())
2875 if m]
2876 if len(change_numbers) != 1:
2877 DieWithError(
2878 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002879 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002880 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002881 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002882 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002883
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002884 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002885 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002886 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002887 gerrit_util.AddReviewers(self.GetGerritHost(),
2888 self._GerritChangeIdentifier(),
2889 reviewers,
2890 cc,
2891 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002892
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002893 return 0
2894
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002895 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2896 change_desc):
2897 """Computes parent of the generated commit to be uploaded to Gerrit.
2898
2899 Returns revision or a ref name.
2900 """
2901 if custom_cl_base:
2902 # Try to avoid creating additional unintended CLs when uploading, unless
2903 # user wants to take this risk.
2904 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2905 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2906 local_ref_of_target_remote])
2907 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002908 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002909 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2910 'If you proceed with upload, more than 1 CL may be created by '
2911 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2912 'If you are certain that specified base `%s` has already been '
2913 'uploaded to Gerrit as another CL, you may proceed.\n' %
2914 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2915 if not force:
2916 confirm_or_exit(
2917 'Do you take responsibility for cleaning up potential mess '
2918 'resulting from proceeding with upload?',
2919 action='upload')
2920 return custom_cl_base
2921
Aaron Gablef97e33d2017-03-30 15:44:27 -07002922 if remote != '.':
2923 return self.GetCommonAncestorWithUpstream()
2924
2925 # If our upstream branch is local, we base our squashed commit on its
2926 # squashed version.
2927 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2928
Aaron Gablef97e33d2017-03-30 15:44:27 -07002929 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002930 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002931 if upstream_branch_name == 'main':
2932 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002933
2934 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002935 # TODO(tandrii): consider checking parent change in Gerrit and using its
2936 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2937 # the tree hash of the parent branch. The upside is less likely bogus
2938 # requests to reupload parent change just because it's uploadhash is
2939 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002940 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2941 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002942 # Verify that the upstream branch has been uploaded too, otherwise
2943 # Gerrit will create additional CLs when uploading.
2944 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2945 RunGitSilent(['rev-parse', parent + ':'])):
2946 DieWithError(
2947 '\nUpload upstream branch %s first.\n'
2948 'It is likely that this branch has been rebased since its last '
2949 'upload, so you just need to upload it again.\n'
2950 '(If you uploaded it with --no-squash, then branch dependencies '
2951 'are not supported, and you should reupload with --squash.)'
2952 % upstream_branch_name,
2953 change_desc)
2954 return parent
2955
Gavin Mak4e5e3992022-11-14 22:40:12 +00002956 def _UpdateWithExternalChanges(self):
2957 """Updates workspace with external changes.
2958
2959 Returns the commit hash that should be used as the merge base on upload.
2960 """
2961 local_ps = self.GetPatchset()
2962 if local_ps is None:
2963 return
2964
2965 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002966 if external_ps is None or local_ps == external_ps or \
2967 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002968 return
2969
2970 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002971 if num_changes > 1:
2972 change_words = 'changes were'
2973 else:
2974 change_words = 'change was'
2975 print('\n%d external %s published to %s:\n' %
2976 (num_changes, change_words, self.GetIssueURL(short=True)))
2977
2978 # Print an overview of external changes.
2979 ps_to_commit = {}
2980 ps_to_info = {}
2981 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2982 for commit_id, revision_info in revisions.get('revisions', {}).items():
2983 ps_num = revision_info['_number']
2984 ps_to_commit[ps_num] = commit_id
2985 ps_to_info[ps_num] = revision_info
2986
2987 for ps in range(external_ps, local_ps, -1):
2988 commit = ps_to_commit[ps][:8]
2989 desc = ps_to_info[ps].get('description', '')
2990 print('Patchset %d [%s] %s' % (ps, commit, desc))
2991
2992 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2993 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002994 return
2995
2996 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2997 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2998 external_base = external_parent['commit']
2999
3000 branch = git_common.current_branch()
3001 local_base = self.GetCommonAncestorWithUpstream()
3002 if local_base != external_base:
3003 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3004 (local_base, external_base))
3005 if git_common.upstream(branch):
3006 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3007 'to make these the same.')
3008 print('No upstream branch set. Consider setting it and using '
3009 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3010
3011 # Fetch Gerrit's CL base if it doesn't exist locally.
3012 remote, _ = self.GetRemoteBranch()
3013 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3014 RunGitSilent(['fetch', remote, external_base])
3015
3016 # Get the diff between local_ps and external_ps.
3017 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003018 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003019 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3020 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3021 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3022 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3023 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3024
3025 # Diff can be empty in the case of trivial rebases.
3026 if not diff:
3027 return external_base
3028
3029 # Apply the diff.
3030 with gclient_utils.temporary_file() as diff_tempfile:
3031 gclient_utils.FileWrite(diff_tempfile, diff)
3032 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3033 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3034 if not clean_patch:
3035 # Normally patchset is set after upload. But because we exit, that never
3036 # happens. Updating here makes sure that subsequent uploads don't need
3037 # to fetch/apply the same diff again.
3038 self.SetPatchset(external_ps)
3039 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3040 'conflicts and reupload.')
3041
3042 message = 'Incorporate external changes from '
3043 if num_changes == 1:
3044 message += 'patchset %d' % external_ps
3045 else:
3046 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3047 RunGitSilent(['commit', '-am', message])
3048 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3049 # patchset title instead of this 'Incorporate' message.
3050 return external_base
3051
Edward Lemura12175c2020-03-09 16:58:26 +00003052 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003053 """Re-commits using the current message, assumes the commit hook is in
3054 place.
3055 """
Edward Lemura12175c2020-03-09 16:58:26 +00003056 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003057 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003058 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003059 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003060 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003061
3062 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003063
tandriie113dfd2016-10-11 10:20:12 -07003064 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003065 try:
3066 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003067 except GerritChangeNotExists:
3068 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003069
3070 if data['status'] in ('ABANDONED', 'MERGED'):
3071 return 'CL %s is closed' % self.GetIssue()
3072
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003073 def GetGerritChange(self, patchset=None):
3074 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003075 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003076 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003077 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003078 data = self._GetChangeDetail(['ALL_REVISIONS'])
3079
3080 assert host and issue and patchset, 'CL must be uploaded first'
3081
3082 has_patchset = any(
3083 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003084 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003085 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003086 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003087 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003088
tandrii8c5a3532016-11-04 07:52:02 -07003089 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003090 'host': host,
3091 'change': issue,
3092 'project': data['project'],
3093 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003094 }
tandriie113dfd2016-10-11 10:20:12 -07003095
tandriide281ae2016-10-12 06:02:30 -07003096 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003097 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003098
Edward Lemur707d70b2018-02-07 00:50:14 +01003099 def GetReviewers(self):
3100 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003101 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003102
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003103
Lei Zhang8a0efc12020-08-05 19:58:45 +00003104def _get_bug_line_values(default_project_prefix, bugs):
3105 """Given default_project_prefix and comma separated list of bugs, yields bug
3106 line values.
tandriif9aefb72016-07-01 09:06:51 -07003107
3108 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003109 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003110 * string, which is left as is.
3111
3112 This function may produce more than one line, because bugdroid expects one
3113 project per line.
3114
Lei Zhang8a0efc12020-08-05 19:58:45 +00003115 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003116 ['v8:123', 'chromium:789']
3117 """
3118 default_bugs = []
3119 others = []
3120 for bug in bugs.split(','):
3121 bug = bug.strip()
3122 if bug:
3123 try:
3124 default_bugs.append(int(bug))
3125 except ValueError:
3126 others.append(bug)
3127
3128 if default_bugs:
3129 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003130 if default_project_prefix:
3131 if not default_project_prefix.endswith(':'):
3132 default_project_prefix += ':'
3133 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003134 else:
3135 yield default_bugs
3136 for other in sorted(others):
3137 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3138 yield other
3139
3140
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003141class ChangeDescription(object):
3142 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003143 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003144 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003145 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003146 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003147 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003148 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3149 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003150 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003151 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003152
Dan Beamd8b04ca2019-10-10 21:23:26 +00003153 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003154 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003155 if bug:
3156 regexp = re.compile(self.BUG_LINE)
3157 prefix = settings.GetBugPrefix()
3158 if not any((regexp.match(line) for line in self._description_lines)):
3159 values = list(_get_bug_line_values(prefix, bug))
3160 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003161 if fixed:
3162 regexp = re.compile(self.FIXED_LINE)
3163 prefix = settings.GetBugPrefix()
3164 if not any((regexp.match(line) for line in self._description_lines)):
3165 values = list(_get_bug_line_values(prefix, fixed))
3166 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003167
agable@chromium.org42c20792013-09-12 17:34:49 +00003168 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003169 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003170 return '\n'.join(self._description_lines)
3171
3172 def set_description(self, desc):
3173 if isinstance(desc, basestring):
3174 lines = desc.splitlines()
3175 else:
3176 lines = [line.rstrip() for line in desc]
3177 while lines and not lines[0]:
3178 lines.pop(0)
3179 while lines and not lines[-1]:
3180 lines.pop(-1)
3181 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003182
Edward Lemur5a644f82020-03-18 16:44:57 +00003183 def ensure_change_id(self, change_id):
3184 description = self.description
3185 footer_change_ids = git_footers.get_footer_change_id(description)
3186 # Make sure that the Change-Id in the description matches the given one.
3187 if footer_change_ids != [change_id]:
3188 if footer_change_ids:
3189 # Remove any existing Change-Id footers since they don't match the
3190 # expected change_id footer.
3191 description = git_footers.remove_footer(description, 'Change-Id')
3192 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3193 'if you want to set a new one.')
3194 # Add the expected Change-Id footer.
3195 description = git_footers.add_footer_change_id(description, change_id)
3196 self.set_description(description)
3197
Joanna Wang39811b12023-01-20 23:09:48 +00003198 def update_reviewers(self, reviewers):
3199 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003200
3201 Args:
3202 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003203 """
Joanna Wang39811b12023-01-20 23:09:48 +00003204 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003205 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003206
3207 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003208
Joanna Wang39811b12023-01-20 23:09:48 +00003209 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003210 regexp = re.compile(self.R_LINE)
3211 matches = [regexp.match(line) for line in self._description_lines]
3212 new_desc = [l for i, l in enumerate(self._description_lines)
3213 if not matches[i]]
3214 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003215
Joanna Wang39811b12023-01-20 23:09:48 +00003216 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003217
Joanna Wang39811b12023-01-20 23:09:48 +00003218 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003219 for match in matches:
3220 if not match:
3221 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003222 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003223
Joanna Wang39811b12023-01-20 23:09:48 +00003224 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003225
3226 # Put the new lines in the description where the old first R= line was.
3227 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3228 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003229 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003230 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003231 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003232
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003233 def set_preserve_tryjobs(self):
3234 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3235 footers = git_footers.parse_footers(self.description)
3236 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3237 if v.lower() == 'true':
3238 return
3239 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3240
Anthony Polito8b955342019-09-24 19:01:36 +00003241 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003242 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003243 self.set_description([
3244 '# Enter a description of the change.',
3245 '# This will be displayed on the codereview site.',
3246 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003247 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003248 '--------------------',
3249 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003250 bug_regexp = re.compile(self.BUG_LINE)
3251 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003252 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003253 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003254
Dan Beamd8b04ca2019-10-10 21:23:26 +00003255 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003256 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003257
Bruce Dawsonfc487042020-10-27 19:11:37 +00003258 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003259 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003260 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003261 if not content:
3262 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003263 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003264
Bruce Dawson2377b012018-01-11 16:46:49 -08003265 # Strip off comments and default inserted "Bug:" line.
3266 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003267 (line.startswith('#') or
3268 line.rstrip() == "Bug:" or
3269 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003270 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003271 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003272 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003273
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003274 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003275 """Adds a footer line to the description.
3276
3277 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3278 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3279 that Gerrit footers are always at the end.
3280 """
3281 parsed_footer_line = git_footers.parse_footer(line)
3282 if parsed_footer_line:
3283 # Line is a gerrit footer in the form: Footer-Key: any value.
3284 # Thus, must be appended observing Gerrit footer rules.
3285 self.set_description(
3286 git_footers.add_footer(self.description,
3287 key=parsed_footer_line[0],
3288 value=parsed_footer_line[1]))
3289 return
3290
3291 if not self._description_lines:
3292 self._description_lines.append(line)
3293 return
3294
3295 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3296 if gerrit_footers:
3297 # git_footers.split_footers ensures that there is an empty line before
3298 # actual (gerrit) footers, if any. We have to keep it that way.
3299 assert top_lines and top_lines[-1] == ''
3300 top_lines, separator = top_lines[:-1], top_lines[-1:]
3301 else:
3302 separator = [] # No need for separator if there are no gerrit_footers.
3303
3304 prev_line = top_lines[-1] if top_lines else ''
3305 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3306 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3307 top_lines.append('')
3308 top_lines.append(line)
3309 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003310
tandrii99a72f22016-08-17 14:33:24 -07003311 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003312 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003313 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003314 reviewers = [match.group(2).strip()
3315 for match in matches
3316 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003317 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003318
bradnelsond975b302016-10-23 12:20:23 -07003319 def get_cced(self):
3320 """Retrieves the list of reviewers."""
3321 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3322 cced = [match.group(2).strip() for match in matches if match]
3323 return cleanup_list(cced)
3324
Nodir Turakulov23b82142017-11-16 11:04:25 -08003325 def get_hash_tags(self):
3326 """Extracts and sanitizes a list of Gerrit hashtags."""
3327 subject = (self._description_lines or ('',))[0]
3328 subject = re.sub(
3329 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3330
3331 tags = []
3332 start = 0
3333 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3334 while True:
3335 m = bracket_exp.match(subject, start)
3336 if not m:
3337 break
3338 tags.append(self.sanitize_hash_tag(m.group(1)))
3339 start = m.end()
3340
3341 if not tags:
3342 # Try "Tag: " prefix.
3343 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3344 if m:
3345 tags.append(self.sanitize_hash_tag(m.group(1)))
3346 return tags
3347
3348 @classmethod
3349 def sanitize_hash_tag(cls, tag):
3350 """Returns a sanitized Gerrit hash tag.
3351
3352 A sanitized hashtag can be used as a git push refspec parameter value.
3353 """
3354 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3355
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003356
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003357def FindCodereviewSettingsFile(filename='codereview.settings'):
3358 """Finds the given file starting in the cwd and going up.
3359
3360 Only looks up to the top of the repository unless an
3361 'inherit-review-settings-ok' file exists in the root of the repository.
3362 """
3363 inherit_ok_file = 'inherit-review-settings-ok'
3364 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003365 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003366 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003367 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003368 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003369 if os.path.isfile(os.path.join(cwd, filename)):
3370 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003371 if cwd == root:
3372 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003373 parent_dir = os.path.dirname(cwd)
3374 if parent_dir == cwd:
3375 # We hit the system root directory.
3376 break
3377 cwd = parent_dir
3378 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003379
3380
3381def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003382 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003383 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003384
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003385 def SetProperty(name, setting, unset_error_ok=False):
3386 fullname = 'rietveld.' + name
3387 if setting in keyvals:
3388 RunGit(['config', fullname, keyvals[setting]])
3389 else:
3390 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3391
tandrii48df5812016-10-17 03:55:37 -07003392 if not keyvals.get('GERRIT_HOST', False):
3393 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003394 # Only server setting is required. Other settings can be absent.
3395 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003396 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003397 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3398 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003399 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003400 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3401 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003402 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3403 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003404 SetProperty(
3405 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003406 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003407
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003408 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003409 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003410
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003411 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003412 RunGit(['config', 'gerrit.squash-uploads',
3413 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003414
tandrii@chromium.org28253532016-04-14 13:46:56 +00003415 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003416 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003417 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3418
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003419 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003420 # should be of the form
3421 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3422 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003423 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3424 keyvals['ORIGIN_URL_CONFIG']])
3425
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003426
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003427def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003428 """Downloads a network object to a local file, like urllib.urlretrieve.
3429
3430 This is necessary because urllib is broken for SSL connections via a proxy.
3431 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003432 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003433 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003434
3435
ukai@chromium.org712d6102013-11-27 00:52:58 +00003436def hasSheBang(fname):
3437 """Checks fname is a #! script."""
3438 with open(fname) as f:
3439 return f.read(2).startswith('#!')
3440
3441
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003442def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003443 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003444
3445 Args:
3446 force: True to update hooks. False to install hooks if not present.
3447 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003448 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003449 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3450 if not os.access(dst, os.X_OK):
3451 if os.path.exists(dst):
3452 if not force:
3453 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003454 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003455 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003456 if not hasSheBang(dst):
3457 DieWithError('Not a script: %s\n'
3458 'You need to download from\n%s\n'
3459 'into .git/hooks/commit-msg and '
3460 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003461 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3462 except Exception:
3463 if os.path.exists(dst):
3464 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003465 DieWithError('\nFailed to download hooks.\n'
3466 'You need to download from\n%s\n'
3467 'into .git/hooks/commit-msg and '
3468 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003469
3470
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003471class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003472 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003473
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003474 def __init__(self):
3475 # Cached list of [host, identity, source], where source is either
3476 # .gitcookies or .netrc.
3477 self._all_hosts = None
3478
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003479 def ensure_configured_gitcookies(self):
3480 """Runs checks and suggests fixes to make git use .gitcookies from default
3481 path."""
3482 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3483 configured_path = RunGitSilent(
3484 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003485 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003486 if configured_path:
3487 self._ensure_default_gitcookies_path(configured_path, default)
3488 else:
3489 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003490
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003491 @staticmethod
3492 def _ensure_default_gitcookies_path(configured_path, default_path):
3493 assert configured_path
3494 if configured_path == default_path:
3495 print('git is already configured to use your .gitcookies from %s' %
3496 configured_path)
3497 return
3498
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003499 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003500 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3501 (configured_path, default_path))
3502
3503 if not os.path.exists(configured_path):
3504 print('However, your configured .gitcookies file is missing.')
3505 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3506 action='reconfigure')
3507 RunGit(['config', '--global', 'http.cookiefile', default_path])
3508 return
3509
3510 if os.path.exists(default_path):
3511 print('WARNING: default .gitcookies file already exists %s' %
3512 default_path)
3513 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3514 default_path)
3515
3516 confirm_or_exit('Move existing .gitcookies to default location?',
3517 action='move')
3518 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003519 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003520 print('Moved and reconfigured git to use .gitcookies from %s' %
3521 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003522
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003523 @staticmethod
3524 def _configure_gitcookies_path(default_path):
3525 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3526 if os.path.exists(netrc_path):
3527 print('You seem to be using outdated .netrc for git credentials: %s' %
3528 netrc_path)
3529 print('This tool will guide you through setting up recommended '
3530 '.gitcookies store for git credentials.\n'
3531 '\n'
3532 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3533 ' git config --global --unset http.cookiefile\n'
3534 ' mv %s %s.backup\n\n' % (default_path, default_path))
3535 confirm_or_exit(action='setup .gitcookies')
3536 RunGit(['config', '--global', 'http.cookiefile', default_path])
3537 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003538
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003539 def get_hosts_with_creds(self, include_netrc=False):
3540 if self._all_hosts is None:
3541 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003542 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3543 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3544 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3545 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003546
3547 if include_netrc:
3548 return self._all_hosts
3549 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3550
3551 def print_current_creds(self, include_netrc=False):
3552 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3553 if not hosts:
3554 print('No Git/Gerrit credentials found')
3555 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003556 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003557 header = [('Host', 'User', 'Which file'),
3558 ['=' * l for l in lengths]]
3559 for row in (header + hosts):
3560 print('\t'.join((('%%+%ds' % l) % s)
3561 for l, s in zip(lengths, row)))
3562
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003563 @staticmethod
3564 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003565 """Parses identity "git-<username>.domain" into <username> and domain."""
3566 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003567 # distinguishable from sub-domains. But we do know typical domains:
3568 if identity.endswith('.chromium.org'):
3569 domain = 'chromium.org'
3570 username = identity[:-len('.chromium.org')]
3571 else:
3572 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003573 if username.startswith('git-'):
3574 username = username[len('git-'):]
3575 return username, domain
3576
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003577 def has_generic_host(self):
3578 """Returns whether generic .googlesource.com has been configured.
3579
3580 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3581 """
3582 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003583 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003584 return True
3585 return False
3586
3587 def _get_git_gerrit_identity_pairs(self):
3588 """Returns map from canonic host to pair of identities (Git, Gerrit).
3589
3590 One of identities might be None, meaning not configured.
3591 """
3592 host_to_identity_pairs = {}
3593 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003594 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003595 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3596 idx = 0 if canonical == host else 1
3597 pair[idx] = identity
3598 return host_to_identity_pairs
3599
3600 def get_partially_configured_hosts(self):
3601 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003602 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003603 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003604 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003605
3606 def get_conflicting_hosts(self):
3607 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003608 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003609 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003610 if None not in (i1, i2) and i1 != i2)
3611
3612 def get_duplicated_hosts(self):
3613 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003614 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003615
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003616
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003617 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003618 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003619 hosts = sorted(hosts)
3620 assert hosts
3621 if extra_column_func is None:
3622 extras = [''] * len(hosts)
3623 else:
3624 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003625 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3626 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003627 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003628 lines.append(tmpl % he)
3629 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003630
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003631 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003632 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003633 yield ('.googlesource.com wildcard record detected',
3634 ['Chrome Infrastructure team recommends to list full host names '
3635 'explicitly.'],
3636 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003637
3638 dups = self.get_duplicated_hosts()
3639 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003640 yield ('The following hosts were defined twice',
3641 self._format_hosts(dups),
3642 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003643
3644 partial = self.get_partially_configured_hosts()
3645 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003646 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3647 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003648 self._format_hosts(
3649 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3650 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003651
3652 conflicting = self.get_conflicting_hosts()
3653 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003654 yield ('The following Git hosts have differing credentials from their '
3655 'Gerrit counterparts',
3656 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3657 tuple(self._get_git_gerrit_identity_pairs()[host])),
3658 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003659
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003660 def find_and_report_problems(self):
3661 """Returns True if there was at least one problem, else False."""
3662 found = False
3663 bad_hosts = set()
3664 for title, sublines, hosts in self._find_problems():
3665 if not found:
3666 found = True
3667 print('\n\n.gitcookies problem report:\n')
3668 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003669 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003670 if sublines:
3671 print()
3672 print(' %s' % '\n '.join(sublines))
3673 print()
3674
3675 if bad_hosts:
3676 assert found
3677 print(' You can manually remove corresponding lines in your %s file and '
3678 'visit the following URLs with correct account to generate '
3679 'correct credential lines:\n' %
3680 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003681 print(' %s' % '\n '.join(
3682 sorted(
3683 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3684 _canonical_git_googlesource_host(host))
3685 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003686 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003687
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003688
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003689@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003690def CMDcreds_check(parser, args):
3691 """Checks credentials and suggests changes."""
3692 _, _ = parser.parse_args(args)
3693
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003694 # Code below checks .gitcookies. Abort if using something else.
3695 authn = gerrit_util.Authenticator.get()
3696 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003697 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003698 'This command is not designed for bot environment. It checks '
3699 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003700 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3701 if isinstance(authn, gerrit_util.GceAuthenticator):
3702 message += (
3703 '\n'
3704 'If you need to run this on GCE or a cloudtop instance, '
3705 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3706 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003707
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003708 checker = _GitCookiesChecker()
3709 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003710
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003711 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003712 checker.print_current_creds(include_netrc=True)
3713
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003714 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003715 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003716 return 0
3717 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003718
3719
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003720@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003721def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003722 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003723 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003724 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003725 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003726 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003727 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003728 return RunGit(['config', 'branch.%s.base-url' % branch],
3729 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003730
3731 print('Setting base-url to %s' % args[0])
3732 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3733 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003734
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003735
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003736def color_for_status(status):
3737 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003738 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003739 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003740 'unsent': BOLD + Fore.YELLOW,
3741 'waiting': BOLD + Fore.RED,
3742 'reply': BOLD + Fore.YELLOW,
3743 'not lgtm': BOLD + Fore.RED,
3744 'lgtm': BOLD + Fore.GREEN,
3745 'commit': BOLD + Fore.MAGENTA,
3746 'closed': BOLD + Fore.CYAN,
3747 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003748 }.get(status, Fore.WHITE)
3749
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003750
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003751def get_cl_statuses(changes, fine_grained, max_processes=None):
3752 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003753
3754 If fine_grained is true, this will fetch CL statuses from the server.
3755 Otherwise, simply indicate if there's a matching url for the given branches.
3756
3757 If max_processes is specified, it is used as the maximum number of processes
3758 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3759 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003760
3761 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003762 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003763 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003764 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003765
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003766 if not fine_grained:
3767 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003768 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003769 for cl in changes:
3770 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003771 return
3772
3773 # First, sort out authentication issues.
3774 logging.debug('ensuring credentials exist')
3775 for cl in changes:
3776 cl.EnsureAuthenticated(force=False, refresh=True)
3777
3778 def fetch(cl):
3779 try:
3780 return (cl, cl.GetStatus())
3781 except:
3782 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003783 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003784 raise
3785
3786 threads_count = len(changes)
3787 if max_processes:
3788 threads_count = max(1, min(threads_count, max_processes))
3789 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3790
Edward Lemur61bf4172020-02-24 23:22:37 +00003791 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003792 fetched_cls = set()
3793 try:
3794 it = pool.imap_unordered(fetch, changes).__iter__()
3795 while True:
3796 try:
3797 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003798 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003799 break
3800 fetched_cls.add(cl)
3801 yield cl, status
3802 finally:
3803 pool.close()
3804
3805 # Add any branches that failed to fetch.
3806 for cl in set(changes) - fetched_cls:
3807 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003808
rmistry@google.com2dd99862015-06-22 12:22:18 +00003809
Jose Lopes3863fc52020-04-07 17:00:25 +00003810def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003811 """Uploads CLs of local branches that are dependents of the current branch.
3812
3813 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003814
3815 test1 -> test2.1 -> test3.1
3816 -> test3.2
3817 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003818
3819 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3820 run on the dependent branches in this order:
3821 test2.1, test3.1, test3.2, test2.2, test3.3
3822
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003823 Note: This function does not rebase your local dependent branches. Use it
3824 when you make a change to the parent branch that will not conflict
3825 with its dependent branches, and you would like their dependencies
3826 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003827 """
3828 if git_common.is_dirty_git_tree('upload-branch-deps'):
3829 return 1
3830
3831 root_branch = cl.GetBranch()
3832 if root_branch is None:
3833 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3834 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003835 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003836 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3837 'patchset dependencies without an uploaded CL.')
3838
3839 branches = RunGit(['for-each-ref',
3840 '--format=%(refname:short) %(upstream:short)',
3841 'refs/heads'])
3842 if not branches:
3843 print('No local branches found.')
3844 return 0
3845
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003846 # Create a dictionary of all local branches to the branches that are
3847 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003848 tracked_to_dependents = collections.defaultdict(list)
3849 for b in branches.splitlines():
3850 tokens = b.split()
3851 if len(tokens) == 2:
3852 branch_name, tracked = tokens
3853 tracked_to_dependents[tracked].append(branch_name)
3854
vapiera7fbd5a2016-06-16 09:17:49 -07003855 print()
3856 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003857 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003858
rmistry@google.com2dd99862015-06-22 12:22:18 +00003859 def traverse_dependents_preorder(branch, padding=''):
3860 dependents_to_process = tracked_to_dependents.get(branch, [])
3861 padding += ' '
3862 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003863 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003864 dependents.append(dependent)
3865 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003866
rmistry@google.com2dd99862015-06-22 12:22:18 +00003867 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003868 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003869
3870 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003871 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003872 return 0
3873
Jose Lopes3863fc52020-04-07 17:00:25 +00003874 if not force:
3875 confirm_or_exit('This command will checkout all dependent branches and run '
3876 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003877
rmistry@google.com2dd99862015-06-22 12:22:18 +00003878 # Record all dependents that failed to upload.
3879 failures = {}
3880 # Go through all dependents, checkout the branch and upload.
3881 try:
3882 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003883 print()
3884 print('--------------------------------------')
3885 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003886 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003887 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003888 try:
3889 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003890 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003891 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003892 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003893 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003894 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003895 finally:
3896 # Swap back to the original root branch.
3897 RunGit(['checkout', '-q', root_branch])
3898
vapiera7fbd5a2016-06-16 09:17:49 -07003899 print()
3900 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003901 for dependent_branch in dependents:
3902 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003903 print(' %s : %s' % (dependent_branch, upload_status))
3904 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003905
3906 return 0
3907
3908
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003909def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003910 """Given a proposed tag name, returns a tag name that is guaranteed to be
3911 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3912 or 'foo-3', and so on."""
3913
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003914 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003915 for suffix_num in itertools.count(1):
3916 if suffix_num == 1:
3917 to_check = proposed_tag
3918 else:
3919 to_check = '%s-%d' % (proposed_tag, suffix_num)
3920
3921 if to_check not in existing_tags:
3922 return to_check
3923
3924
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003925@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003926def CMDarchive(parser, args):
3927 """Archives and deletes branches associated with closed changelists."""
3928 parser.add_option(
3929 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003930 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003931 parser.add_option(
3932 '-f', '--force', action='store_true',
3933 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003934 parser.add_option(
3935 '-d', '--dry-run', action='store_true',
3936 help='Skip the branch tagging and removal steps.')
3937 parser.add_option(
3938 '-t', '--notags', action='store_true',
3939 help='Do not tag archived branches. '
3940 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003941 parser.add_option(
3942 '-p',
3943 '--pattern',
3944 default='git-cl-archived-{issue}-{branch}',
3945 help='Format string for archive tags. '
3946 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003947
kmarshall3bff56b2016-06-06 18:31:47 -07003948 options, args = parser.parse_args(args)
3949 if args:
3950 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003951
3952 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3953 if not branches:
3954 return 0
3955
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003956 tags = RunGit(['for-each-ref', '--format=%(refname)',
3957 'refs/tags']).splitlines() or []
3958 tags = [t.split('/')[-1] for t in tags]
3959
vapiera7fbd5a2016-06-16 09:17:49 -07003960 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003961 changes = [Changelist(branchref=b)
3962 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003963 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3964 statuses = get_cl_statuses(changes,
3965 fine_grained=True,
3966 max_processes=options.maxjobs)
3967 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003968 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3969 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003970 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003971 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003972 proposal.sort()
3973
3974 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003975 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003976 return 0
3977
Edward Lemur85153282020-02-14 22:06:29 +00003978 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003979
vapiera7fbd5a2016-06-16 09:17:49 -07003980 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003981 if options.notags:
3982 for next_item in proposal:
3983 print(' ' + next_item[0])
3984 else:
3985 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3986 for next_item in proposal:
3987 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003988
kmarshall9249e012016-08-23 12:02:16 -07003989 # Quit now on precondition failure or if instructed by the user, either
3990 # via an interactive prompt or by command line flags.
3991 if options.dry_run:
3992 print('\nNo changes were made (dry run).\n')
3993 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003994
3995 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003996 print('You are currently on a branch \'%s\' which is associated with a '
3997 'closed codereview issue, so archive cannot proceed. Please '
3998 'checkout another branch and run this command again.' %
3999 current_branch)
4000 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004001
4002 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004003 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004004 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004005 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004006 return 1
4007
4008 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004009 if not options.notags:
4010 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004011
4012 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4013 # Clean up the tag if we failed to delete the branch.
4014 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004015
vapiera7fbd5a2016-06-16 09:17:49 -07004016 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004017
4018 return 0
4019
4020
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004021@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004022def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004023 """Show status of changelists.
4024
4025 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004026 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004027 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004028 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004029 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004030 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004031 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004032 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004033
4034 Also see 'git cl comments'.
4035 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004036 parser.add_option(
4037 '--no-branch-color',
4038 action='store_true',
4039 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004040 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004041 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004042 parser.add_option('-f', '--fast', action='store_true',
4043 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004044 parser.add_option(
4045 '-j', '--maxjobs', action='store', type=int,
4046 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004047 parser.add_option(
4048 '-i', '--issue', type=int,
4049 help='Operate on this issue instead of the current branch\'s implicit '
4050 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004051 parser.add_option('-d',
4052 '--date-order',
4053 action='store_true',
4054 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004055 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004056 if args:
4057 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004058
iannuccie53c9352016-08-17 14:40:40 -07004059 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004060 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004061
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004062 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004063 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004064 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004065 if cl.GetIssue():
4066 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004067 elif options.field == 'id':
4068 issueid = cl.GetIssue()
4069 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004070 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004071 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004072 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004073 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004074 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004075 elif options.field == 'status':
4076 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004077 elif options.field == 'url':
4078 url = cl.GetIssueURL()
4079 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004080 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004081 return 0
4082
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004083 branches = RunGit([
4084 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4085 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004086 if not branches:
4087 print('No local branch found.')
4088 return 0
4089
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004090 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004091 Changelist(branchref=b, commit_date=ct)
4092 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4093 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004094 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004095 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004096 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004097 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004098
Edward Lemur85153282020-02-14 22:06:29 +00004099 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004100
4101 def FormatBranchName(branch, colorize=False):
4102 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4103 an asterisk when it is the current branch."""
4104
4105 asterisk = ""
4106 color = Fore.RESET
4107 if branch == current_branch:
4108 asterisk = "* "
4109 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004110 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004111
4112 if colorize:
4113 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004114 return asterisk + branch_name
4115
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004116 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004117
4118 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004119
4120 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004121 sorted_changes = sorted(changes,
4122 key=lambda c: c.GetCommitDate(),
4123 reverse=True)
4124 else:
4125 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4126 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004127 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004128 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004129 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004130 branch_statuses[c.GetBranch()] = status
4131 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004132 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004133 if url and (not status or status == 'error'):
4134 # The issue probably doesn't exist anymore.
4135 url += ' (broken)'
4136
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004137 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004138 # Turn off bold as well as colors.
4139 END = '\033[0m'
4140 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004141 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004142 color = ''
4143 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004144 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004145
Alan Cuttera3be9a52019-03-04 18:50:33 +00004146 branch_display = FormatBranchName(branch)
4147 padding = ' ' * (alignment - len(branch_display))
4148 if not options.no_branch_color:
4149 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004150
Alan Cuttera3be9a52019-03-04 18:50:33 +00004151 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4152 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004153
vapiera7fbd5a2016-06-16 09:17:49 -07004154 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004155 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004156 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004157 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004158 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004159 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004160 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004161 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004162 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004163 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004164 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004165 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004166 return 0
4167
4168
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004169def colorize_CMDstatus_doc():
4170 """To be called once in main() to add colors to git cl status help."""
4171 colors = [i for i in dir(Fore) if i[0].isupper()]
4172
4173 def colorize_line(line):
4174 for color in colors:
4175 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004176 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004177 indent = len(line) - len(line.lstrip(' ')) + 1
4178 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4179 return line
4180
4181 lines = CMDstatus.__doc__.splitlines()
4182 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4183
4184
phajdan.jre328cf92016-08-22 04:12:17 -07004185def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004186 if path == '-':
4187 json.dump(contents, sys.stdout)
4188 else:
4189 with open(path, 'w') as f:
4190 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004191
4192
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004193@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004194@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004195def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004196 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004197
4198 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004199 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004200 parser.add_option('-r', '--reverse', action='store_true',
4201 help='Lookup the branch(es) for the specified issues. If '
4202 'no issues are specified, all branches with mapped '
4203 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004204 parser.add_option('--json',
4205 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004206 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004207
dnj@chromium.org406c4402015-03-03 17:22:28 +00004208 if options.reverse:
4209 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004210 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004211 # Reverse issue lookup.
4212 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004213
4214 git_config = {}
4215 for config in RunGit(['config', '--get-regexp',
4216 r'branch\..*issue']).splitlines():
4217 name, _space, val = config.partition(' ')
4218 git_config[name] = val
4219
dnj@chromium.org406c4402015-03-03 17:22:28 +00004220 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004221 issue = git_config.get(
4222 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004223 if issue:
4224 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004225 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004226 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004227 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004228 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004229 try:
4230 issue_num = int(issue)
4231 except ValueError:
4232 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004233 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004234 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004235 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004236 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004237 if options.json:
4238 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004239 return 0
4240
4241 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004242 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004243 if not issue.valid:
4244 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4245 'or no argument to list it.\n'
4246 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004247 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004248 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004249 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004250 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004251 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4252 if options.json:
4253 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004254 'gerrit_host': cl.GetGerritHost(),
4255 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004256 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004257 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004258 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004259 return 0
4260
4261
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004262@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004263def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004264 """Shows or posts review comments for any changelist."""
4265 parser.add_option('-a', '--add-comment', dest='comment',
4266 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004267 parser.add_option('-p', '--publish', action='store_true',
4268 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004269 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004270 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004271 parser.add_option('-m', '--machine-readable', dest='readable',
4272 action='store_false', default=True,
4273 help='output comments in a format compatible with '
4274 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004275 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004276 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004277 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004278
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004279 issue = None
4280 if options.issue:
4281 try:
4282 issue = int(options.issue)
4283 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004284 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004285
Edward Lemur934836a2019-09-09 20:16:54 +00004286 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004287
4288 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004289 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004290 return 0
4291
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004292 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4293 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004294 for comment in summary:
4295 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004296 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004297 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004298 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004299 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004300 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004301 elif comment.autogenerated:
4302 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004303 else:
4304 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004305 print('\n%s%s %s%s\n%s' % (
4306 color,
4307 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4308 comment.sender,
4309 Fore.RESET,
4310 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4311
smut@google.comc85ac942015-09-15 16:34:43 +00004312 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004313 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004314 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004315 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4316 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004317 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004318 return 0
4319
4320
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004321@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004322@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004323def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004324 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004325 parser.add_option('-d', '--display', action='store_true',
4326 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004327 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004328 help='New description to set for this issue (- for stdin, '
4329 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004330 parser.add_option('-f', '--force', action='store_true',
4331 help='Delete any unpublished Gerrit edits for this issue '
4332 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004333
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004334 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004335
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004336 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004337 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004338 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004339 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004340 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004341
Edward Lemur934836a2019-09-09 20:16:54 +00004342 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004343 if target_issue_arg:
4344 kwargs['issue'] = target_issue_arg.issue
4345 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004346
4347 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004348 if not cl.GetIssue():
4349 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004350
Edward Lemur678a6842019-10-03 22:25:05 +00004351 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004352 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004353
Edward Lemur6c6827c2020-02-06 21:15:18 +00004354 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004355
smut@google.com34fb6b12015-07-13 20:03:26 +00004356 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004357 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004358 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004359
4360 if options.new_description:
4361 text = options.new_description
4362 if text == '-':
4363 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004364 elif text == '+':
4365 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004366 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004367
4368 description.set_description(text)
4369 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004370 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004371 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004372 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004373 return 0
4374
4375
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004376@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004377def CMDlint(parser, args):
4378 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004379 parser.add_option('--filter', action='append', metavar='-x,+y',
4380 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004381 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004382
4383 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004384 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004385 try:
4386 import cpplint
4387 import cpplint_chromium
4388 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004389 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004390 return 1
4391
4392 # Change the current working directory before calling lint so that it
4393 # shows the correct base.
4394 previous_cwd = os.getcwd()
4395 os.chdir(settings.GetRoot())
4396 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004397 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004398 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004399 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004400 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004401 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004402
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004403 # Process cpplint arguments, if any.
4404 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4405 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004406 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004407
Lei Zhang379d1ad2020-07-15 19:40:06 +00004408 include_regex = re.compile(settings.GetLintRegex())
4409 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004410 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4411 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004412 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004413 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004414 continue
4415
4416 if ignore_regex.match(filename):
4417 print('Ignoring file %s' % filename)
4418 continue
4419
4420 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4421 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004422 finally:
4423 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004424 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004425 if cpplint._cpplint_state.error_count != 0:
4426 return 1
4427 return 0
4428
4429
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004430@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004431def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004432 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004433 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004434 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004435 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004436 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004437 parser.add_option('--all', action='store_true',
4438 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004439 parser.add_option('--files',
4440 nargs=1,
4441 help='Semicolon-separated list of files to be marked as '
4442 'modified when executing presubmit or post-upload hooks. '
4443 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004444 parser.add_option('--parallel', action='store_true',
4445 help='Run all tests specified by input_api.RunTests in all '
4446 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004447 parser.add_option('--resultdb', action='store_true',
4448 help='Run presubmit checks in the ResultSink environment '
4449 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004450 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004451 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004452
sbc@chromium.org71437c02015-04-09 19:29:40 +00004453 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004454 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004455 return 1
4456
Edward Lemur934836a2019-09-09 20:16:54 +00004457 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004458 if args:
4459 base_branch = args[0]
4460 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004461 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004462 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004463
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004464 start = time.time()
4465 try:
4466 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4467 description = cl.FetchDescription()
4468 else:
4469 description = _create_description_from_log([base_branch])
4470 except Exception as e:
4471 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004472 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004473 elapsed = time.time() - start
4474 if elapsed > 5:
4475 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004476
Bruce Dawson13acea32022-05-03 22:13:08 +00004477 if not base_branch:
4478 if not options.force:
4479 print('use --force to check even when not on a branch.')
4480 return 1
4481 base_branch = 'HEAD'
4482
Josip Sokcevic017544d2022-03-31 23:47:53 +00004483 cl.RunHook(committing=not options.upload,
4484 may_prompt=False,
4485 verbose=options.verbose,
4486 parallel=options.parallel,
4487 upstream=base_branch,
4488 description=description,
4489 all_files=options.all,
4490 files=options.files,
4491 resultdb=options.resultdb,
4492 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004493 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004494
4495
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004496def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004497 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004498
4499 Works the same way as
4500 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4501 but can be called on demand on all platforms.
4502
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004503 The basic idea is to generate git hash of a state of the tree, original
4504 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004505 """
4506 lines = []
4507 tree_hash = RunGitSilent(['write-tree'])
4508 lines.append('tree %s' % tree_hash.strip())
4509 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4510 if code == 0:
4511 lines.append('parent %s' % parent.strip())
4512 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4513 lines.append('author %s' % author.strip())
4514 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4515 lines.append('committer %s' % committer.strip())
4516 lines.append('')
4517 # Note: Gerrit's commit-hook actually cleans message of some lines and
4518 # whitespace. This code is not doing this, but it clearly won't decrease
4519 # entropy.
4520 lines.append(message)
4521 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004522 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004523 return 'I%s' % change_hash.strip()
4524
4525
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004526def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004527 """Computes the remote branch ref to use for the CL.
4528
4529 Args:
4530 remote (str): The git remote for the CL.
4531 remote_branch (str): The git remote branch for the CL.
4532 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004533 """
4534 if not (remote and remote_branch):
4535 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004536
wittman@chromium.org455dc922015-01-26 20:15:50 +00004537 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004538 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004539 # refs, which are then translated into the remote full symbolic refs
4540 # below.
4541 if '/' not in target_branch:
4542 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4543 else:
4544 prefix_replacements = (
4545 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4546 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4547 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4548 )
4549 match = None
4550 for regex, replacement in prefix_replacements:
4551 match = re.search(regex, target_branch)
4552 if match:
4553 remote_branch = target_branch.replace(match.group(0), replacement)
4554 break
4555 if not match:
4556 # This is a branch path but not one we recognize; use as-is.
4557 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004558 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004559 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004560 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004561 # Handle the refs that need to land in different refs.
4562 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004563
wittman@chromium.org455dc922015-01-26 20:15:50 +00004564 # Create the true path to the remote branch.
4565 # Does the following translation:
4566 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004567 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004568 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4569 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4570 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4571 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4572 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4573 'refs/heads/')
4574 elif remote_branch.startswith('refs/remotes/branch-heads'):
4575 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004576
wittman@chromium.org455dc922015-01-26 20:15:50 +00004577 return remote_branch
4578
4579
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004580def cleanup_list(l):
4581 """Fixes a list so that comma separated items are put as individual items.
4582
4583 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4584 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4585 """
4586 items = sum((i.split(',') for i in l), [])
4587 stripped_items = (i.strip() for i in items)
4588 return sorted(filter(None, stripped_items))
4589
4590
Aaron Gable4db38df2017-11-03 14:59:07 -07004591@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004592@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004593def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004594 """Uploads the current changelist to codereview.
4595
4596 Can skip dependency patchset uploads for a branch by running:
4597 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004598 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004599 git config --unset branch.branch_name.skip-deps-uploads
4600 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004601
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004602 If the name of the checked out branch starts with "bug-" or "fix-" followed
4603 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004604 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004605
4606 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004607 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004608 [git-cl] add support for hashtags
4609 Foo bar: implement foo
4610 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004611 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004612 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4613 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004614 parser.add_option('--bypass-watchlists', action='store_true',
4615 dest='bypass_watchlists',
4616 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004617 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004618 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004619 parser.add_option('--message', '-m', dest='message',
4620 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004621 parser.add_option('-b', '--bug',
4622 help='pre-populate the bug number(s) for this issue. '
4623 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004624 parser.add_option('--message-file', dest='message_file',
4625 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004626 parser.add_option('--title', '-t', dest='title',
4627 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004628 parser.add_option('-T', '--skip-title', action='store_true',
4629 dest='skip_title',
4630 help='Use the most recent commit message as the title of '
4631 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004632 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004633 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004634 help='reviewer email addresses')
4635 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004636 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004637 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004638 parser.add_option('--hashtag', dest='hashtags',
4639 action='append', default=[],
4640 help=('Gerrit hashtag for new CL; '
4641 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004642 parser.add_option('-s',
4643 '--send-mail',
4644 '--send-email',
4645 dest='send_mail',
4646 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004647 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004648 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004649 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004650 metavar='TARGET',
4651 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004652 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004653 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004654 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004655 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004656 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004657 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004658 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004659 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4660 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004661 parser.add_option('-c',
4662 '--use-commit-queue',
4663 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004664 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004665 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004666 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004667 parser.add_option('-d', '--cq-dry-run',
4668 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004669 help='Send the patchset to do a CQ dry run right after '
4670 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004671 parser.add_option(
4672 '-q',
4673 '--cq-quick-run',
4674 action='store_true',
4675 default=False,
4676 help='Send the patchset to do a CQ quick run right after '
4677 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4678 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004679 parser.add_option('--set-bot-commit', action='store_true',
4680 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004681 parser.add_option('--preserve-tryjobs', action='store_true',
4682 help='instruct the CQ to let tryjobs running even after '
4683 'new patchsets are uploaded instead of canceling '
4684 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004685 parser.add_option('--dependencies', action='store_true',
4686 help='Uploads CLs of all the local branches that depend on '
4687 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004688 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4689 help='Sends your change to the CQ after an approval. Only '
4690 'works on repos that have the Auto-Submit label '
4691 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004692 parser.add_option('--parallel', action='store_true',
4693 help='Run all tests specified by input_api.RunTests in all '
4694 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004695 parser.add_option('--no-autocc', action='store_true',
4696 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004697 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004698 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004699 parser.add_option('-R', '--retry-failed', action='store_true',
4700 help='Retry failed tryjobs from old patchset immediately '
4701 'after uploading new patchset. Cannot be used with '
4702 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004703 parser.add_option('--fixed', '-x',
4704 help='List of bugs that will be commented on and marked '
4705 'fixed (pre-populates "Fixed:" tag). Same format as '
4706 '-b option / "Bug:" tag. If fixing several issues, '
4707 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004708 parser.add_option('--edit-description', action='store_true', default=False,
4709 help='Modify description before upload. Cannot be used '
4710 'with --force. It is a noop when --no-squash is set '
4711 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004712 parser.add_option('--git-completion-helper', action="store_true",
4713 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004714 parser.add_option('-o',
4715 '--push-options',
4716 action='append',
4717 default=[],
4718 help='Transmit the given string to the server when '
4719 'performing git push (pass-through). See git-push '
4720 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004721 parser.add_option('--no-add-changeid',
4722 action='store_true',
4723 dest='no_add_changeid',
4724 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004725 parser.add_option('--no-python2-post-upload-hooks',
4726 action='store_true',
4727 help='Only run post-upload hooks in Python 3.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004728 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004729
rmistry@google.com2dd99862015-06-22 12:22:18 +00004730 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004731 (options, args) = parser.parse_args(args)
4732
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004733 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004734 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4735 if opt.help != optparse.SUPPRESS_HELP))
4736 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004737
sbc@chromium.org71437c02015-04-09 19:29:40 +00004738 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004739 return 1
4740
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004741 options.reviewers = cleanup_list(options.reviewers)
4742 options.cc = cleanup_list(options.cc)
4743
Josipe827b0f2020-01-30 00:07:20 +00004744 if options.edit_description and options.force:
4745 parser.error('Only one of --force and --edit-description allowed')
4746
tandriib80458a2016-06-23 12:20:07 -07004747 if options.message_file:
4748 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004749 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004750 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004751
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004752 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004753 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004754 options.use_commit_queue,
4755 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004756 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4757 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004758
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004759 if options.skip_title and options.title:
4760 parser.error('Only one of --title and --skip-title allowed.')
4761
Aaron Gableedbc4132017-09-11 13:22:28 -07004762 if options.use_commit_queue:
4763 options.send_mail = True
4764
Edward Lesmes0dd54822020-03-26 18:24:25 +00004765 if options.squash is None:
4766 # Load default for user, repo, squash=true, in this order.
4767 options.squash = settings.GetSquashGerritUploads()
4768
Joanna Wangdd12deb2023-01-26 20:43:28 +00004769 if os.environ.get('DOGFOOD_STACKED_CHANGES') == '1':
4770 if options.dependencies:
4771 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004772
4773 UploadAllSquashed(options, orig_args)
4774 return 0
4775
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004776 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004777 # Warm change details cache now to avoid RPCs later, reducing latency for
4778 # developers.
4779 if cl.GetIssue():
4780 cl._GetChangeDetail(
4781 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4782
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004783 if options.retry_failed and not cl.GetIssue():
4784 print('No previous patchsets, so --retry-failed has no effect.')
4785 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004786
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004787 # cl.GetMostRecentPatchset uses cached information, and can return the last
4788 # patchset before upload. Calling it here makes it clear that it's the
4789 # last patchset before upload. Note that GetMostRecentPatchset will fail
4790 # if no CL has been uploaded yet.
4791 if options.retry_failed:
4792 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004793
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004794 ret = cl.CMDUpload(options, args, orig_args)
4795
4796 if options.retry_failed:
4797 if ret != 0:
4798 print('Upload failed, so --retry-failed has no effect.')
4799 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004800 builds, _ = _fetch_latest_builds(cl,
4801 DEFAULT_BUILDBUCKET_HOST,
4802 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004803 jobs = _filter_failed_for_retry(builds)
4804 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004805 print('No failed tryjobs, so --retry-failed has no effect.')
4806 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004807 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004808
4809 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004810
4811
Joanna Wang18de1f62023-01-21 01:24:24 +00004812def UploadAllSquashed(options, orig_args):
4813 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4814 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004815 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004816
Joanna Wangc710e2d2023-01-25 14:53:22 +00004817 # Create commits.
4818 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4819 if cherry_pick_current:
4820 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4821 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4822 uploads_by_cl.append((cls[0], new_upload))
4823 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004824 ordered_cls = list(reversed(cls))
4825
Joanna Wang6215dd02023-02-07 15:58:03 +00004826 parent = None
4827 origin = '.'
4828 cl = ordered_cls[0]
4829 branch = cl.GetBranch()
4830 while origin == '.':
4831 # Search for cl's closest ancestor with a gerrit hash.
4832 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4833 if origin == '.':
4834 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4835 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch,
4836 GERRIT_SQUASH_HASH_CONFIG_KEY)
4837 if parent:
4838 break
4839 branch = upstream_branch
4840 else:
4841 # Either the root of the tree is the cl's direct parent and the while
4842 # loop above only found empty branches between cl and the root of the
4843 # tree.
4844 parent = cl.GetCommonAncestorWithUpstream()
4845
Joanna Wangc710e2d2023-01-25 14:53:22 +00004846 for i, cl in enumerate(ordered_cls):
4847 # If we're in the middle of the stack, set end_commit to downstream's
4848 # direct ancestor.
4849 if i + 1 < len(ordered_cls):
4850 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4851 else:
4852 child_base_commit = None
4853 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004854 parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004855 end_commit=child_base_commit)
4856 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004857 parent = new_upload.commit_to_push
4858
4859 # Create refspec options
4860 cl, new_upload = uploads_by_cl[-1]
4861 refspec_opts = cl._GetRefSpecOptions(
4862 options,
4863 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004864 multi_change_upload=len(uploads_by_cl) > 1,
4865 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004866 refspec_suffix = ''
4867 if refspec_opts:
4868 refspec_suffix = '%' + ','.join(refspec_opts)
4869 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4870 refspec_suffix)
4871
4872 remote, remote_branch = cl.GetRemoteBranch()
4873 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4874 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4875 refspec_suffix)
4876
4877 # Git push
4878 git_push_metadata = {
4879 'gerrit_host':
4880 cl.GetGerritHost(),
4881 'title':
4882 options.title or '<untitled>',
4883 'change_id':
4884 git_footers.get_footer_change_id(new_upload.change_desc.description),
4885 'description':
4886 new_upload.change_desc.description,
4887 }
4888 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
4889 git_push_metadata)
4890
4891 # Post push updates
4892 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4893 change_numbers = [
4894 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4895 ]
4896
4897 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4898 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4899
4900 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004901
4902
4903def _UploadAllPrecheck(options, orig_args):
4904 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4905 """Checks the state of the tree and gives the user uploading options
4906
4907 Returns: A tuple of the ordered list of changes that have new commits
4908 since their last upload and a boolean of whether the user wants to
4909 cherry-pick and upload the current branch instead of uploading all cls.
4910 """
4911 branch_ref = None
4912 cls = []
4913 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004914 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004915
4916 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4917
4918 while True:
4919 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4920 DieWithError(
4921 'More than %s branches in the stack have not been uploaded.\n'
4922 'Are your branches in a misconfigured state?\n'
4923 'If not, please upload some upstream changes first.' %
4924 (_MAX_STACKED_BRANCHES_UPLOAD))
4925
4926 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004927
Joanna Wang6215dd02023-02-07 15:58:03 +00004928 # Only add CL if it has anything to commit.
4929 base_commit = cl.GetCommonAncestorWithUpstream()
4930 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4931
4932 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4933 if diff:
4934 cls.append(cl)
4935 if (not first_pass and
4936 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4937 # We are mid-stack and the user must upload their upstream branches.
4938 must_upload_upstream = True
4939 elif first_pass: # The current branch has nothing to commit. Exit.
4940 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4941 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
4942 first_pass = False
4943
4944 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00004945 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00004946 branch_ref = upstream_branch_ref # set branch for next run.
4947
Joanna Wang6215dd02023-02-07 15:58:03 +00004948 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4949 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
4950 upstream_branch,
4951 LAST_UPLOAD_HASH_CONFIG_KEY)
4952
Joanna Wang18de1f62023-01-21 01:24:24 +00004953 # Case 1: We've reached the beginning of the tree.
4954 if origin != '.':
4955 break
4956
Joanna Wang18de1f62023-01-21 01:24:24 +00004957 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00004958 # the user MUST upload them unless they are empty. Continue to
4959 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00004960 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00004961 continue
4962
Joanna Wang18de1f62023-01-21 01:24:24 +00004963 # Case 3: If upstream's last_upload == cl.base_commit we do
4964 # not need to upload any more upstreams from this point on.
4965 # (Even if there may be diverged branches higher up the tree)
4966 if base_commit == upstream_last_upload:
4967 break
4968
4969 # Case 4: If upstream's last_upload < cl.base_commit we are
4970 # uploading cl and upstream_cl.
4971 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004972 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00004973 continue
4974
4975 # Case 5: If cl.base_commit < upstream's last_upload the user
4976 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004977 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00004978 DieWithError(
4979 'At least one branch in the stack has diverged from its upstream '
4980 'branch and does not contain its upstream\'s last upload.\n'
4981 'Please rebase the stack with `git rebase-update` before uploading.')
4982
4983 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
4984 # any relation to commits in the tree. Continue up the tree until we hit
4985 # the root.
4986
4987 # We assume all cls in the stack have the same auth requirements and only
4988 # check this once.
4989 cls[0].EnsureAuthenticated(force=options.force)
4990
4991 cherry_pick = False
4992 if len(cls) > 1:
4993 message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00004994 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00004995 if len(orig_args):
4996 message = ('options %s will be used for all uploads.\n' % orig_args)
4997 if must_upload_upstream:
4998 confirm_or_exit('\n' + message +
Joanna Wang6215dd02023-02-07 15:58:03 +00004999 'Branches `%s` must be uploaded.\n' % branches)
Joanna Wang18de1f62023-01-21 01:24:24 +00005000 else:
5001 answer = gclient_utils.AskForData(
5002 '\n' + message +
5003 'Press enter to update branches %s.\nOr type `n` to upload only '
5004 '`%s` cherry-picked on %s\'s last upload:' %
Joanna Wang6215dd02023-02-07 15:58:03 +00005005 (branches, cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005006 if answer.lower() == 'n':
5007 cherry_pick = True
5008 return cls, cherry_pick
5009
5010
Francois Dorayd42c6812017-05-30 15:10:20 -04005011@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005012@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005013def CMDsplit(parser, args):
5014 """Splits a branch into smaller branches and uploads CLs.
5015
5016 Creates a branch and uploads a CL for each group of files modified in the
5017 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005018 comment, the string '$directory', is replaced with the directory containing
5019 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005020 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005021 parser.add_option('-d', '--description', dest='description_file',
5022 help='A text file containing a CL description in which '
5023 '$directory will be replaced by each CL\'s directory.')
5024 parser.add_option('-c', '--comment', dest='comment_file',
5025 help='A text file containing a CL comment.')
5026 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005027 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005028 help='List the files and reviewers for each CL that would '
5029 'be created, but don\'t create branches or CLs.')
5030 parser.add_option('--cq-dry-run', action='store_true',
5031 help='If set, will do a cq dry run for each uploaded CL. '
5032 'Please be careful when doing this; more than ~10 CLs '
5033 'has the potential to overload our build '
5034 'infrastructure. Try to upload these not during high '
5035 'load times (usually 11-3 Mountain View time). Email '
5036 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005037 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5038 default=True,
5039 help='Sends your change to the CQ after an approval. Only '
5040 'works on repos that have the Auto-Submit label '
5041 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005042 parser.add_option('--max-depth',
5043 type='int',
5044 default=0,
5045 help='The max depth to look for OWNERS files. Useful for '
5046 'controlling the granularity of the split CLs, e.g. '
5047 '--max-depth=1 will only split by top-level '
5048 'directory. Specifying a value less than 1 means no '
5049 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005050 options, _ = parser.parse_args(args)
5051
5052 if not options.description_file:
5053 parser.error('No --description flag specified.')
5054
5055 def WrappedCMDupload(args):
5056 return CMDupload(OptionParser(), args)
5057
Daniel Cheng403c44e2022-10-05 22:24:58 +00005058 return split_cl.SplitCl(options.description_file, options.comment_file,
5059 Changelist, WrappedCMDupload, options.dry_run,
5060 options.cq_dry_run, options.enable_auto_submit,
5061 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005062
5063
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005064@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005065@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005066def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005067 """DEPRECATED: Used to commit the current changelist via git-svn."""
5068 message = ('git-cl no longer supports committing to SVN repositories via '
5069 'git-svn. You probably want to use `git cl land` instead.')
5070 print(message)
5071 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005072
5073
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005074@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005075@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005076def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005077 """Commits the current changelist via git.
5078
5079 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5080 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005081 """
5082 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5083 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005084 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005085 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005086 parser.add_option('--parallel', action='store_true',
5087 help='Run all tests specified by input_api.RunTests in all '
5088 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005089 parser.add_option('--resultdb', action='store_true',
5090 help='Run presubmit checks in the ResultSink environment '
5091 'and send results to the ResultDB database.')
5092 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005093 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005094
Edward Lemur934836a2019-09-09 20:16:54 +00005095 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005096
Robert Iannucci2e73d432018-03-14 01:10:47 -07005097 if not cl.GetIssue():
5098 DieWithError('You must upload the change first to Gerrit.\n'
5099 ' If you would rather have `git cl land` upload '
5100 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005101 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5102 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005103
5104
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005105@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005106@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005107def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005108 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005109 parser.add_option('-b', dest='newbranch',
5110 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005111 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005112 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005113 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005114 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005115
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005116 group = optparse.OptionGroup(
5117 parser,
5118 'Options for continuing work on the current issue uploaded from a '
5119 'different clone (e.g. different machine). Must be used independently '
5120 'from the other options. No issue number should be specified, and the '
5121 'branch must have an issue number associated with it')
5122 group.add_option('--reapply', action='store_true', dest='reapply',
5123 help='Reset the branch and reapply the issue.\n'
5124 'CAUTION: This will undo any local changes in this '
5125 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005126
5127 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005128 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005129 parser.add_option_group(group)
5130
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005131 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005132
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005133 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005134 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005135 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005136 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005137 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005138
Edward Lemur934836a2019-09-09 20:16:54 +00005139 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005140 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005141 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005142
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005143 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005144 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005145 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005146
5147 RunGit(['reset', '--hard', upstream])
5148 if options.pull:
5149 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005150
Edward Lemur678a6842019-10-03 22:25:05 +00005151 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005152 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5153 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005154
5155 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005156 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005157
Edward Lemurf38bc172019-09-03 21:02:13 +00005158 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005159 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005160 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005161
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005162 # We don't want uncommitted changes mixed up with the patch.
5163 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005164 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005165
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005166 if options.newbranch:
5167 if options.force:
5168 RunGit(['branch', '-D', options.newbranch],
5169 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005170 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005171
Edward Lemur678a6842019-10-03 22:25:05 +00005172 cl = Changelist(
5173 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005174
Edward Lemur678a6842019-10-03 22:25:05 +00005175 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005176 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005177
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005178 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5179 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005180
5181
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005182def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005183 """Fetches the tree status and returns either 'open', 'closed',
5184 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005185 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005186 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005187 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005188 if status.find('closed') != -1 or status == '0':
5189 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005190
5191 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005192 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005193
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005194 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005195 return 'unset'
5196
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005197
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005198def GetTreeStatusReason():
5199 """Fetches the tree status from a json url and returns the message
5200 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005201 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005202 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005203 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005204 status = json.loads(connection.read())
5205 connection.close()
5206 return status['message']
5207
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005208
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005209@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005210def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005211 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005212 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005213 status = GetTreeStatus()
5214 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005215 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005216 return 2
5217
vapiera7fbd5a2016-06-16 09:17:49 -07005218 print('The tree is %s' % status)
5219 print()
5220 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005221 if status != 'open':
5222 return 1
5223 return 0
5224
5225
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005226@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005227def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005228 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5229 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005230 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005231 '-b', '--bot', action='append',
5232 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5233 'times to specify multiple builders. ex: '
5234 '"-b win_rel -b win_layout". See '
5235 'the try server waterfall for the builders name and the tests '
5236 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005237 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005238 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005239 help=('Buildbucket bucket to send the try requests. Format: '
5240 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005241 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005242 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005243 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005244 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005245 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005246 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005247 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005248 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005249 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005250 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005251 '-q',
5252 '--quick-run',
5253 action='store_true',
5254 default=False,
5255 help='trigger in quick run mode '
5256 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5257 'uick_run.md) (chromium only).')
5258 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005259 '--category', default='git_cl_try', help='Specify custom build category.')
5260 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005261 '--project',
5262 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005263 'in recipe to determine to which repository or directory to '
5264 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005265 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005266 '-p', '--property', dest='properties', action='append', default=[],
5267 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005268 'key2=value2 etc. The value will be treated as '
5269 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005270 'NOTE: using this may make your tryjob not usable for CQ, '
5271 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005272 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005273 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5274 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005275 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005276 parser.add_option(
5277 '-R', '--retry-failed', action='store_true', default=False,
5278 help='Retry failed jobs from the latest set of tryjobs. '
5279 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005280 parser.add_option(
5281 '-i', '--issue', type=int,
5282 help='Operate on this issue instead of the current branch\'s implicit '
5283 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005284 options, args = parser.parse_args(args)
5285
machenbach@chromium.org45453142015-09-15 08:45:22 +00005286 # Make sure that all properties are prop=value pairs.
5287 bad_params = [x for x in options.properties if '=' not in x]
5288 if bad_params:
5289 parser.error('Got properties with missing "=": %s' % bad_params)
5290
maruel@chromium.org15192402012-09-06 12:38:29 +00005291 if args:
5292 parser.error('Unknown arguments: %s' % args)
5293
Edward Lemur934836a2019-09-09 20:16:54 +00005294 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005295 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005296 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005297
Edward Lemurf38bc172019-09-03 21:02:13 +00005298 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005299 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005300
tandriie113dfd2016-10-11 10:20:12 -07005301 error_message = cl.CannotTriggerTryJobReason()
5302 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005303 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005304
Edward Lemur45768512020-03-02 19:03:14 +00005305 if options.bot:
5306 if options.retry_failed:
5307 parser.error('--bot is not compatible with --retry-failed.')
5308 if not options.bucket:
5309 parser.error('A bucket (e.g. "chromium/try") is required.')
5310
5311 triggered = [b for b in options.bot if 'triggered' in b]
5312 if triggered:
5313 parser.error(
5314 'Cannot schedule builds on triggered bots: %s.\n'
5315 'This type of bot requires an initial job from a parent (usually a '
5316 'builder). Schedule a job on the parent instead.\n' % triggered)
5317
5318 if options.bucket.startswith('.master'):
5319 parser.error('Buildbot masters are not supported.')
5320
5321 project, bucket = _parse_bucket(options.bucket)
5322 if project is None or bucket is None:
5323 parser.error('Invalid bucket: %s.' % options.bucket)
5324 jobs = sorted((project, bucket, bot) for bot in options.bot)
5325 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005326 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005327 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005328 if options.verbose:
5329 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005330 jobs = _filter_failed_for_retry(builds)
5331 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005332 print('There are no failed jobs in the latest set of jobs '
5333 '(patchset #%d), doing nothing.' % patchset)
5334 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005335 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005336 if num_builders > 10:
5337 confirm_or_exit('There are %d builders with failed builds.'
5338 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005339 elif options.quick_run:
5340 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5341 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005342 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005343 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005344 print('git cl try with no bots now defaults to CQ dry run.')
5345 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5346 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005347
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005348 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005349 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005350 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005351 except BuildbucketResponseException as ex:
5352 print('ERROR: %s' % ex)
5353 return 1
5354 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005355
5356
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005357@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005358def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005359 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005360 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005361 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005362 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005363 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005364 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005365 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005366 '--color', action='store_true', default=setup_color.IS_TTY,
5367 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005368 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005369 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5370 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005371 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005372 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005373 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005374 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005375 parser.add_option(
5376 '-i', '--issue', type=int,
5377 help='Operate on this issue instead of the current branch\'s implicit '
5378 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005379 options, args = parser.parse_args(args)
5380 if args:
5381 parser.error('Unrecognized args: %s' % ' '.join(args))
5382
Edward Lemur934836a2019-09-09 20:16:54 +00005383 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005384 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005385 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005386
tandrii221ab252016-10-06 08:12:04 -07005387 patchset = options.patchset
5388 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005389 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005390 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005391 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005392 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005393 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005394 cl.GetIssue())
5395
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005396 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005397 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005398 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005399 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005400 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005401 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005402 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005403 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005404 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005405 return 0
5406
5407
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005408@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005409@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005410def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005411 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005412 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005413 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005414 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005415
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005416 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005417 if args:
5418 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005419 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005420 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005421 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005422 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005423
5424 # Clear configured merge-base, if there is one.
5425 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005426 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005427 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005428 return 0
5429
5430
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005431@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005432def CMDweb(parser, args):
5433 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005434 parser.add_option('-p',
5435 '--print-only',
5436 action='store_true',
5437 dest='print_only',
5438 help='Only print the Gerrit URL, don\'t open it in the '
5439 'browser.')
5440 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005441 if args:
5442 parser.error('Unrecognized args: %s' % ' '.join(args))
5443
5444 issue_url = Changelist().GetIssueURL()
5445 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005446 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005447 return 1
5448
Orr Bernstein0b960582022-12-22 20:16:18 +00005449 if options.print_only:
5450 print(issue_url)
5451 return 0
5452
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005453 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005454 # allows us to hide the "Created new window in existing browser session."
5455 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005456 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005457 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005458 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005459 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005460 os.open(os.devnull, os.O_RDWR)
5461 try:
5462 webbrowser.open(issue_url)
5463 finally:
5464 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005465 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005466 return 0
5467
5468
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005469@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005470def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005471 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005472 parser.add_option('-d', '--dry-run', action='store_true',
5473 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005474 parser.add_option(
5475 '-q',
5476 '--quick-run',
5477 action='store_true',
5478 help='trigger in quick run mode '
5479 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5480 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005481 parser.add_option('-c', '--clear', action='store_true',
5482 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005483 parser.add_option(
5484 '-i', '--issue', type=int,
5485 help='Operate on this issue instead of the current branch\'s implicit '
5486 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005487 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005488 if args:
5489 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005490 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5491 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005492
Edward Lemur934836a2019-09-09 20:16:54 +00005493 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005494 if not cl.GetIssue():
5495 parser.error('Must upload the issue first.')
5496
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005497 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005498 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005499 elif options.quick_run:
5500 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005501 elif options.dry_run:
5502 state = _CQState.DRY_RUN
5503 else:
5504 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005505 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005506 return 0
5507
5508
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005509@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005510def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005511 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005512 parser.add_option(
5513 '-i', '--issue', type=int,
5514 help='Operate on this issue instead of the current branch\'s implicit '
5515 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005516 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005517 if args:
5518 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005519 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005520 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005521 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005522 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005523 cl.CloseIssue()
5524 return 0
5525
5526
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005527@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005528def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005529 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005530 parser.add_option(
5531 '--stat',
5532 action='store_true',
5533 dest='stat',
5534 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005535 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005536 if args:
5537 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005538
Edward Lemur934836a2019-09-09 20:16:54 +00005539 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005540 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005541 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005542 if not issue:
5543 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005544
Gavin Makbe2e9262022-11-08 23:41:55 +00005545 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005546 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005547 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005548 if not base:
5549 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5550 revision_info = detail['revisions'][detail['current_revision']]
5551 fetch_info = revision_info['fetch']['http']
5552 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5553 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005554
Aaron Gablea718c3e2017-08-28 17:47:28 -07005555 cmd = ['git', 'diff']
5556 if options.stat:
5557 cmd.append('--stat')
5558 cmd.append(base)
5559 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005560
5561 return 0
5562
5563
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005564@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005565def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005566 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005567 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005568 '--ignore-current',
5569 action='store_true',
5570 help='Ignore the CL\'s current reviewers and start from scratch.')
5571 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005572 '--ignore-self',
5573 action='store_true',
5574 help='Do not consider CL\'s author as an owners.')
5575 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005576 '--no-color',
5577 action='store_true',
5578 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005579 parser.add_option(
5580 '--batch',
5581 action='store_true',
5582 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005583 # TODO: Consider moving this to another command, since other
5584 # git-cl owners commands deal with owners for a given CL.
5585 parser.add_option(
5586 '--show-all',
5587 action='store_true',
5588 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005589 options, args = parser.parse_args(args)
5590
Edward Lemur934836a2019-09-09 20:16:54 +00005591 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005592 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005593
Yang Guo6e269a02019-06-26 11:17:02 +00005594 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005595 if len(args) == 0:
5596 print('No files specified for --show-all. Nothing to do.')
5597 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005598 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005599 for path in args:
5600 print('Owners for %s:' % path)
5601 print('\n'.join(
5602 ' - %s' % owner
5603 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005604 return 0
5605
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005606 if args:
5607 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005608 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005609 base_branch = args[0]
5610 else:
5611 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005612 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005613
Edward Lemur2c62b332020-03-12 22:12:33 +00005614 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005615
5616 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005617 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5618 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005619 return 0
5620
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005621 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005622 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005623 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005624 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005625 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005626 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005627 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005628
5629
Aiden Bennerc08566e2018-10-03 17:52:42 +00005630def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005631 """Generates a diff command."""
5632 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005633 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5634
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005635 if allow_prefix:
5636 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5637 # case that diff.noprefix is set in the user's git config.
5638 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5639 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005640 diff_cmd += ['--no-prefix']
5641
5642 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005643
5644 if args:
5645 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005646 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005647 diff_cmd.append(arg)
5648 else:
5649 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005650
5651 return diff_cmd
5652
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005653
Jamie Madill5e96ad12020-01-13 16:08:35 +00005654def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5655 """Runs clang-format-diff and sets a return value if necessary."""
5656
5657 if not clang_diff_files:
5658 return 0
5659
5660 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5661 # formatted. This is used to block during the presubmit.
5662 return_value = 0
5663
5664 # Locate the clang-format binary in the checkout
5665 try:
5666 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5667 except clang_format.NotFoundError as e:
5668 DieWithError(e)
5669
5670 if opts.full or settings.GetFormatFullByDefault():
5671 cmd = [clang_format_tool]
5672 if not opts.dry_run and not opts.diff:
5673 cmd.append('-i')
5674 if opts.dry_run:
5675 for diff_file in clang_diff_files:
5676 with open(diff_file, 'r') as myfile:
5677 code = myfile.read().replace('\r\n', '\n')
5678 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5679 stdout = stdout.replace('\r\n', '\n')
5680 if opts.diff:
5681 sys.stdout.write(stdout)
5682 if code != stdout:
5683 return_value = 2
5684 else:
5685 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5686 if opts.diff:
5687 sys.stdout.write(stdout)
5688 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005689 try:
5690 script = clang_format.FindClangFormatScriptInChromiumTree(
5691 'clang-format-diff.py')
5692 except clang_format.NotFoundError as e:
5693 DieWithError(e)
5694
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005695 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005696 if not opts.dry_run and not opts.diff:
5697 cmd.append('-i')
5698
5699 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005700 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005701
Edward Lesmes89624cd2020-04-06 17:51:56 +00005702 env = os.environ.copy()
5703 env['PATH'] = (
5704 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5705 stdout = RunCommand(
5706 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005707 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005708 if opts.diff:
5709 sys.stdout.write(stdout)
5710 if opts.dry_run and len(stdout) > 0:
5711 return_value = 2
5712
5713 return return_value
5714
5715
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005716def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5717 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5718 presubmit checks have failed (and returns 0 otherwise)."""
5719
5720 if not rust_diff_files:
5721 return 0
5722
5723 # Locate the rustfmt binary.
5724 try:
5725 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5726 except rustfmt.NotFoundError as e:
5727 DieWithError(e)
5728
5729 # TODO(crbug.com/1231317): Support formatting only the changed lines
5730 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5731 # https://github.com/emilio/rustfmt-format-diff
5732 cmd = [rustfmt_tool]
5733 if opts.dry_run:
5734 cmd.append('--check')
5735 cmd += rust_diff_files
5736 rustfmt_exitcode = subprocess2.call(cmd)
5737
5738 if opts.presubmit and rustfmt_exitcode != 0:
5739 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005740
5741 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005742
5743
Olivier Robin0a6b5442022-04-07 07:25:04 +00005744def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5745 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5746 that presubmit checks have failed (and returns 0 otherwise)."""
5747
5748 if not swift_diff_files:
5749 return 0
5750
5751 # Locate the swift-format binary.
5752 try:
5753 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5754 except swift_format.NotFoundError as e:
5755 DieWithError(e)
5756
5757 cmd = [swift_format_tool]
5758 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005759 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005760 else:
5761 cmd += ['format', '-i']
5762 cmd += swift_diff_files
5763 swift_format_exitcode = subprocess2.call(cmd)
5764
5765 if opts.presubmit and swift_format_exitcode != 0:
5766 return 2
5767
5768 return 0
5769
5770
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005771def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005772 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005773 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005774
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005775
enne@chromium.org555cfe42014-01-29 18:21:39 +00005776@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005777@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005778def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005779 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005780 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005781 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005782 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005783 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005784 parser.add_option('--full', action='store_true',
5785 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005786 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005787 parser.add_option('--dry-run', action='store_true',
5788 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005789 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005790 '--no-clang-format',
5791 dest='clang_format',
5792 action='store_false',
5793 default=True,
5794 help='Disables formatting of various file types using clang-format.')
5795 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005796 '--python',
5797 action='store_true',
5798 default=None,
5799 help='Enables python formatting on all python files.')
5800 parser.add_option(
5801 '--no-python',
5802 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005803 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005804 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005805 'If neither --python or --no-python are set, python files that have a '
5806 '.style.yapf file in an ancestor directory will be formatted. '
5807 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005808 parser.add_option(
5809 '--js',
5810 action='store_true',
5811 help='Format javascript code with clang-format. '
5812 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005813 parser.add_option('--diff', action='store_true',
5814 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005815 parser.add_option('--presubmit', action='store_true',
5816 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005817
5818 parser.add_option('--rust-fmt',
5819 dest='use_rust_fmt',
5820 action='store_true',
5821 default=rustfmt.IsRustfmtSupported(),
5822 help='Enables formatting of Rust file types using rustfmt.')
5823 parser.add_option(
5824 '--no-rust-fmt',
5825 dest='use_rust_fmt',
5826 action='store_false',
5827 help='Disables formatting of Rust file types using rustfmt.')
5828
Olivier Robin0a6b5442022-04-07 07:25:04 +00005829 parser.add_option(
5830 '--swift-format',
5831 dest='use_swift_format',
5832 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005833 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005834 help='Enables formatting of Swift file types using swift-format '
5835 '(macOS host only).')
5836 parser.add_option(
5837 '--no-swift-format',
5838 dest='use_swift_format',
5839 action='store_false',
5840 help='Disables formatting of Swift file types using swift-format.')
5841
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005842 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005843
Garrett Beaty91a6f332020-01-06 16:57:24 +00005844 if opts.python is not None and opts.no_python:
5845 raise parser.error('Cannot set both --python and --no-python')
5846 if opts.no_python:
5847 opts.python = False
5848
Daniel Chengc55eecf2016-12-30 03:11:02 -08005849 # Normalize any remaining args against the current path, so paths relative to
5850 # the current directory are still resolved as expected.
5851 args = [os.path.join(os.getcwd(), arg) for arg in args]
5852
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005853 # git diff generates paths against the root of the repository. Change
5854 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005855 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005856 if rel_base_path:
5857 os.chdir(rel_base_path)
5858
digit@chromium.org29e47272013-05-17 17:01:46 +00005859 # Grab the merge-base commit, i.e. the upstream commit of the current
5860 # branch when it was created or the last time it was rebased. This is
5861 # to cover the case where the user may have called "git fetch origin",
5862 # moving the origin branch to a newer commit, but hasn't rebased yet.
5863 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005864 upstream_branch = opts.upstream
5865 if not upstream_branch:
5866 cl = Changelist()
5867 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005868 if upstream_branch:
5869 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5870 upstream_commit = upstream_commit.strip()
5871
5872 if not upstream_commit:
5873 DieWithError('Could not find base commit for this branch. '
5874 'Are you in detached state?')
5875
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005876 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5877 diff_output = RunGit(changed_files_cmd)
5878 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005879 # Filter out files deleted by this CL
5880 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005881
Andreas Haas417d89c2020-02-06 10:24:27 +00005882 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005883 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005884
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005885 clang_diff_files = []
5886 if opts.clang_format:
5887 clang_diff_files = [
5888 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5889 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005890 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005891 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005892 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005893 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005894
Edward Lesmes50da7702020-03-30 19:23:43 +00005895 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005896
Jamie Madill5e96ad12020-01-13 16:08:35 +00005897 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5898 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005899
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005900 if opts.use_rust_fmt:
5901 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5902 upstream_commit)
5903 if rust_fmt_return_value == 2:
5904 return_value = 2
5905
Olivier Robin0a6b5442022-04-07 07:25:04 +00005906 if opts.use_swift_format:
5907 if sys.platform != 'darwin':
5908 DieWithError('swift-format is only supported on macOS.')
5909 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5910 upstream_commit)
5911 if swift_format_return_value == 2:
5912 return_value = 2
5913
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005914 # Similar code to above, but using yapf on .py files rather than clang-format
5915 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005916 py_explicitly_disabled = opts.python is not None and not opts.python
5917 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005918 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5919 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005920
Aiden Bennerc08566e2018-10-03 17:52:42 +00005921 # Used for caching.
5922 yapf_configs = {}
5923 for f in python_diff_files:
5924 # Find the yapf style config for the current file, defaults to depot
5925 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005926 _FindYapfConfigFile(f, yapf_configs, top_dir)
5927
5928 # Turn on python formatting by default if a yapf config is specified.
5929 # This breaks in the case of this repo though since the specified
5930 # style file is also the global default.
5931 if opts.python is None:
5932 filtered_py_files = []
5933 for f in python_diff_files:
5934 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5935 filtered_py_files.append(f)
5936 else:
5937 filtered_py_files = python_diff_files
5938
5939 # Note: yapf still seems to fix indentation of the entire file
5940 # even if line ranges are specified.
5941 # See https://github.com/google/yapf/issues/499
5942 if not opts.full and filtered_py_files:
5943 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5944
Brian Sheedyb4307d52019-12-02 19:18:17 +00005945 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5946 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5947 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005948
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005949 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005950 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5951 # Default to pep8 if not .style.yapf is found.
5952 if not yapf_style:
5953 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005954
Peter Wend9399922020-06-17 17:33:49 +00005955 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005956 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005957 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005958 else:
5959 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005960
5961 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005962
5963 has_formattable_lines = False
5964 if not opts.full:
5965 # Only run yapf over changed line ranges.
5966 for diff_start, diff_len in py_line_diffs[f]:
5967 diff_end = diff_start + diff_len - 1
5968 # Yapf errors out if diff_end < diff_start but this
5969 # is a valid line range diff for a removal.
5970 if diff_end >= diff_start:
5971 has_formattable_lines = True
5972 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5973 # If all line diffs were removals we have nothing to format.
5974 if not has_formattable_lines:
5975 continue
5976
5977 if opts.diff or opts.dry_run:
5978 cmd += ['--diff']
5979 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005980 stdout = RunCommand(cmd,
5981 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005982 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005983 cwd=top_dir,
5984 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005985 if opts.diff:
5986 sys.stdout.write(stdout)
5987 elif len(stdout) > 0:
5988 return_value = 2
5989 else:
5990 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005991 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005992
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005993 # Format GN build files. Always run on full build files for canonical form.
5994 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005995 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005996 if opts.dry_run or opts.diff:
5997 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005998 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005999 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006000 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006001 cwd=top_dir)
6002 if opts.dry_run and gn_ret == 2:
6003 return_value = 2 # Not formatted.
6004 elif opts.diff and gn_ret == 2:
6005 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006006 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006007 elif gn_ret != 0:
6008 # For non-dry run cases (and non-2 return values for dry-run), a
6009 # nonzero error code indicates a failure, probably because the file
6010 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006011 DieWithError('gn format failed on ' + gn_diff_file +
6012 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006013
Ilya Shermane081cbe2017-08-15 17:51:04 -07006014 # Skip the metrics formatting from the global presubmit hook. These files have
6015 # a separate presubmit hook that issues an error if the files need formatting,
6016 # whereas the top-level presubmit script merely issues a warning. Formatting
6017 # these files is somewhat slow, so it's important not to duplicate the work.
6018 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006019 for diff_xml in GetDiffXMLs(diff_files):
6020 xml_dir = GetMetricsDir(diff_xml)
6021 if not xml_dir:
6022 continue
6023
Ilya Shermane081cbe2017-08-15 17:51:04 -07006024 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006025 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006026 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006027
6028 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6029 # command as histograms/pretty_print.py now needs a relative path argument
6030 # after splitting the histograms into multiple directories.
6031 # For example, in tools/metrics/ukm, pretty-print could be run using:
6032 # $ python pretty_print.py
6033 # But in tools/metrics/histogrmas, pretty-print should be run with an
6034 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006035 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006036 # $ python pretty_print.py enums.xml
6037
Weilun Shib92c4b72020-08-27 17:45:11 +00006038 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006039 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006040 cmd.append(diff_xml)
6041
Ilya Shermane081cbe2017-08-15 17:51:04 -07006042 if opts.dry_run or opts.diff:
6043 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006044
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006045 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6046 # `shell` param and instead replace `'vpython'` with
6047 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006048 stdout = RunCommand(cmd,
6049 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006050 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006051 if opts.diff:
6052 sys.stdout.write(stdout)
6053 if opts.dry_run and stdout:
6054 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006055
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006056 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006057
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006058
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006059def GetDiffXMLs(diff_files):
6060 return [
6061 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6062 ]
6063
6064
6065def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006066 metrics_xml_dirs = [
6067 os.path.join('tools', 'metrics', 'actions'),
6068 os.path.join('tools', 'metrics', 'histograms'),
6069 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006070 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006071 os.path.join('tools', 'metrics', 'ukm'),
6072 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006073 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006074 if diff_xml.startswith(xml_dir):
6075 return xml_dir
6076 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006077
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006078
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006079@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006080@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006081def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006082 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006083 _, args = parser.parse_args(args)
6084
6085 if len(args) != 1:
6086 parser.print_help()
6087 return 1
6088
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006089 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006090 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006091 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006092
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006093 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006094
Edward Lemur52969c92020-02-06 18:15:28 +00006095 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006096 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006097 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006098
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006099 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006100 for key, issue in [x.split() for x in output.splitlines()]:
6101 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006102 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006103
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006104 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006105 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006106 return 1
6107 if len(branches) == 1:
6108 RunGit(['checkout', branches[0]])
6109 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006110 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006111 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006112 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006113 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006114 try:
6115 RunGit(['checkout', branches[int(which)]])
6116 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006117 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006118 return 1
6119
6120 return 0
6121
6122
maruel@chromium.org29404b52014-09-08 22:58:00 +00006123def CMDlol(parser, args):
6124 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006125 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006126 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6127 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6128 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006129 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006130 return 0
6131
6132
Josip Sokcevic0399e172022-03-21 23:11:51 +00006133def CMDversion(parser, args):
6134 import utils
6135 print(utils.depot_tools_version())
6136
6137
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006138class OptionParser(optparse.OptionParser):
6139 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006140
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006141 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006142 optparse.OptionParser.__init__(
6143 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006144 self.add_option(
6145 '-v', '--verbose', action='count', default=0,
6146 help='Use 2 times for more debugging info')
6147
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006148 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006149 try:
6150 return self._parse_args(args)
6151 finally:
6152 # Regardless of success or failure of args parsing, we want to report
6153 # metrics, but only after logging has been initialized (if parsing
6154 # succeeded).
6155 global settings
6156 settings = Settings()
6157
Edward Lesmes9c349062021-05-06 20:02:39 +00006158 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006159 # GetViewVCUrl ultimately calls logging method.
6160 project_url = settings.GetViewVCUrl().strip('/+')
6161 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6162 metrics.collector.add('project_urls', [project_url])
6163
6164 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006165 # Create an optparse.Values object that will store only the actual passed
6166 # options, without the defaults.
6167 actual_options = optparse.Values()
6168 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6169 # Create an optparse.Values object with the default options.
6170 options = optparse.Values(self.get_default_values().__dict__)
6171 # Update it with the options passed by the user.
6172 options._update_careful(actual_options.__dict__)
6173 # Store the options passed by the user in an _actual_options attribute.
6174 # We store only the keys, and not the values, since the values can contain
6175 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006176 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006177
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006178 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006179 logging.basicConfig(
6180 level=levels[min(options.verbose, len(levels) - 1)],
6181 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6182 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006183
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006184 return options, args
6185
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006186
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006187def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006188 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006189 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006190 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006191 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006192
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006193 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006194 dispatcher = subcommand.CommandDispatcher(__name__)
6195 try:
6196 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006197 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006198 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006199 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006200 if e.code != 500:
6201 raise
6202 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006203 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006204 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006205 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006206
6207
6208if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006209 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6210 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006211 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006212 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006213 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006214 sys.exit(main(sys.argv[1:]))