blob: 395b460f780cdcf2a89e059cb2ccccd8d91cb44a [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
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
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
thakis@chromium.org3421c992014-11-02 02:20:32 +000013import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000014import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010015import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000016import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000017import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010018import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000019import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000021import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import optparse
23import os
24import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010025import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000026import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000027import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070028import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000030import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000032import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000033import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000034
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000035from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000036import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000037import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000038import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000039import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000040import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000041import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000042import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000043import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000044import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000045import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000046import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000047import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000048import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000049import presubmit_support
50import 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
maruel@chromium.org2a74d372011-03-29 19:05:50 +000055import watchlists
56
Edward Lemur79d4f992019-11-11 23:49:02 +000057from third_party import six
58from six.moves import urllib
59
60
61if sys.version_info.major == 3:
62 basestring = (str,) # pylint: disable=redefined-builtin
63
Edward Lemurb9830242019-10-30 22:19:20 +000064
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
Edward Lemur0f58ae42019-04-30 17:24:12 +000067# Traces for git push will be stored in a traces directory inside the
68# depot_tools checkout.
69DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
70TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
71
72# When collecting traces, Git hashes will be reduced to 6 characters to reduce
73# the size after compression.
74GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
75# Used to redact the cookies from the gitcookies file.
76GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
77
Edward Lemurd4d1ba42019-09-20 21:46:37 +000078MAX_ATTEMPTS = 3
79
Edward Lemur1b52d872019-05-09 21:12:12 +000080# The maximum number of traces we will keep. Multiplied by 3 since we store
81# 3 files per trace.
82MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000083# Message to be displayed to the user to inform where to find the traces for a
84# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000085TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000086'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000088' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'Copies of your gitcookies file and git config have been recorded at:\n'
90' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000091# Format of the message to be stored as part of the traces to give developers a
92# better context when they go through traces.
93TRACES_README_FORMAT = (
94'Date: %(now)s\n'
95'\n'
96'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
97'Title: %(title)s\n'
98'\n'
99'%(description)s\n'
100'\n'
101'Execution time: %(execution_time)s\n'
102'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000103
tandrii9d2c7a32016-06-22 03:42:45 -0700104COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
thestig@chromium.org44202a22014-03-11 19:22:18 +0000112# Valid extensions for files we want to lint.
113DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
114DEFAULT_LINT_IGNORE_REGEX = r"$^"
115
Aiden Bennerc08566e2018-10-03 17:52:42 +0000116# File name for yapf style config files.
117YAPF_CONFIG_FILENAME = '.style.yapf'
118
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000119# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000120Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000121
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000122# Initialized in main()
123settings = None
124
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100125# Used by tests/git_cl_test.py to add extra logging.
126# Inside the weirdly failing test, add this:
127# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700128# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100129_IS_BEING_TESTED = False
130
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000131
Christopher Lamf732cd52017-01-24 12:40:11 +1100132def DieWithError(message, change_desc=None):
133 if change_desc:
134 SaveDescriptionBackup(change_desc)
135
vapiera7fbd5a2016-06-16 09:17:49 -0700136 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000137 sys.exit(1)
138
139
Christopher Lamf732cd52017-01-24 12:40:11 +1100140def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000141 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000142 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000143 with open(backup_path, 'w') as backup_file:
144 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100145
146
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000147def GetNoGitPagerEnv():
148 env = os.environ.copy()
149 # 'cat' is a magical git string that disables pagers on all platforms.
150 env['GIT_PAGER'] = 'cat'
151 return env
152
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000153
bsep@chromium.org627d9002016-04-29 00:00:52 +0000154def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000155 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000156 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
157 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000158 except subprocess2.CalledProcessError as e:
159 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000160 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000161 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000162 'Command "%s" failed.\n%s' % (
163 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000164 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165
166
167def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000168 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000169 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000170
171
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000172def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000173 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700174 if suppress_stderr:
175 stderr = subprocess2.VOID
176 else:
177 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000178 try:
tandrii5d48c322016-08-18 16:19:37 -0700179 (out, _), code = subprocess2.communicate(['git'] + args,
180 env=GetNoGitPagerEnv(),
181 stdout=subprocess2.PIPE,
182 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000183 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700184 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900185 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000186 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000187
188
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000189def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000190 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000191 return RunGitWithCode(args, suppress_stderr=True)[1]
192
193
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000194def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000195 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000196 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000197 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000198 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000199
200
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000201def BranchExists(branch):
202 """Return True if specified branch exists."""
203 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
204 suppress_stderr=True)
205 return not code
206
207
tandrii2a16b952016-10-19 07:09:44 -0700208def time_sleep(seconds):
209 # Use this so that it can be mocked in tests without interfering with python
210 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700211 return time.sleep(seconds)
212
213
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000214def time_time():
215 # Use this so that it can be mocked in tests without interfering with python
216 # system machinery.
217 return time.time()
218
219
Edward Lemur1b52d872019-05-09 21:12:12 +0000220def datetime_now():
221 # Use this so that it can be mocked in tests without interfering with python
222 # system machinery.
223 return datetime.datetime.now()
224
225
maruel@chromium.org90541732011-04-01 17:54:18 +0000226def ask_for_data(prompt):
227 try:
228 return raw_input(prompt)
229 except KeyboardInterrupt:
230 # Hide the exception.
231 sys.exit(1)
232
233
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100234def confirm_or_exit(prefix='', action='confirm'):
235 """Asks user to press enter to continue or press Ctrl+C to abort."""
236 if not prefix or prefix.endswith('\n'):
237 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100238 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100239 mid = ' Press'
240 elif prefix.endswith(' '):
241 mid = 'press'
242 else:
243 mid = ' press'
244 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
245
246
247def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000248 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100249 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
250 while True:
251 if 'yes'.startswith(result):
252 return True
253 if 'no'.startswith(result):
254 return False
255 result = ask_for_data('Please, type yes or no: ').lower()
256
257
tandrii5d48c322016-08-18 16:19:37 -0700258def _git_branch_config_key(branch, key):
259 """Helper method to return Git config key for a branch."""
260 assert branch, 'branch name is required to set git config for it'
261 return 'branch.%s.%s' % (branch, key)
262
263
machenbach@chromium.org45453142015-09-15 08:45:22 +0000264def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000265 prop_list = getattr(options, 'properties', [])
266 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000267 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000268 try:
269 properties[key] = json.loads(val)
270 except ValueError:
271 pass # If a value couldn't be evaluated, treat it as a string.
272 return properties
273
274
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000275# TODO(crbug.com/976104): Remove this function once git-cl try-results has
276# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000277def _buildbucket_retry(operation_name, http, *args, **kwargs):
278 """Retries requests to buildbucket service and returns parsed json content."""
279 try_count = 0
280 while True:
281 response, content = http.request(*args, **kwargs)
282 try:
283 content_json = json.loads(content)
284 except ValueError:
285 content_json = None
286
287 # Buildbucket could return an error even if status==200.
288 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000289 error = content_json.get('error')
290 if error.get('code') == 403:
291 raise BuildbucketResponseException(
292 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000293 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000294 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000295 raise BuildbucketResponseException(msg)
296
297 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700298 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000299 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000300 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700301 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000302 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000303 content)
304 return content_json
305 if response.status < 500 or try_count >= 2:
306 raise httplib2.HttpLib2Error(content)
307
308 # status >= 500 means transient failures.
309 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000310 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000311 try_count += 1
312 assert False, 'unreachable'
313
314
Edward Lemur4c707a22019-09-24 21:13:43 +0000315def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000316 """Calls a buildbucket v2 method and returns the parsed json response."""
317 headers = {
318 'Accept': 'application/json',
319 'Content-Type': 'application/json',
320 }
321 request = json.dumps(request)
322 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
323
324 logging.info('POST %s with %s' % (url, request))
325
326 attempts = 1
327 time_to_sleep = 1
328 while True:
329 response, content = http.request(url, 'POST', body=request, headers=headers)
330 if response.status == 200:
331 return json.loads(content[4:])
332 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
333 msg = '%s error when calling POST %s with %s: %s' % (
334 response.status, url, request, content)
335 raise BuildbucketResponseException(msg)
336 logging.debug(
337 '%s error when calling POST %s with %s. '
338 'Sleeping for %d seconds and retrying...' % (
339 response.status, url, request, time_to_sleep))
340 time.sleep(time_to_sleep)
341 time_to_sleep *= 2
342 attempts += 1
343
344 assert False, 'unreachable'
345
346
qyearsley1fdfcb62016-10-24 13:22:03 -0700347def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700348 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000349 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700350 """
qyearsleydd49f942016-10-28 11:57:22 -0700351 # If no bots are listed, we try to get a set of builders and tests based
352 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700353 if not options.bot:
Edward Lemur3b8094a2020-02-07 22:34:43 +0000354 change = changelist.GetChange(changelist.GetCommonAncestorWithUpstream())
qyearsley136b49f2016-10-31 09:02:26 -0700355 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700356 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700357 change=change,
358 changed_files=change.LocalPaths(),
359 repository_root=settings.GetRoot(),
360 default_presubmit=None,
361 project=None,
362 verbose=options.verbose,
363 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700364 if masters is None:
365 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000366 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700367
qyearsley1fdfcb62016-10-24 13:22:03 -0700368 if options.bucket:
369 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000370 option_parser.error(
Edward Lemur5ef16a32019-11-11 21:13:25 +0000371 'Please specify the bucket, e.g. "-B chromium/try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700372
373
Edward Lemur6215c792019-10-03 21:59:05 +0000374def _parse_bucket(raw_bucket):
375 legacy = True
376 project = bucket = None
377 if '/' in raw_bucket:
378 legacy = False
379 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000380 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000381 elif raw_bucket.startswith('luci.'):
382 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000383 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000384 elif '.' in raw_bucket:
385 project = raw_bucket.split('.')[0]
386 bucket = raw_bucket
387 # Legacy buckets.
388 if legacy:
389 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
390 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000391
392
Edward Lemur5b929a42019-10-21 17:57:39 +0000393def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000394 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700395
396 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000397 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700398 buckets: A nested dict mapping bucket names to builders to tests.
399 options: Command-line options.
400 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000401 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000402 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000403 print('Bucket:', bucket)
404 print('\n'.join(
405 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000406 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000407 print('To see results here, run: git cl try-results')
408 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700409
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000410 requests = _make_try_job_schedule_requests(
411 changelist, buckets, options, patchset)
412 if not requests:
413 return
414
Edward Lemur5b929a42019-10-21 17:57:39 +0000415 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000416 http.force_exception_to_status_code = True
417
418 batch_request = {'requests': requests}
419 batch_response = _call_buildbucket(
420 http, options.buildbucket_host, 'Batch', batch_request)
421
422 errors = [
423 ' ' + response['error']['message']
424 for response in batch_response.get('responses', [])
425 if 'error' in response
426 ]
427 if errors:
428 raise BuildbucketResponseException(
429 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
430
431
432def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000433 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000434 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000435 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000436 shared_properties['clobber'] = True
437 shared_properties.update(_get_properties_from_options(options) or {})
438
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000439 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
440 if options.retry_failed:
441 shared_tags.append({'key': 'retry_failed',
442 'value': '1'})
443
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000444 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000445 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000446 project, bucket = _parse_bucket(raw_bucket)
447 if not project or not bucket:
448 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
449 continue
450
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000451 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000452 properties = shared_properties.copy()
453 if 'presubmit' in builder.lower():
454 properties['dry_run'] = 'true'
455 if tests:
456 properties['testfilter'] = tests
457
458 requests.append({
459 'scheduleBuild': {
460 'requestId': str(uuid.uuid4()),
461 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000462 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000463 'bucket': bucket,
464 'builder': builder,
465 },
466 'gerritChanges': gerrit_changes,
467 'properties': properties,
468 'tags': [
469 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000470 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000471 }
472 })
Anthony Polito1a5fe232020-01-24 23:17:52 +0000473
474 if options.revision:
475 requests[-1]['scheduleBuild']['gitilesCommit'] = {
476 'host': gerrit_changes[0]['host'],
477 'project': gerrit_changes[0]['project'],
478 'id': options.revision
479 }
480
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000481 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000482
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000483
Edward Lemur5b929a42019-10-21 17:57:39 +0000484def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000485 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000486
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000487 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000488 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000489 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000490 request = {
491 'predicate': {
492 'gerritChanges': [changelist.GetGerritChange(patchset)],
493 },
494 'fields': ','.join('builds.*.' + field for field in fields),
495 }
tandrii221ab252016-10-06 08:12:04 -0700496
Edward Lemur5b929a42019-10-21 17:57:39 +0000497 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000498 if authenticator.has_cached_credentials():
499 http = authenticator.authorize(httplib2.Http())
500 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700501 print('Warning: Some results might be missing because %s' %
502 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000503 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000504 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000505 http.force_exception_to_status_code = True
506
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000507 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
508 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000509
Edward Lemur5b929a42019-10-21 17:57:39 +0000510def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000511 """Fetches builds from the latest patchset that has builds (within
512 the last few patchsets).
513
514 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515 changelist (Changelist): The CL to fetch builds for
516 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000517 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
518 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000519 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000520 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
521 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000522 """
523 assert buildbucket_host
524 assert changelist.GetIssue(), 'CL must be uploaded first'
525 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000526 if latest_patchset is None:
527 assert changelist.GetMostRecentPatchset()
528 ps = changelist.GetMostRecentPatchset()
529 else:
530 assert latest_patchset > 0, latest_patchset
531 ps = latest_patchset
532
Quinten Yearsley983111f2019-09-26 17:18:48 +0000533 min_ps = max(1, ps - 5)
534 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000535 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000536 if len(builds):
537 return builds, ps
538 ps -= 1
539 return [], 0
540
541
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000542def _filter_failed_for_retry(all_builds):
543 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000544
545 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000546 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000547 i.e. a list of buildbucket.v2.Builds which includes status and builder
548 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000549
550 Returns:
551 A dict of bucket to builder to tests (empty list). This is the same format
552 accepted by _trigger_try_jobs and returned by _get_bucket_map.
553 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000554
555 def _builder_of(build):
556 builder = build['builder']
557 return (builder['project'], builder['bucket'], builder['builder'])
558
559 res = collections.defaultdict(dict)
560 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
561 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
562 # If builder had several builds, retry only if the last one failed.
563 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
564 # build, but in case of retrying failed jobs retrying a flaky one makes
565 # sense.
566 builds = list(builds)
567 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
568 continue
569 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
570 for t in builds[-1]['tags']):
571 # Don't retry experimental build previously triggered by CQ.
572 continue
573 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
574 # Don't retry if any are running.
575 continue
576 res[proj + '/' + buck][bldr] = []
577 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000578
579
qyearsleyeab3c042016-08-24 09:18:28 -0700580def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 """Prints nicely result of fetch_try_jobs."""
582 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000583 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584 return
585
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000586 longest_builder = max(len(b['builder']['builder']) for b in builds)
587 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000589 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
590 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000592 builds_by_status = {}
593 for b in builds:
594 builds_by_status.setdefault(b['status'], []).append({
595 'id': b['id'],
596 'name': name_fmt.format(
597 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
598 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000599
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000600 sort_key = lambda b: (b['name'], b['id'])
601
602 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000603 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000604 if not builds:
605 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000606
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000607 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000608 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000609 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000610 else:
611 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
612
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000613 print(colorize(title))
614 for b in sorted(builds, key=sort_key):
615 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000616
617 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000618 print_builds(
619 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
620 print_builds(
621 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
622 color=Fore.MAGENTA)
623 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
624 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
625 color=Fore.MAGENTA)
626 print_builds('Started:', builds_by_status.pop('STARTED', []))
627 print_builds(
628 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000629 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000630 print_builds(
631 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000632 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000633
634
Aiden Bennerc08566e2018-10-03 17:52:42 +0000635def _ComputeDiffLineRanges(files, upstream_commit):
636 """Gets the changed line ranges for each file since upstream_commit.
637
638 Parses a git diff on provided files and returns a dict that maps a file name
639 to an ordered list of range tuples in the form (start_line, count).
640 Ranges are in the same format as a git diff.
641 """
642 # If files is empty then diff_output will be a full diff.
643 if len(files) == 0:
644 return {}
645
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000646 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000647 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000648 diff_output = RunGit(diff_cmd)
649
650 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
651 # 2 capture groups
652 # 0 == fname of diff file
653 # 1 == 'diff_start,diff_count' or 'diff_start'
654 # will match each of
655 # diff --git a/foo.foo b/foo.py
656 # @@ -12,2 +14,3 @@
657 # @@ -12,2 +17 @@
658 # running re.findall on the above string with pattern will give
659 # [('foo.py', ''), ('', '14,3'), ('', '17')]
660
661 curr_file = None
662 line_diffs = {}
663 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
664 if match[0] != '':
665 # Will match the second filename in diff --git a/a.py b/b.py.
666 curr_file = match[0]
667 line_diffs[curr_file] = []
668 else:
669 # Matches +14,3
670 if ',' in match[1]:
671 diff_start, diff_count = match[1].split(',')
672 else:
673 # Single line changes are of the form +12 instead of +12,1.
674 diff_start = match[1]
675 diff_count = 1
676
677 diff_start = int(diff_start)
678 diff_count = int(diff_count)
679
680 # If diff_count == 0 this is a removal we can ignore.
681 line_diffs[curr_file].append((diff_start, diff_count))
682
683 return line_diffs
684
685
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000686def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000687 """Checks if a yapf file is in any parent directory of fpath until top_dir.
688
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000689 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000690 is found returns None. Uses yapf_config_cache as a cache for previously found
691 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000692 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000693 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000694 # Return result if we've already computed it.
695 if fpath in yapf_config_cache:
696 return yapf_config_cache[fpath]
697
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000698 parent_dir = os.path.dirname(fpath)
699 if os.path.isfile(fpath):
700 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000701 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000702 # Otherwise fpath is a directory
703 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
704 if os.path.isfile(yapf_file):
705 ret = yapf_file
706 elif fpath == top_dir or parent_dir == fpath:
707 # If we're at the top level directory, or if we're at root
708 # there is no provided style.
709 ret = None
710 else:
711 # Otherwise recurse on the current directory.
712 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000713 yapf_config_cache[fpath] = ret
714 return ret
715
716
Brian Sheedyb4307d52019-12-02 19:18:17 +0000717def _GetYapfIgnorePatterns(top_dir):
718 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000719
720 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
721 but this functionality appears to break when explicitly passing files to
722 yapf for formatting. According to
723 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
724 the .yapfignore file should be in the directory that yapf is invoked from,
725 which we assume to be the top level directory in this case.
726
727 Args:
728 top_dir: The top level directory for the repository being formatted.
729
730 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000731 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000732 """
733 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000734 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000735 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000736 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000737
Brian Sheedyb4307d52019-12-02 19:18:17 +0000738 with open(yapfignore_file) as f:
739 for line in f.readlines():
740 stripped_line = line.strip()
741 # Comments and blank lines should be ignored.
742 if stripped_line.startswith('#') or stripped_line == '':
743 continue
744 ignore_patterns.add(stripped_line)
745 return ignore_patterns
746
747
748def _FilterYapfIgnoredFiles(filepaths, patterns):
749 """Filters out any filepaths that match any of the given patterns.
750
751 Args:
752 filepaths: An iterable of strings containing filepaths to filter.
753 patterns: An iterable of strings containing fnmatch patterns to filter on.
754
755 Returns:
756 A list of strings containing all the elements of |filepaths| that did not
757 match any of the patterns in |patterns|.
758 """
759 # Not inlined so that tests can use the same implementation.
760 return [f for f in filepaths
761 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000762
763
Aaron Gable13101a62018-02-09 13:20:41 -0800764def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000765 """Prints statistics about the change to the user."""
766 # --no-ext-diff is broken in some versions of Git, so try to work around
767 # this by overriding the environment (but there is still a problem if the
768 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000769 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000770 if 'GIT_EXTERNAL_DIFF' in env:
771 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000772
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000773 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800774 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000775 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000776
777
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000778class BuildbucketResponseException(Exception):
779 pass
780
781
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000782class Settings(object):
783 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000784 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000785 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000786 self.tree_status_url = None
787 self.viewvc_url = None
788 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000789 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000790 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000791 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000792 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000793 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000794
Edward Lemur26964072020-02-19 19:18:51 +0000795 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000796 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000797 if self.updated:
798 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000799
Edward Lemur26964072020-02-19 19:18:51 +0000800 # The only value that actually changes the behavior is
801 # autoupdate = "false". Everything else means "true".
802 autoupdate = (
803 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
804
805 cr_settings_file = FindCodereviewSettingsFile()
806 if autoupdate != 'false' and cr_settings_file:
807 LoadCodereviewSettingsFromFile(cr_settings_file)
808 cr_settings_file.close()
809
810 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000811
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000812 @staticmethod
813 def GetRelativeRoot():
814 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000815
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000816 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000817 if self.root is None:
818 self.root = os.path.abspath(self.GetRelativeRoot())
819 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000820
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000821 def GetTreeStatusUrl(self, error_ok=False):
822 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000823 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
824 if self.tree_status_url is None and not error_ok:
825 DieWithError(
826 'You must configure your tree status URL by running '
827 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000828 return self.tree_status_url
829
830 def GetViewVCUrl(self):
831 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000832 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833 return self.viewvc_url
834
rmistry@google.com90752582014-01-14 21:04:50 +0000835 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000836 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000837
rmistry@google.com5626a922015-02-26 14:03:30 +0000838 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000839 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000840 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000841 return run_post_upload_hook == "True"
842
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000843 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000844 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000845
ukai@chromium.orge8077812012-02-03 03:41:46 +0000846 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000847 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000848 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000849 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000850 return self.is_gerrit
851
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000852 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000853 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000854 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700855 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000856 if self.squash_gerrit_uploads is None:
857 # Default is squash now (http://crbug.com/611892#c23).
858 self.squash_gerrit_uploads = self._GetConfig(
859 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000860 return self.squash_gerrit_uploads
861
tandriia60502f2016-06-20 02:01:53 -0700862 def GetSquashGerritUploadsOverride(self):
863 """Return True or False if codereview.settings should be overridden.
864
865 Returns None if no override has been defined.
866 """
867 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000868 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700869 if result == 'true':
870 return True
871 if result == 'false':
872 return False
873 return None
874
tandrii@chromium.org28253532016-04-14 13:46:56 +0000875 def GetGerritSkipEnsureAuthenticated(self):
876 """Return True if EnsureAuthenticated should not be done for Gerrit
877 uploads."""
878 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000879 self.gerrit_skip_ensure_authenticated = self._GetConfig(
880 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000881 return self.gerrit_skip_ensure_authenticated
882
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000883 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000884 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000885 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000886 # Git requires single quotes for paths with spaces. We need to replace
887 # them with double quotes for Windows to treat such paths as a single
888 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000889 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000890 return self.git_editor or None
891
thestig@chromium.org44202a22014-03-11 19:22:18 +0000892 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000893 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000894
895 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000896 return self._GetConfig(
897 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000898
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000899 def GetFormatFullByDefault(self):
900 if self.format_full_by_default is None:
901 result = (
902 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
903 error_ok=True).strip())
904 self.format_full_by_default = (result == 'true')
905 return self.format_full_by_default
906
Edward Lemur26964072020-02-19 19:18:51 +0000907 def _GetConfig(self, key, default=''):
908 self._LazyUpdateIfNeeded()
909 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000910
911
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000912class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000913 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000914 NONE = 'none'
915 DRY_RUN = 'dry_run'
916 COMMIT = 'commit'
917
918 ALL_STATES = [NONE, DRY_RUN, COMMIT]
919
920
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000921class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000922 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000923 self.issue = issue
924 self.patchset = patchset
925 self.hostname = hostname
926
927 @property
928 def valid(self):
929 return self.issue is not None
930
931
Edward Lemurf38bc172019-09-03 21:02:13 +0000932def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000933 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
934 fail_result = _ParsedIssueNumberArgument()
935
Edward Lemur678a6842019-10-03 22:25:05 +0000936 if isinstance(arg, int):
937 return _ParsedIssueNumberArgument(issue=arg)
938 if not isinstance(arg, basestring):
939 return fail_result
940
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000941 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000942 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000943 if not arg.startswith('http'):
944 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700945
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000946 url = gclient_utils.UpgradeToHttps(arg)
947 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000948 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000949 except ValueError:
950 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200951
Edward Lemur678a6842019-10-03 22:25:05 +0000952 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
953 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
954 # Short urls like https://domain/<issue_number> can be used, but don't allow
955 # specifying the patchset (you'd 404), but we allow that here.
956 if parsed_url.path == '/':
957 part = parsed_url.fragment
958 else:
959 part = parsed_url.path
960
961 match = re.match(
962 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
963 if not match:
964 return fail_result
965
966 issue = int(match.group('issue'))
967 patchset = match.group('patchset')
968 return _ParsedIssueNumberArgument(
969 issue=issue,
970 patchset=int(patchset) if patchset else None,
971 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000972
973
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000974def _create_description_from_log(args):
975 """Pulls out the commit log to use as a base for the CL description."""
976 log_args = []
977 if len(args) == 1 and not args[0].endswith('.'):
978 log_args = [args[0] + '..']
979 elif len(args) == 1 and args[0].endswith('...'):
980 log_args = [args[0][:-1]]
981 elif len(args) == 2:
982 log_args = [args[0] + '..' + args[1]]
983 else:
984 log_args = args[:] # Hope for the best!
985 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
986
987
Aaron Gablea45ee112016-11-22 15:14:38 -0800988class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700989 def __init__(self, issue, url):
990 self.issue = issue
991 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800992 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700993
994 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800995 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700996 self.issue, self.url)
997
998
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100999_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001000 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001001 # TODO(tandrii): these two aren't known in Gerrit.
1002 'approval', 'disapproval'])
1003
1004
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001005class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001006 """Changelist works with one changelist in local branch.
1007
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001008 Notes:
1009 * Not safe for concurrent multi-{thread,process} use.
1010 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001011 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001012 """
1013
Edward Lemur125d60a2019-09-13 18:25:41 +00001014 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001015 """Create a new ChangeList instance.
1016
Edward Lemurf38bc172019-09-03 21:02:13 +00001017 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001018 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001019 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001020 global settings
1021 if not settings:
1022 # Happens when git_cl.py is used as a utility library.
1023 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025 self.branchref = branchref
1026 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001027 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001028 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029 else:
1030 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001031 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001032 self.lookedup_issue = False
1033 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 self.has_description = False
1035 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001036 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001038 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001039 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001040 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001041 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001042
Edward Lemur125d60a2019-09-13 18:25:41 +00001043 # Lazily cached values.
1044 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1045 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1046 # Map from change number (issue) to its detail cache.
1047 self._detail_cache = {}
1048
1049 if codereview_host is not None:
1050 assert not codereview_host.startswith('https://'), codereview_host
1051 self._gerrit_host = codereview_host
1052 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001053
1054 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001055 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001056
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001057 The return value is a string suitable for passing to git cl with the --cc
1058 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001059 """
1060 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001061 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001062 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001063 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1064 return self.cc
1065
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001066 def GetCCListWithoutDefault(self):
1067 """Return the users cc'd on this CL excluding default ones."""
1068 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001069 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001070 return self.cc
1071
Daniel Cheng7227d212017-11-17 08:12:37 -08001072 def ExtendCC(self, more_cc):
1073 """Extends the list of users to cc on this CL based on the changed files."""
1074 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001075
1076 def GetBranch(self):
1077 """Returns the short branch name, e.g. 'master'."""
1078 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001079 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001080 if not branchref:
1081 return None
1082 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001083 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001084 return self.branch
1085
1086 def GetBranchRef(self):
1087 """Returns the full branch name, e.g. 'refs/heads/master'."""
1088 self.GetBranch() # Poke the lazy loader.
1089 return self.branchref
1090
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001091 def ClearBranch(self):
1092 """Clears cached branch data of this object."""
1093 self.branch = self.branchref = None
1094
Edward Lemur85153282020-02-14 22:06:29 +00001095 def _GitGetBranchConfigValue(self, key, default=None):
1096 return scm.GIT.GetBranchConfig(
1097 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001098
Edward Lemur85153282020-02-14 22:06:29 +00001099 def _GitSetBranchConfigValue(self, key, value):
1100 action = 'set %s to %r' % (key, value)
1101 if not value:
1102 action = 'unset %s' % key
1103 assert self.GetBranch(), 'a branch is needed to ' + action
1104 return scm.GIT.SetBranchConfig(
1105 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001106
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001107 @staticmethod
1108 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001109 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001110 e.g. 'origin', 'refs/heads/master'
1111 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001112 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1113 settings.GetRoot(), branch)
1114 if not remote or not upstream_branch:
1115 DieWithError(
1116 'Unable to determine default branch to diff against.\n'
1117 'Either pass complete "git diff"-style arguments, like\n'
1118 ' git cl upload origin/master\n'
1119 'or verify this branch is set up to track another \n'
1120 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001121
1122 return remote, upstream_branch
1123
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001124 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001125 upstream_branch = self.GetUpstreamBranch()
1126 if not BranchExists(upstream_branch):
1127 DieWithError('The upstream for the current branch (%s) does not exist '
1128 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001129 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001130 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001131
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 def GetUpstreamBranch(self):
1133 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001134 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001135 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001136 upstream_branch = upstream_branch.replace('refs/heads/',
1137 'refs/remotes/%s/' % remote)
1138 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1139 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001140 self.upstream_branch = upstream_branch
1141 return self.upstream_branch
1142
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001143 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001144 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001145 remote, branch = None, self.GetBranch()
1146 seen_branches = set()
1147 while branch not in seen_branches:
1148 seen_branches.add(branch)
1149 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001150 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001151 if remote != '.' or branch.startswith('refs/remotes'):
1152 break
1153 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001154 remotes = RunGit(['remote'], error_ok=True).split()
1155 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001156 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001157 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001158 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001159 logging.warn('Could not determine which remote this change is '
1160 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001161 else:
1162 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001163 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001164 branch = 'HEAD'
1165 if branch.startswith('refs/remotes'):
1166 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001167 elif branch.startswith('refs/branch-heads/'):
1168 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 else:
1170 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001171 return self._remote
1172
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 def GitSanityChecks(self, upstream_git_obj):
1174 """Checks git repo status and ensures diff is from local commits."""
1175
sbc@chromium.org79706062015-01-14 21:18:12 +00001176 if upstream_git_obj is None:
1177 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001178 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001179 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001180 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001181 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001182 return False
1183
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001184 # Verify the commit we're diffing against is in our current branch.
1185 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1186 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1187 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001188 print('ERROR: %s is not in the current branch. You may need to rebase '
1189 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001190 return False
1191
1192 # List the commits inside the diff, and verify they are all local.
1193 commits_in_diff = RunGit(
1194 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1195 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1196 remote_branch = remote_branch.strip()
1197 if code != 0:
1198 _, remote_branch = self.GetRemoteBranch()
1199
1200 commits_in_remote = RunGit(
1201 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1202
1203 common_commits = set(commits_in_diff) & set(commits_in_remote)
1204 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001205 print('ERROR: Your diff contains %d commits already in %s.\n'
1206 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1207 'the diff. If you are using a custom git flow, you can override'
1208 ' the reference used for this check with "git config '
1209 'gitcl.remotebranch <git-ref>".' % (
1210 len(common_commits), remote_branch, upstream_git_obj),
1211 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001212 return False
1213 return True
1214
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001215 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001216 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001217
1218 Returns None if it is not set.
1219 """
tandrii5d48c322016-08-18 16:19:37 -07001220 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001221
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222 def GetRemoteUrl(self):
1223 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1224
1225 Returns None if there is no remote.
1226 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001227 is_cached, value = self._cached_remote_url
1228 if is_cached:
1229 return value
1230
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001231 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001232 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001233
Edward Lemur298f2cf2019-02-22 21:40:39 +00001234 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001235 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001236 if host:
1237 self._cached_remote_url = (True, url)
1238 return url
1239
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001240 # If it cannot be parsed as an url, assume it is a local directory,
1241 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001242 logging.warning('"%s" doesn\'t appear to point to a git host. '
1243 'Interpreting it as a local directory.', url)
1244 if not os.path.isdir(url):
1245 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001246 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1247 'but it doesn\'t exist.',
1248 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001249 return None
1250
1251 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001252 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001253
Edward Lemur79d4f992019-11-11 23:49:02 +00001254 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001255 if not host:
1256 logging.error(
1257 'Remote "%(remote)s" for branch "%(branch)s" points to '
1258 '"%(cache_path)s", but it is misconfigured.\n'
1259 '"%(cache_path)s" must be a git repo and must have a remote named '
1260 '"%(remote)s" pointing to the git host.', {
1261 'remote': remote,
1262 'cache_path': cache_path,
1263 'branch': self.GetBranch()})
1264 return None
1265
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001266 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001267 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001268
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001269 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001270 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001271 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001272 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1273 if self.issue is not None:
1274 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001275 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001276 return self.issue
1277
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001278 def GetIssueURL(self):
1279 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001280 issue = self.GetIssue()
1281 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001282 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001283 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284
Edward Lemur7f6dec02020-02-06 20:23:58 +00001285 def GetLocalDescription(self, upstream_branch):
1286 """Return the log messages of all commits up to the branch point."""
1287 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1288 return RunGitWithCode(args)[1].strip()
1289
Edward Lemur6c6827c2020-02-06 21:15:18 +00001290 def FetchDescription(self, pretty=False):
1291 assert self.GetIssue(), 'issue is required to query Gerrit'
1292
1293 if not self.has_description:
1294 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1295 current_rev = data['current_revision']
1296 self.description = data['revisions'][current_rev]['commit']['message']
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 self.has_description = True
Edward Lemur6c6827c2020-02-06 21:15:18 +00001298
1299 if not pretty:
1300 return self.description
1301
1302 # Set width to 72 columns + 2 space indent.
1303 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1304 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1305 lines = self.description.splitlines()
1306 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001307
1308 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001309 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001310 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001311 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1312 if self.patchset is not None:
1313 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001314 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001315 return self.patchset
1316
1317 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001318 """Set this branch's patchset. If patchset=0, clears the patchset."""
1319 assert self.GetBranch()
1320 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001321 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001322 else:
1323 self.patchset = int(patchset)
1324 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001325 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001326
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001327 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001328 """Set this branch's issue. If issue isn't given, clears the issue."""
1329 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001330 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001331 issue = int(issue)
1332 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001333 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001334 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001335 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001336 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001337 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001338 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001339 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001340 else:
tandrii5d48c322016-08-18 16:19:37 -07001341 # Reset all of these just to be clean.
1342 reset_suffixes = [
1343 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001344 self.IssueConfigKey(),
1345 self.PatchsetConfigKey(),
1346 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001347 ] + self._PostUnsetIssueProperties()
1348 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001349 try:
1350 self._GitSetBranchConfigValue(prop, None)
1351 except subprocess2.CalledProcessError:
1352 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001353 msg = RunGit(['log', '-1', '--format=%B']).strip()
1354 if msg and git_footers.get_footer_change_id(msg):
1355 print('WARNING: The change patched into this branch has a Change-Id. '
1356 'Removing it.')
1357 RunGit(['commit', '--amend', '-m',
1358 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001359 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001360 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001361 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001362
Edward Lemur7f6dec02020-02-06 20:23:58 +00001363 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001364 if not self.GitSanityChecks(upstream_branch):
1365 DieWithError('\nGit sanity check failure')
1366
Edward Lemur7f6dec02020-02-06 20:23:58 +00001367 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001368 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001369 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001370 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001371 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001372 except subprocess2.CalledProcessError:
1373 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001374 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001375 'This branch probably doesn\'t exist anymore. To reset the\n'
1376 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001377 ' git branch --set-upstream-to origin/master %s\n'
1378 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001379 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001380
maruel@chromium.org52424302012-08-29 15:14:30 +00001381 issue = self.GetIssue()
1382 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001383 if issue:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001384 description = self.FetchDescription()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001385 else:
1386 # If the change was never uploaded, use the log messages of all commits
1387 # up to the branch point, as git cl upload will prefill the description
1388 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001389 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001390
Edward Lemur7f6dec02020-02-06 20:23:58 +00001391 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001392 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001393 name,
1394 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001395 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001396 files,
1397 issue,
1398 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001399 author,
1400 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001401
dsansomee2d6fd92016-09-08 00:10:47 -07001402 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001403 assert self.GetIssue(), 'issue is required to update description'
1404
1405 if gerrit_util.HasPendingChangeEdit(
1406 self._GetGerritHost(), self._GerritChangeIdentifier()):
1407 if not force:
1408 confirm_or_exit(
1409 'The description cannot be modified while the issue has a pending '
1410 'unpublished edit. Either publish the edit in the Gerrit web UI '
1411 'or delete it.\n\n', action='delete the unpublished edit')
1412
1413 gerrit_util.DeletePendingChangeEdit(
1414 self._GetGerritHost(), self._GerritChangeIdentifier())
1415 gerrit_util.SetCommitMessage(
1416 self._GetGerritHost(), self._GerritChangeIdentifier(),
1417 description, notify='NONE')
1418
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001419 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001420 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001421
Edward Lesmes8e282792018-04-03 18:50:29 -04001422 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001423 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1424 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001425 start = time_time()
1426 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001427 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1428 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001429 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001430 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001431 metrics.collector.add_repeated('sub_commands', {
1432 'command': 'presubmit',
1433 'execution_time': time_time() - start,
1434 'exit_code': 0 if result.should_continue() else 1,
1435 })
1436 return result
vapierfd77ac72016-06-16 08:33:57 -07001437 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001438 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001439
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001440 def CMDUpload(self, options, git_diff_args, orig_args):
1441 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001442 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001443 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001444 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001445 else:
1446 if self.GetBranch() is None:
1447 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1448
1449 # Default to diffing against common ancestor of upstream branch
1450 base_branch = self.GetCommonAncestorWithUpstream()
1451 git_diff_args = [base_branch, 'HEAD']
1452
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001453 # Fast best-effort checks to abort before running potentially expensive
1454 # hooks if uploading is likely to fail anyway. Passing these checks does
1455 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001456 self.EnsureAuthenticated(force=options.force)
1457 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001458
1459 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001460 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001461 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1462 files = [f.LocalPath() for f in change.AffectedFiles()]
1463 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001464 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001465
1466 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001467 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001468 # Set the reviewer list now so that presubmit checks can access it.
1469 change_description = ChangeDescription(change.FullDescriptionText())
1470 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001471 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001472 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001473 change)
1474 change.SetDescriptionText(change_description.description)
1475 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001476 may_prompt=not options.force,
1477 verbose=options.verbose,
1478 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001479 if not hook_results.should_continue():
1480 return 1
Daniel Cheng7227d212017-11-17 08:12:37 -08001481 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001482
Aaron Gable13101a62018-02-09 13:20:41 -08001483 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001484 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001485 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001486 self._GitSetBranchConfigValue(
1487 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001488 # Run post upload hooks, if specified.
1489 if settings.GetRunPostUploadHook():
1490 presubmit_support.DoPostUploadExecuter(
1491 change,
Edward Lemur016a0872020-02-04 22:13:28 +00001492 self.GetGerritObjForPresubmit(),
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001493 settings.GetRoot(),
1494 options.verbose,
1495 sys.stdout)
1496
1497 # Upload all dependencies if specified.
1498 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001499 print()
1500 print('--dependencies has been specified.')
1501 print('All dependent local branches will be re-uploaded.')
1502 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001503 # Remove the dependencies flag from args so that we do not end up in a
1504 # loop.
1505 orig_args.remove('--dependencies')
1506 ret = upload_branch_deps(self, orig_args)
1507 return ret
1508
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001509 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001510 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001511
1512 Issue must have been already uploaded and known.
1513 """
1514 assert new_state in _CQState.ALL_STATES
1515 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001516 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001517 vote_map = {
1518 _CQState.NONE: 0,
1519 _CQState.DRY_RUN: 1,
1520 _CQState.COMMIT: 2,
1521 }
1522 labels = {'Commit-Queue': vote_map[new_state]}
1523 notify = False if new_state == _CQState.DRY_RUN else None
1524 gerrit_util.SetReview(
1525 self._GetGerritHost(), self._GerritChangeIdentifier(),
1526 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001527 return 0
1528 except KeyboardInterrupt:
1529 raise
1530 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001531 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001532 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001533 ' * Your project has no CQ,\n'
1534 ' * You don\'t have permission to change the CQ state,\n'
1535 ' * There\'s a bug in this code (see stack trace below).\n'
1536 'Consider specifying which bots to trigger manually or asking your '
1537 'project owners for permissions or contacting Chrome Infra at:\n'
1538 'https://www.chromium.org/infra\n\n' %
1539 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001540 # Still raise exception so that stack trace is printed.
1541 raise
1542
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001543 def _GetGerritHost(self):
1544 # Lazy load of configs.
1545 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001546 if self._gerrit_host and '.' not in self._gerrit_host:
1547 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1548 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001549 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001550 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001551 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001552 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001553 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1554 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001555 return self._gerrit_host
1556
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001557 def _GetGitHost(self):
1558 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001559 remote_url = self.GetRemoteUrl()
1560 if not remote_url:
1561 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001562 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001563
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001564 def GetCodereviewServer(self):
1565 if not self._gerrit_server:
1566 # If we're on a branch then get the server potentially associated
1567 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001568 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001569 self._gerrit_server = self._GitGetBranchConfigValue(
1570 self.CodereviewServerConfigKey())
1571 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001572 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001573 if not self._gerrit_server:
1574 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1575 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001576 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001577 parts[0] = parts[0] + '-review'
1578 self._gerrit_host = '.'.join(parts)
1579 self._gerrit_server = 'https://%s' % self._gerrit_host
1580 return self._gerrit_server
1581
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001582 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001583 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001584 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001585 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001586 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001587 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001588 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001589 if project.endswith('.git'):
1590 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001591 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1592 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1593 # gitiles/git-over-https protocol. E.g.,
1594 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1595 # as
1596 # https://chromium.googlesource.com/v8/v8
1597 if project.startswith('a/'):
1598 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001599 return project
1600
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001601 def _GerritChangeIdentifier(self):
1602 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1603
1604 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001605 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001606 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001607 project = self._GetGerritProject()
1608 if project:
1609 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1610 # Fall back on still unique, but less efficient change number.
1611 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001612
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001613 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001614 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001615 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001616
tandrii5d48c322016-08-18 16:19:37 -07001617 @classmethod
1618 def PatchsetConfigKey(cls):
1619 return 'gerritpatchset'
1620
1621 @classmethod
1622 def CodereviewServerConfigKey(cls):
1623 return 'gerritserver'
1624
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001625 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001626 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001627 if settings.GetGerritSkipEnsureAuthenticated():
1628 # For projects with unusual authentication schemes.
1629 # See http://crbug.com/603378.
1630 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001631
1632 # Check presence of cookies only if using cookies-based auth method.
1633 cookie_auth = gerrit_util.Authenticator.get()
1634 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001635 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001636
Florian Mayerae510e82020-01-30 21:04:48 +00001637 remote_url = self.GetRemoteUrl()
1638 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001639 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001640 return
1641 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001642 logging.warning('Ignoring branch %(branch)s with non-https remote '
1643 '%(remote)s', {
1644 'branch': self.branch,
1645 'remote': self.GetRemoteUrl()
1646 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001647 return
1648
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001649 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001650 self.GetCodereviewServer()
1651 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001652 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001653
1654 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1655 git_auth = cookie_auth.get_auth_header(git_host)
1656 if gerrit_auth and git_auth:
1657 if gerrit_auth == git_auth:
1658 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001659 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001660 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001661 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001662 ' %s\n'
1663 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001664 ' Consider running the following command:\n'
1665 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001666 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001667 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001668 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001669 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001670 cookie_auth.get_new_password_message(git_host)))
1671 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001672 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001673 return
1674 else:
1675 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001676 ([] if gerrit_auth else [self._gerrit_host]) +
1677 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001678 DieWithError('Credentials for the following hosts are required:\n'
1679 ' %s\n'
1680 'These are read from %s (or legacy %s)\n'
1681 '%s' % (
1682 '\n '.join(missing),
1683 cookie_auth.get_gitcookies_path(),
1684 cookie_auth.get_netrc_path(),
1685 cookie_auth.get_new_password_message(git_host)))
1686
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001687 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001688 if not self.GetIssue():
1689 return
1690
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001691 status = self._GetChangeDetail()['status']
1692 if status in ('MERGED', 'ABANDONED'):
1693 DieWithError('Change %s has been %s, new uploads are not allowed' %
1694 (self.GetIssueURL(),
1695 'submitted' if status == 'MERGED' else 'abandoned'))
1696
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001697 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1698 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1699 # Apparently this check is not very important? Otherwise get_auth_email
1700 # could have been added to other implementations of Authenticator.
1701 cookies_auth = gerrit_util.Authenticator.get()
1702 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001703 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001704
1705 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001706 if self.GetIssueOwner() == cookies_user:
1707 return
1708 logging.debug('change %s owner is %s, cookies user is %s',
1709 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001710 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001711 # so ask what Gerrit thinks of this user.
1712 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1713 if details['email'] == self.GetIssueOwner():
1714 return
1715 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001716 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001717 'as %s.\n'
1718 'Uploading may fail due to lack of permissions.' %
1719 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1720 confirm_or_exit(action='upload')
1721
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001722 def _PostUnsetIssueProperties(self):
1723 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001724 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001725
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001726 def GetGerritObjForPresubmit(self):
1727 return presubmit_support.GerritAccessor(self._GetGerritHost())
1728
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001729 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001730 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001731 or CQ status, assuming adherence to a common workflow.
1732
1733 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001734 * 'error' - error from review tool (including deleted issues)
1735 * 'unsent' - no reviewers added
1736 * 'waiting' - waiting for review
1737 * 'reply' - waiting for uploader to reply to review
1738 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001739 * 'dry-run' - dry-running in the CQ
1740 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001741 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001742 """
1743 if not self.GetIssue():
1744 return None
1745
1746 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001747 data = self._GetChangeDetail([
1748 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001749 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001750 return 'error'
1751
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001752 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001753 return 'closed'
1754
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001755 cq_label = data['labels'].get('Commit-Queue', {})
1756 max_cq_vote = 0
1757 for vote in cq_label.get('all', []):
1758 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1759 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001760 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001761 if max_cq_vote == 1:
1762 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001763
Aaron Gable9ab38c62017-04-06 14:36:33 -07001764 if data['labels'].get('Code-Review', {}).get('approved'):
1765 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001766
1767 if not data.get('reviewers', {}).get('REVIEWER', []):
1768 return 'unsent'
1769
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001770 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001771 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001772 last_message_author = messages.pop().get('author', {})
1773 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001774 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1775 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001776 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001777 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001778 if last_message_author.get('_account_id') == owner:
1779 # Most recent message was by owner.
1780 return 'waiting'
1781 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001782 # Some reply from non-owner.
1783 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001784
1785 # Somehow there are no messages even though there are reviewers.
1786 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001787
1788 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001789 if not self.GetIssue():
1790 return None
1791
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001792 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001793 patchset = data['revisions'][data['current_revision']]['_number']
1794 self.SetPatchset(patchset)
1795 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001796
Aaron Gable636b13f2017-07-14 10:42:48 -07001797 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001798 gerrit_util.SetReview(
1799 self._GetGerritHost(), self._GerritChangeIdentifier(),
1800 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001801
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001802 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001803 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001804 # CURRENT_REVISION is included to get the latest patchset so that
1805 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001806 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001807 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1808 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001809 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001810 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001811 robot_file_comments = gerrit_util.GetChangeRobotComments(
1812 self._GetGerritHost(), self._GerritChangeIdentifier())
1813
1814 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001815 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001816 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001817 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001818 line_comments = file_comments.setdefault(path, [])
1819 line_comments.extend(
1820 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001821
1822 # Build dictionary of file comments for easy access and sorting later.
1823 # {author+date: {path: {patchset: {line: url+message}}}}
1824 comments = collections.defaultdict(
1825 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001826 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001827 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001828 tag = comment.get('tag', '')
1829 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001830 continue
1831 key = (comment['author']['email'], comment['updated'])
1832 if comment.get('side', 'REVISION') == 'PARENT':
1833 patchset = 'Base'
1834 else:
1835 patchset = 'PS%d' % comment['patch_set']
1836 line = comment.get('line', 0)
1837 url = ('https://%s/c/%s/%s/%s#%s%s' %
1838 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1839 'b' if comment.get('side') == 'PARENT' else '',
1840 str(line) if line else ''))
1841 comments[key][path][patchset][line] = (url, comment['message'])
1842
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001843 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001844 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001845 summary = self._BuildCommentSummary(msg, comments, readable)
1846 if summary:
1847 summaries.append(summary)
1848 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001849
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001850 @staticmethod
1851 def _BuildCommentSummary(msg, comments, readable):
1852 key = (msg['author']['email'], msg['date'])
1853 # Don't bother showing autogenerated messages that don't have associated
1854 # file or line comments. this will filter out most autogenerated
1855 # messages, but will keep robot comments like those from Tricium.
1856 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1857 if is_autogenerated and not comments.get(key):
1858 return None
1859 message = msg['message']
1860 # Gerrit spits out nanoseconds.
1861 assert len(msg['date'].split('.')[-1]) == 9
1862 date = datetime.datetime.strptime(msg['date'][:-3],
1863 '%Y-%m-%d %H:%M:%S.%f')
1864 if key in comments:
1865 message += '\n'
1866 for path, patchsets in sorted(comments.get(key, {}).items()):
1867 if readable:
1868 message += '\n%s' % path
1869 for patchset, lines in sorted(patchsets.items()):
1870 for line, (url, content) in sorted(lines.items()):
1871 if line:
1872 line_str = 'Line %d' % line
1873 path_str = '%s:%d:' % (path, line)
1874 else:
1875 line_str = 'File comment'
1876 path_str = '%s:0:' % path
1877 if readable:
1878 message += '\n %s, %s: %s' % (patchset, line_str, url)
1879 message += '\n %s\n' % content
1880 else:
1881 message += '\n%s ' % path_str
1882 message += '\n%s\n' % content
1883
1884 return _CommentSummary(
1885 date=date,
1886 message=message,
1887 sender=msg['author']['email'],
1888 autogenerated=is_autogenerated,
1889 # These could be inferred from the text messages and correlated with
1890 # Code-Review label maximum, however this is not reliable.
1891 # Leaving as is until the need arises.
1892 approval=False,
1893 disapproval=False,
1894 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001895
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001896 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001897 gerrit_util.AbandonChange(
1898 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001899
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001900 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001901 gerrit_util.SubmitChange(
1902 self._GetGerritHost(), self._GerritChangeIdentifier(),
1903 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001904
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001905 def _GetChangeDetail(self, options=None):
1906 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001907 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001908 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001909
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001910 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001911 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001912 options.append('CURRENT_COMMIT')
1913
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001914 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001915 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001916 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001917
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001918 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1919 # Assumption: data fetched before with extra options is suitable
1920 # for return for a smaller set of options.
1921 # For example, if we cached data for
1922 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1923 # and request is for options=[CURRENT_REVISION],
1924 # THEN we can return prior cached data.
1925 if options_set.issubset(cached_options_set):
1926 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001927
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001928 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001929 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001930 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001931 except gerrit_util.GerritError as e:
1932 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001933 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001934 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001935
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001936 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001937 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001938
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001939 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001940 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001941 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001942 data = gerrit_util.GetChangeCommit(
1943 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001944 except gerrit_util.GerritError as e:
1945 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001946 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001947 raise
agable32978d92016-11-01 12:55:02 -07001948 return data
1949
Karen Qian40c19422019-03-13 21:28:29 +00001950 def _IsCqConfigured(self):
1951 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001952 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001953
Olivier Robin75ee7252018-04-13 10:02:56 +02001954 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001955 if git_common.is_dirty_git_tree('land'):
1956 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001957
tandriid60367b2016-06-22 05:25:12 -07001958 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001959 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001960 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001961 'which can test and land changes for you. '
1962 'Are you sure you wish to bypass it?\n',
1963 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001964 differs = True
tandriic4344b52016-08-29 06:04:54 -07001965 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001966 # Note: git diff outputs nothing if there is no diff.
1967 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001968 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001969 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001970 if detail['current_revision'] == last_upload:
1971 differs = False
1972 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001973 print('WARNING: Local branch contents differ from latest uploaded '
1974 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001975 if differs:
1976 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001977 confirm_or_exit(
1978 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1979 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001980 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001981 elif not bypass_hooks:
1982 hook_results = self.RunHook(
1983 committing=True,
1984 may_prompt=not force,
1985 verbose=verbose,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001986 change=self.GetChange(self.GetCommonAncestorWithUpstream()),
Olivier Robin75ee7252018-04-13 10:02:56 +02001987 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001988 if not hook_results.should_continue():
1989 return 1
1990
1991 self.SubmitIssue(wait_for_merge=True)
1992 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001993 links = self._GetChangeCommit().get('web_links', [])
1994 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001995 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001996 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001997 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001998 return 0
1999
Edward Lemurf38bc172019-09-03 21:02:13 +00002000 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002001 assert parsed_issue_arg.valid
2002
Edward Lemur125d60a2019-09-13 18:25:41 +00002003 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002004
2005 if parsed_issue_arg.hostname:
2006 self._gerrit_host = parsed_issue_arg.hostname
2007 self._gerrit_server = 'https://%s' % self._gerrit_host
2008
tandriic2405f52016-10-10 08:13:15 -07002009 try:
2010 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002011 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002012 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002013
2014 if not parsed_issue_arg.patchset:
2015 # Use current revision by default.
2016 revision_info = detail['revisions'][detail['current_revision']]
2017 patchset = int(revision_info['_number'])
2018 else:
2019 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002020 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002021 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2022 break
2023 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002024 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002025 (parsed_issue_arg.patchset, self.GetIssue()))
2026
Edward Lemur125d60a2019-09-13 18:25:41 +00002027 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002028 if remote_url.endswith('.git'):
2029 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002030 remote_url = remote_url.rstrip('/')
2031
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002032 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002033 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002034
2035 if remote_url != fetch_info['url']:
2036 DieWithError('Trying to patch a change from %s but this repo appears '
2037 'to be %s.' % (fetch_info['url'], remote_url))
2038
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002039 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002040
Aaron Gable62619a32017-06-16 08:22:09 -07002041 if force:
2042 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2043 print('Checked out commit for change %i patchset %i locally' %
2044 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002045 elif nocommit:
2046 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2047 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002048 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002049 RunGit(['cherry-pick', 'FETCH_HEAD'])
2050 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002051 (parsed_issue_arg.issue, patchset))
2052 print('Note: this created a local commit which does not have '
2053 'the same hash as the one uploaded for review. This will make '
2054 'uploading changes based on top of this branch difficult.\n'
2055 'If you want to do that, use "git cl patch --force" instead.')
2056
Stefan Zagerd08043c2017-10-12 12:07:02 -07002057 if self.GetBranch():
2058 self.SetIssue(parsed_issue_arg.issue)
2059 self.SetPatchset(patchset)
2060 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2061 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2062 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2063 else:
2064 print('WARNING: You are in detached HEAD state.\n'
2065 'The patch has been applied to your checkout, but you will not be '
2066 'able to upload a new patch set to the gerrit issue.\n'
2067 'Try using the \'-b\' option if you would like to work on a '
2068 'branch and/or upload a new patch set.')
2069
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002070 return 0
2071
tandrii16e0b4e2016-06-07 10:34:28 -07002072 def _GerritCommitMsgHookCheck(self, offer_removal):
2073 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2074 if not os.path.exists(hook):
2075 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002076 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2077 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002078 data = gclient_utils.FileRead(hook)
2079 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2080 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002081 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002082 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002083 'and may interfere with it in subtle ways.\n'
2084 'We recommend you remove the commit-msg hook.')
2085 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002086 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002087 gclient_utils.rm_file_or_tree(hook)
2088 print('Gerrit commit-msg hook removed.')
2089 else:
2090 print('OK, will keep Gerrit commit-msg hook in place.')
2091
Edward Lemur1b52d872019-05-09 21:12:12 +00002092 def _CleanUpOldTraces(self):
2093 """Keep only the last |MAX_TRACES| traces."""
2094 try:
2095 traces = sorted([
2096 os.path.join(TRACES_DIR, f)
2097 for f in os.listdir(TRACES_DIR)
2098 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2099 and not f.startswith('tmp'))
2100 ])
2101 traces_to_delete = traces[:-MAX_TRACES]
2102 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002103 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002104 except OSError:
2105 print('WARNING: Failed to remove old git traces from\n'
2106 ' %s'
2107 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002108
Edward Lemur5737f022019-05-17 01:24:00 +00002109 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002110 """Zip and write the git push traces stored in traces_dir."""
2111 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002112 traces_zip = trace_name + '-traces'
2113 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002114 # Create a temporary dir to store git config and gitcookies in. It will be
2115 # compressed and stored next to the traces.
2116 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002117 git_info_zip = trace_name + '-git-info'
2118
Edward Lemur5737f022019-05-17 01:24:00 +00002119 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002120 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002121 git_push_metadata['now'] = git_push_metadata['now'].decode(
2122 sys.stdin.encoding)
2123
Edward Lemur1b52d872019-05-09 21:12:12 +00002124 git_push_metadata['trace_name'] = trace_name
2125 gclient_utils.FileWrite(
2126 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2127
2128 # Keep only the first 6 characters of the git hashes on the packet
2129 # trace. This greatly decreases size after compression.
2130 packet_traces = os.path.join(traces_dir, 'trace-packet')
2131 if os.path.isfile(packet_traces):
2132 contents = gclient_utils.FileRead(packet_traces)
2133 gclient_utils.FileWrite(
2134 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2135 shutil.make_archive(traces_zip, 'zip', traces_dir)
2136
2137 # Collect and compress the git config and gitcookies.
2138 git_config = RunGit(['config', '-l'])
2139 gclient_utils.FileWrite(
2140 os.path.join(git_info_dir, 'git-config'),
2141 git_config)
2142
2143 cookie_auth = gerrit_util.Authenticator.get()
2144 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2145 gitcookies_path = cookie_auth.get_gitcookies_path()
2146 if os.path.isfile(gitcookies_path):
2147 gitcookies = gclient_utils.FileRead(gitcookies_path)
2148 gclient_utils.FileWrite(
2149 os.path.join(git_info_dir, 'gitcookies'),
2150 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2151 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2152
Edward Lemur1b52d872019-05-09 21:12:12 +00002153 gclient_utils.rmtree(git_info_dir)
2154
2155 def _RunGitPushWithTraces(
2156 self, change_desc, refspec, refspec_opts, git_push_metadata):
2157 """Run git push and collect the traces resulting from the execution."""
2158 # Create a temporary directory to store traces in. Traces will be compressed
2159 # and stored in a 'traces' dir inside depot_tools.
2160 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002161 trace_name = os.path.join(
2162 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002163
2164 env = os.environ.copy()
2165 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2166 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002167 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002168 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2169 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2170 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2171
2172 try:
2173 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002174 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002175 before_push = time_time()
2176 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002177 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002178 env=env,
2179 print_stdout=True,
2180 # Flush after every line: useful for seeing progress when running as
2181 # recipe.
2182 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002183 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002184 except subprocess2.CalledProcessError as e:
2185 push_returncode = e.returncode
2186 DieWithError('Failed to create a change. Please examine output above '
2187 'for the reason of the failure.\n'
2188 'Hint: run command below to diagnose common Git/Gerrit '
2189 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002190 ' git cl creds-check\n'
2191 '\n'
2192 'If git-cl is not working correctly, file a bug under the '
2193 'Infra>SDK component including the files below.\n'
2194 'Review the files before upload, since they might contain '
2195 'sensitive information.\n'
2196 'Set the Restrict-View-Google label so that they are not '
2197 'publicly accessible.\n'
2198 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002199 change_desc)
2200 finally:
2201 execution_time = time_time() - before_push
2202 metrics.collector.add_repeated('sub_commands', {
2203 'command': 'git push',
2204 'execution_time': execution_time,
2205 'exit_code': push_returncode,
2206 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2207 })
2208
Edward Lemur1b52d872019-05-09 21:12:12 +00002209 git_push_metadata['execution_time'] = execution_time
2210 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002211 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002212
Edward Lemur1b52d872019-05-09 21:12:12 +00002213 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002214 gclient_utils.rmtree(traces_dir)
2215
2216 return push_stdout
2217
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002218 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002219 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002220 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002221 # Load default for user, repo, squash=true, in this order.
2222 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002223
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002224 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002225 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002226 # This may be None; default fallback value is determined in logic below.
2227 title = options.title
2228
Dominic Battre7d1c4842017-10-27 09:17:28 +02002229 # Extract bug number from branch name.
2230 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002231 fixed = options.fixed
2232 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2233 self.GetBranch())
2234 if not bug and not fixed and match:
2235 if match.group('type') == 'bug':
2236 bug = match.group('bugnum')
2237 else:
2238 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002239
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002240 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002241 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002242 if self.GetIssue():
2243 # Try to get the message from a previous upload.
Edward Lemur6c6827c2020-02-06 21:15:18 +00002244 message = self.FetchDescription()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002245 if not message:
2246 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002247 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002248 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002249 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002250 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002251 # When uploading a subsequent patchset, -m|--message is taken
2252 # as the patchset title if --title was not provided.
2253 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002254 else:
2255 default_title = RunGit(
2256 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002257 if options.force:
2258 title = default_title
2259 else:
2260 title = ask_for_data(
2261 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002262
2263 # User requested to change description
2264 if options.edit_description:
2265 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2266 change_desc.prompt()
2267 message = change_desc.description
2268
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002269 change_id = self._GetChangeDetail()['change_id']
2270 while True:
2271 footer_change_ids = git_footers.get_footer_change_id(message)
2272 if footer_change_ids == [change_id]:
2273 break
2274 if not footer_change_ids:
2275 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002276 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002277 continue
2278 # There is already a valid footer but with different or several ids.
2279 # Doing this automatically is non-trivial as we don't want to lose
2280 # existing other footers, yet we want to append just 1 desired
2281 # Change-Id. Thus, just create a new footer, but let user verify the
2282 # new description.
2283 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002284 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002286 print(
2287 'WARNING: change %s has Change-Id footer(s):\n'
2288 ' %s\n'
2289 'but change has Change-Id %s, according to Gerrit.\n'
2290 'Please, check the proposed correction to the description, '
2291 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2292 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2293 change_id))
2294 confirm_or_exit(action='edit')
2295 change_desc.prompt()
2296
2297 message = change_desc.description
2298 if not message:
2299 DieWithError("Description is empty. Aborting...")
2300
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002301 # Continue the while loop.
2302 # Sanity check of this code - we should end up with proper message
2303 # footer.
2304 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002305 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002306 else: # if not self.GetIssue()
2307 if options.message:
2308 message = options.message
2309 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002310 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002311 if options.title:
2312 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002313 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002314 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002315 change_desc.prompt()
2316
Aaron Gableb56ad332017-01-06 15:24:31 -08002317 # On first upload, patchset title is always this string, while
2318 # --title flag gets converted to first line of message.
2319 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002320 if not change_desc.description:
2321 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002322 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002323 if len(change_ids) > 1:
2324 DieWithError('too many Change-Id footers, at most 1 allowed.')
2325 if not change_ids:
2326 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002327 change_desc.set_description(git_footers.add_footer_change_id(
2328 change_desc.description,
2329 GenerateGerritChangeId(change_desc.description)))
2330 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002331 assert len(change_ids) == 1
2332 change_id = change_ids[0]
2333
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002334 if options.reviewers or options.tbrs or options.add_owners_to:
2335 change_desc.update_reviewers(options.reviewers, options.tbrs,
2336 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002337 if options.preserve_tryjobs:
2338 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002339
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002340 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002341 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2342 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002343 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002344 with gclient_utils.temporary_file() as desc_tempfile:
2345 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2346 ref_to_push = RunGit(
2347 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002348 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002349 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002350 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002351 if not change_desc.description:
2352 DieWithError("Description is empty. Aborting...")
2353
2354 if not git_footers.get_footer_change_id(change_desc.description):
2355 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002356 change_desc.set_description(
2357 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002358 if options.reviewers or options.tbrs or options.add_owners_to:
2359 change_desc.update_reviewers(options.reviewers, options.tbrs,
2360 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002361 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002362 # For no-squash mode, we assume the remote called "origin" is the one we
2363 # want. It is not worthwhile to support different workflows for
2364 # no-squash mode.
2365 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002366 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2367
2368 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002369 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002370 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2371 ref_to_push)]).splitlines()
2372 if len(commits) > 1:
2373 print('WARNING: This will upload %d commits. Run the following command '
2374 'to see which commits will be uploaded: ' % len(commits))
2375 print('git log %s..%s' % (parent, ref_to_push))
2376 print('You can also use `git squash-branch` to squash these into a '
2377 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002378 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002380 if options.reviewers or options.tbrs or options.add_owners_to:
2381 change_desc.update_reviewers(options.reviewers, options.tbrs,
2382 options.add_owners_to, change)
2383
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002384 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002385 cc = []
2386 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2387 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2388 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002389 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002390 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002391 if options.cc:
2392 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002393 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002394 if change_desc.get_cced():
2395 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002396 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2397 valid_accounts = set(reviewers + cc)
2398 # TODO(crbug/877717): relax this for all hosts.
2399 else:
2400 valid_accounts = gerrit_util.ValidAccounts(
2401 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002402 logging.info('accounts %s are recognized, %s invalid',
2403 sorted(valid_accounts),
2404 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002405
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002406 # Extra options that can be specified at push time. Doc:
2407 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002408 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002409
Aaron Gable844cf292017-06-28 11:32:59 -07002410 # By default, new changes are started in WIP mode, and subsequent patchsets
2411 # don't send email. At any time, passing --send-mail will mark the change
2412 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002413 if options.send_mail:
2414 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002415 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002416 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002417 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002418 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002419 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002420
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002421 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002422 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002423
Aaron Gable9b713dd2016-12-14 16:04:21 -08002424 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002425 # Punctuation and whitespace in |title| must be percent-encoded.
2426 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002427
agablec6787972016-09-09 16:13:34 -07002428 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002429 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002430
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002431 for r in sorted(reviewers):
2432 if r in valid_accounts:
2433 refspec_opts.append('r=%s' % r)
2434 reviewers.remove(r)
2435 else:
2436 # TODO(tandrii): this should probably be a hard failure.
2437 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2438 % r)
2439 for c in sorted(cc):
2440 # refspec option will be rejected if cc doesn't correspond to an
2441 # account, even though REST call to add such arbitrary cc may succeed.
2442 if c in valid_accounts:
2443 refspec_opts.append('cc=%s' % c)
2444 cc.remove(c)
2445
rmistry9eadede2016-09-19 11:22:43 -07002446 if options.topic:
2447 # Documentation on Gerrit topics is here:
2448 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002449 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002450
Edward Lemur687ca902018-12-05 02:30:30 +00002451 if options.enable_auto_submit:
2452 refspec_opts.append('l=Auto-Submit+1')
2453 if options.use_commit_queue:
2454 refspec_opts.append('l=Commit-Queue+2')
2455 elif options.cq_dry_run:
2456 refspec_opts.append('l=Commit-Queue+1')
2457
2458 if change_desc.get_reviewers(tbr_only=True):
2459 score = gerrit_util.GetCodeReviewTbrScore(
2460 self._GetGerritHost(),
2461 self._GetGerritProject())
2462 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002463
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002464 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002465 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002466 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002467 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002468 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2469
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002470 refspec_suffix = ''
2471 if refspec_opts:
2472 refspec_suffix = '%' + ','.join(refspec_opts)
2473 assert ' ' not in refspec_suffix, (
2474 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2475 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2476
Edward Lemur1b52d872019-05-09 21:12:12 +00002477 git_push_metadata = {
2478 'gerrit_host': self._GetGerritHost(),
2479 'title': title or '<untitled>',
2480 'change_id': change_id,
2481 'description': change_desc.description,
2482 }
2483 push_stdout = self._RunGitPushWithTraces(
2484 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002485
2486 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002487 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002488 change_numbers = [m.group(1)
2489 for m in map(regex.match, push_stdout.splitlines())
2490 if m]
2491 if len(change_numbers) != 1:
2492 DieWithError(
2493 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002494 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002495 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002496 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002497
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002498 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002499 # GetIssue() is not set in case of non-squash uploads according to tests.
2500 # TODO(agable): non-squash uploads in git cl should be removed.
2501 gerrit_util.AddReviewers(
2502 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002503 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002504 reviewers, cc,
2505 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002506
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002507 return 0
2508
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002509 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2510 change_desc):
2511 """Computes parent of the generated commit to be uploaded to Gerrit.
2512
2513 Returns revision or a ref name.
2514 """
2515 if custom_cl_base:
2516 # Try to avoid creating additional unintended CLs when uploading, unless
2517 # user wants to take this risk.
2518 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2519 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2520 local_ref_of_target_remote])
2521 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002522 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002523 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2524 'If you proceed with upload, more than 1 CL may be created by '
2525 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2526 'If you are certain that specified base `%s` has already been '
2527 'uploaded to Gerrit as another CL, you may proceed.\n' %
2528 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2529 if not force:
2530 confirm_or_exit(
2531 'Do you take responsibility for cleaning up potential mess '
2532 'resulting from proceeding with upload?',
2533 action='upload')
2534 return custom_cl_base
2535
Aaron Gablef97e33d2017-03-30 15:44:27 -07002536 if remote != '.':
2537 return self.GetCommonAncestorWithUpstream()
2538
2539 # If our upstream branch is local, we base our squashed commit on its
2540 # squashed version.
2541 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2542
Aaron Gablef97e33d2017-03-30 15:44:27 -07002543 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002544 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002545
2546 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002547 # TODO(tandrii): consider checking parent change in Gerrit and using its
2548 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2549 # the tree hash of the parent branch. The upside is less likely bogus
2550 # requests to reupload parent change just because it's uploadhash is
2551 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002552 parent = RunGit(['config',
2553 'branch.%s.gerritsquashhash' % upstream_branch_name],
2554 error_ok=True).strip()
2555 # Verify that the upstream branch has been uploaded too, otherwise
2556 # Gerrit will create additional CLs when uploading.
2557 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2558 RunGitSilent(['rev-parse', parent + ':'])):
2559 DieWithError(
2560 '\nUpload upstream branch %s first.\n'
2561 'It is likely that this branch has been rebased since its last '
2562 'upload, so you just need to upload it again.\n'
2563 '(If you uploaded it with --no-squash, then branch dependencies '
2564 'are not supported, and you should reupload with --squash.)'
2565 % upstream_branch_name,
2566 change_desc)
2567 return parent
2568
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002569 def _AddChangeIdToCommitMessage(self, options, args):
2570 """Re-commits using the current message, assumes the commit hook is in
2571 place.
2572 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002573 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002574 git_command = ['commit', '--amend', '-m', log_desc]
2575 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002576 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002577 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002578 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002579 return new_log_desc
2580 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002581 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002582
tandriie113dfd2016-10-11 10:20:12 -07002583 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002584 try:
2585 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002586 except GerritChangeNotExists:
2587 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002588
2589 if data['status'] in ('ABANDONED', 'MERGED'):
2590 return 'CL %s is closed' % self.GetIssue()
2591
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002592 def GetGerritChange(self, patchset=None):
2593 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002594 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002595 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002596 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002597 data = self._GetChangeDetail(['ALL_REVISIONS'])
2598
2599 assert host and issue and patchset, 'CL must be uploaded first'
2600
2601 has_patchset = any(
2602 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002603 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002604 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002605 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002606 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002607
tandrii8c5a3532016-11-04 07:52:02 -07002608 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002609 'host': host,
2610 'change': issue,
2611 'project': data['project'],
2612 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002613 }
tandriie113dfd2016-10-11 10:20:12 -07002614
tandriide281ae2016-10-12 06:02:30 -07002615 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002616 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002617
Edward Lemur707d70b2018-02-07 00:50:14 +01002618 def GetReviewers(self):
2619 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002620 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002621
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002622
tandriif9aefb72016-07-01 09:06:51 -07002623def _get_bug_line_values(default_project, bugs):
2624 """Given default_project and comma separated list of bugs, yields bug line
2625 values.
2626
2627 Each bug can be either:
2628 * a number, which is combined with default_project
2629 * string, which is left as is.
2630
2631 This function may produce more than one line, because bugdroid expects one
2632 project per line.
2633
2634 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2635 ['v8:123', 'chromium:789']
2636 """
2637 default_bugs = []
2638 others = []
2639 for bug in bugs.split(','):
2640 bug = bug.strip()
2641 if bug:
2642 try:
2643 default_bugs.append(int(bug))
2644 except ValueError:
2645 others.append(bug)
2646
2647 if default_bugs:
2648 default_bugs = ','.join(map(str, default_bugs))
2649 if default_project:
2650 yield '%s:%s' % (default_project, default_bugs)
2651 else:
2652 yield default_bugs
2653 for other in sorted(others):
2654 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2655 yield other
2656
2657
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002658class ChangeDescription(object):
2659 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002660 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002661 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002662 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002663 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002664 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002665 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2666 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002667 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002668 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002669
Dan Beamd8b04ca2019-10-10 21:23:26 +00002670 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002671 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002672 if bug:
2673 regexp = re.compile(self.BUG_LINE)
2674 prefix = settings.GetBugPrefix()
2675 if not any((regexp.match(line) for line in self._description_lines)):
2676 values = list(_get_bug_line_values(prefix, bug))
2677 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002678 if fixed:
2679 regexp = re.compile(self.FIXED_LINE)
2680 prefix = settings.GetBugPrefix()
2681 if not any((regexp.match(line) for line in self._description_lines)):
2682 values = list(_get_bug_line_values(prefix, fixed))
2683 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002684
agable@chromium.org42c20792013-09-12 17:34:49 +00002685 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002686 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002687 return '\n'.join(self._description_lines)
2688
2689 def set_description(self, desc):
2690 if isinstance(desc, basestring):
2691 lines = desc.splitlines()
2692 else:
2693 lines = [line.rstrip() for line in desc]
2694 while lines and not lines[0]:
2695 lines.pop(0)
2696 while lines and not lines[-1]:
2697 lines.pop(-1)
2698 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002699
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002700 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2701 """Rewrites the R=/TBR= line(s) as a single line each.
2702
2703 Args:
2704 reviewers (list(str)) - list of additional emails to use for reviewers.
2705 tbrs (list(str)) - list of additional emails to use for TBRs.
2706 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2707 the change that are missing OWNER coverage. If this is not None, you
2708 must also pass a value for `change`.
2709 change (Change) - The Change that should be used for OWNERS lookups.
2710 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002711 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002712 assert isinstance(tbrs, list), tbrs
2713
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002714 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002715 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002716
2717 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002718 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002719
2720 reviewers = set(reviewers)
2721 tbrs = set(tbrs)
2722 LOOKUP = {
2723 'TBR': tbrs,
2724 'R': reviewers,
2725 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002726
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002727 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002728 regexp = re.compile(self.R_LINE)
2729 matches = [regexp.match(line) for line in self._description_lines]
2730 new_desc = [l for i, l in enumerate(self._description_lines)
2731 if not matches[i]]
2732 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002733
agable@chromium.org42c20792013-09-12 17:34:49 +00002734 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002735
2736 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002737 for match in matches:
2738 if not match:
2739 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002740 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2741
2742 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002743 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002744 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002745 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002746 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002747 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002748 LOOKUP[add_owners_to].update(
2749 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002750
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002751 # If any folks ended up in both groups, remove them from tbrs.
2752 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002753
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002754 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2755 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002756
2757 # Put the new lines in the description where the old first R= line was.
2758 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2759 if 0 <= line_loc < len(self._description_lines):
2760 if new_tbr_line:
2761 self._description_lines.insert(line_loc, new_tbr_line)
2762 if new_r_line:
2763 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002764 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002765 if new_r_line:
2766 self.append_footer(new_r_line)
2767 if new_tbr_line:
2768 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002769
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002770 def set_preserve_tryjobs(self):
2771 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2772 footers = git_footers.parse_footers(self.description)
2773 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2774 if v.lower() == 'true':
2775 return
2776 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2777
Anthony Polito8b955342019-09-24 19:01:36 +00002778 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002779 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002780 self.set_description([
2781 '# Enter a description of the change.',
2782 '# This will be displayed on the codereview site.',
2783 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002784 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002785 '--------------------',
2786 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002787 bug_regexp = re.compile(self.BUG_LINE)
2788 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002789 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002790 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2791 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002792 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002793
agable@chromium.org42c20792013-09-12 17:34:49 +00002794 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002795 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002796 if not content:
2797 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002798 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002799
Bruce Dawson2377b012018-01-11 16:46:49 -08002800 # Strip off comments and default inserted "Bug:" line.
2801 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002802 (line.startswith('#') or
2803 line.rstrip() == "Bug:" or
2804 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002805 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002806 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002807 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002808
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002809 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002810 """Adds a footer line to the description.
2811
2812 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2813 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2814 that Gerrit footers are always at the end.
2815 """
2816 parsed_footer_line = git_footers.parse_footer(line)
2817 if parsed_footer_line:
2818 # Line is a gerrit footer in the form: Footer-Key: any value.
2819 # Thus, must be appended observing Gerrit footer rules.
2820 self.set_description(
2821 git_footers.add_footer(self.description,
2822 key=parsed_footer_line[0],
2823 value=parsed_footer_line[1]))
2824 return
2825
2826 if not self._description_lines:
2827 self._description_lines.append(line)
2828 return
2829
2830 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2831 if gerrit_footers:
2832 # git_footers.split_footers ensures that there is an empty line before
2833 # actual (gerrit) footers, if any. We have to keep it that way.
2834 assert top_lines and top_lines[-1] == ''
2835 top_lines, separator = top_lines[:-1], top_lines[-1:]
2836 else:
2837 separator = [] # No need for separator if there are no gerrit_footers.
2838
2839 prev_line = top_lines[-1] if top_lines else ''
2840 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2841 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2842 top_lines.append('')
2843 top_lines.append(line)
2844 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002845
tandrii99a72f22016-08-17 14:33:24 -07002846 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002847 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002848 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002849 reviewers = [match.group(2).strip()
2850 for match in matches
2851 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002852 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002853
bradnelsond975b302016-10-23 12:20:23 -07002854 def get_cced(self):
2855 """Retrieves the list of reviewers."""
2856 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2857 cced = [match.group(2).strip() for match in matches if match]
2858 return cleanup_list(cced)
2859
Nodir Turakulov23b82142017-11-16 11:04:25 -08002860 def get_hash_tags(self):
2861 """Extracts and sanitizes a list of Gerrit hashtags."""
2862 subject = (self._description_lines or ('',))[0]
2863 subject = re.sub(
2864 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2865
2866 tags = []
2867 start = 0
2868 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2869 while True:
2870 m = bracket_exp.match(subject, start)
2871 if not m:
2872 break
2873 tags.append(self.sanitize_hash_tag(m.group(1)))
2874 start = m.end()
2875
2876 if not tags:
2877 # Try "Tag: " prefix.
2878 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2879 if m:
2880 tags.append(self.sanitize_hash_tag(m.group(1)))
2881 return tags
2882
2883 @classmethod
2884 def sanitize_hash_tag(cls, tag):
2885 """Returns a sanitized Gerrit hash tag.
2886
2887 A sanitized hashtag can be used as a git push refspec parameter value.
2888 """
2889 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2890
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002891 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2892 """Updates this commit description given the parent.
2893
2894 This is essentially what Gnumbd used to do.
2895 Consult https://goo.gl/WMmpDe for more details.
2896 """
2897 assert parent_msg # No, orphan branch creation isn't supported.
2898 assert parent_hash
2899 assert dest_ref
2900 parent_footer_map = git_footers.parse_footers(parent_msg)
2901 # This will also happily parse svn-position, which GnumbD is no longer
2902 # supporting. While we'd generate correct footers, the verifier plugin
2903 # installed in Gerrit will block such commit (ie git push below will fail).
2904 parent_position = git_footers.get_position(parent_footer_map)
2905
2906 # Cherry-picks may have last line obscuring their prior footers,
2907 # from git_footers perspective. This is also what Gnumbd did.
2908 cp_line = None
2909 if (self._description_lines and
2910 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2911 cp_line = self._description_lines.pop()
2912
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002913 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002914
2915 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2916 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002917 for i, line in enumerate(footer_lines):
2918 k, v = git_footers.parse_footer(line) or (None, None)
2919 if k and k.startswith('Cr-'):
2920 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002921
2922 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002923 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002924 if parent_position[0] == dest_ref:
2925 # Same branch as parent.
2926 number = int(parent_position[1]) + 1
2927 else:
2928 number = 1 # New branch, and extra lineage.
2929 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2930 int(parent_position[1])))
2931
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002932 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2933 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002934
2935 self._description_lines = top_lines
2936 if cp_line:
2937 self._description_lines.append(cp_line)
2938 if self._description_lines[-1] != '':
2939 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002940 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002941
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002942
Aaron Gablea1bab272017-04-11 16:38:18 -07002943def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002944 """Retrieves the reviewers that approved a CL from the issue properties with
2945 messages.
2946
2947 Note that the list may contain reviewers that are not committer, thus are not
2948 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002949
2950 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002951 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002952 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002953 return sorted(
2954 set(
2955 message['sender']
2956 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07002957 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002958 )
2959 )
2960
2961
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002962def FindCodereviewSettingsFile(filename='codereview.settings'):
2963 """Finds the given file starting in the cwd and going up.
2964
2965 Only looks up to the top of the repository unless an
2966 'inherit-review-settings-ok' file exists in the root of the repository.
2967 """
2968 inherit_ok_file = 'inherit-review-settings-ok'
2969 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002970 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002971 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2972 root = '/'
2973 while True:
2974 if filename in os.listdir(cwd):
2975 if os.path.isfile(os.path.join(cwd, filename)):
2976 return open(os.path.join(cwd, filename))
2977 if cwd == root:
2978 break
2979 cwd = os.path.dirname(cwd)
2980
2981
2982def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002983 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002984 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002985
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002986 def SetProperty(name, setting, unset_error_ok=False):
2987 fullname = 'rietveld.' + name
2988 if setting in keyvals:
2989 RunGit(['config', fullname, keyvals[setting]])
2990 else:
2991 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2992
tandrii48df5812016-10-17 03:55:37 -07002993 if not keyvals.get('GERRIT_HOST', False):
2994 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002995 # Only server setting is required. Other settings can be absent.
2996 # In that case, we ignore errors raised during option deletion attempt.
2997 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2998 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2999 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003000 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003001 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3002 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003003 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3004 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003005 SetProperty(
3006 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003007
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003008 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003009 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003010
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003011 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003012 RunGit(['config', 'gerrit.squash-uploads',
3013 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003014
tandrii@chromium.org28253532016-04-14 13:46:56 +00003015 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003016 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003017 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3018
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003019 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003020 # should be of the form
3021 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3022 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003023 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3024 keyvals['ORIGIN_URL_CONFIG']])
3025
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003026
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003027def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003028 """Downloads a network object to a local file, like urllib.urlretrieve.
3029
3030 This is necessary because urllib is broken for SSL connections via a proxy.
3031 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003032 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003033 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003034
3035
ukai@chromium.org712d6102013-11-27 00:52:58 +00003036def hasSheBang(fname):
3037 """Checks fname is a #! script."""
3038 with open(fname) as f:
3039 return f.read(2).startswith('#!')
3040
3041
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003042# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3043def DownloadHooks(*args, **kwargs):
3044 pass
3045
3046
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003047def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003048 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003049
3050 Args:
3051 force: True to update hooks. False to install hooks if not present.
3052 """
3053 if not settings.GetIsGerrit():
3054 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003055 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003056 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3057 if not os.access(dst, os.X_OK):
3058 if os.path.exists(dst):
3059 if not force:
3060 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003061 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003062 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003063 if not hasSheBang(dst):
3064 DieWithError('Not a script: %s\n'
3065 'You need to download from\n%s\n'
3066 'into .git/hooks/commit-msg and '
3067 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003068 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3069 except Exception:
3070 if os.path.exists(dst):
3071 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003072 DieWithError('\nFailed to download hooks.\n'
3073 'You need to download from\n%s\n'
3074 'into .git/hooks/commit-msg and '
3075 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003076
3077
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003078class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003079 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003080
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003081 _GOOGLESOURCE = 'googlesource.com'
3082
3083 def __init__(self):
3084 # Cached list of [host, identity, source], where source is either
3085 # .gitcookies or .netrc.
3086 self._all_hosts = None
3087
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003088 def ensure_configured_gitcookies(self):
3089 """Runs checks and suggests fixes to make git use .gitcookies from default
3090 path."""
3091 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3092 configured_path = RunGitSilent(
3093 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003094 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003095 if configured_path:
3096 self._ensure_default_gitcookies_path(configured_path, default)
3097 else:
3098 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003099
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003100 @staticmethod
3101 def _ensure_default_gitcookies_path(configured_path, default_path):
3102 assert configured_path
3103 if configured_path == default_path:
3104 print('git is already configured to use your .gitcookies from %s' %
3105 configured_path)
3106 return
3107
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003108 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003109 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3110 (configured_path, default_path))
3111
3112 if not os.path.exists(configured_path):
3113 print('However, your configured .gitcookies file is missing.')
3114 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3115 action='reconfigure')
3116 RunGit(['config', '--global', 'http.cookiefile', default_path])
3117 return
3118
3119 if os.path.exists(default_path):
3120 print('WARNING: default .gitcookies file already exists %s' %
3121 default_path)
3122 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3123 default_path)
3124
3125 confirm_or_exit('Move existing .gitcookies to default location?',
3126 action='move')
3127 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003128 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003129 print('Moved and reconfigured git to use .gitcookies from %s' %
3130 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003131
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003132 @staticmethod
3133 def _configure_gitcookies_path(default_path):
3134 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3135 if os.path.exists(netrc_path):
3136 print('You seem to be using outdated .netrc for git credentials: %s' %
3137 netrc_path)
3138 print('This tool will guide you through setting up recommended '
3139 '.gitcookies store for git credentials.\n'
3140 '\n'
3141 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3142 ' git config --global --unset http.cookiefile\n'
3143 ' mv %s %s.backup\n\n' % (default_path, default_path))
3144 confirm_or_exit(action='setup .gitcookies')
3145 RunGit(['config', '--global', 'http.cookiefile', default_path])
3146 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003147
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003148 def get_hosts_with_creds(self, include_netrc=False):
3149 if self._all_hosts is None:
3150 a = gerrit_util.CookiesAuthenticator()
3151 self._all_hosts = [
3152 (h, u, s)
3153 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003154 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3155 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003156 )
3157 if h.endswith(self._GOOGLESOURCE)
3158 ]
3159
3160 if include_netrc:
3161 return self._all_hosts
3162 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3163
3164 def print_current_creds(self, include_netrc=False):
3165 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3166 if not hosts:
3167 print('No Git/Gerrit credentials found')
3168 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003169 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003170 header = [('Host', 'User', 'Which file'),
3171 ['=' * l for l in lengths]]
3172 for row in (header + hosts):
3173 print('\t'.join((('%%+%ds' % l) % s)
3174 for l, s in zip(lengths, row)))
3175
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003176 @staticmethod
3177 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003178 """Parses identity "git-<username>.domain" into <username> and domain."""
3179 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003180 # distinguishable from sub-domains. But we do know typical domains:
3181 if identity.endswith('.chromium.org'):
3182 domain = 'chromium.org'
3183 username = identity[:-len('.chromium.org')]
3184 else:
3185 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003186 if username.startswith('git-'):
3187 username = username[len('git-'):]
3188 return username, domain
3189
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003190 def _canonical_git_googlesource_host(self, host):
3191 """Normalizes Gerrit hosts (with '-review') to Git host."""
3192 assert host.endswith(self._GOOGLESOURCE)
3193 # Prefix doesn't include '.' at the end.
3194 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3195 if prefix.endswith('-review'):
3196 prefix = prefix[:-len('-review')]
3197 return prefix + '.' + self._GOOGLESOURCE
3198
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003199 def _canonical_gerrit_googlesource_host(self, host):
3200 git_host = self._canonical_git_googlesource_host(host)
3201 prefix = git_host.split('.', 1)[0]
3202 return prefix + '-review.' + self._GOOGLESOURCE
3203
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003204 def _get_counterpart_host(self, host):
3205 assert host.endswith(self._GOOGLESOURCE)
3206 git = self._canonical_git_googlesource_host(host)
3207 gerrit = self._canonical_gerrit_googlesource_host(git)
3208 return git if gerrit == host else gerrit
3209
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003210 def has_generic_host(self):
3211 """Returns whether generic .googlesource.com has been configured.
3212
3213 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3214 """
3215 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3216 if host == '.' + self._GOOGLESOURCE:
3217 return True
3218 return False
3219
3220 def _get_git_gerrit_identity_pairs(self):
3221 """Returns map from canonic host to pair of identities (Git, Gerrit).
3222
3223 One of identities might be None, meaning not configured.
3224 """
3225 host_to_identity_pairs = {}
3226 for host, identity, _ in self.get_hosts_with_creds():
3227 canonical = self._canonical_git_googlesource_host(host)
3228 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3229 idx = 0 if canonical == host else 1
3230 pair[idx] = identity
3231 return host_to_identity_pairs
3232
3233 def get_partially_configured_hosts(self):
3234 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003235 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003236 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003237 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003238
3239 def get_conflicting_hosts(self):
3240 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003241 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003242 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003243 if None not in (i1, i2) and i1 != i2)
3244
3245 def get_duplicated_hosts(self):
3246 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003247 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003248
3249 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3250 'chromium.googlesource.com': 'chromium.org',
3251 'chrome-internal.googlesource.com': 'google.com',
3252 }
3253
3254 def get_hosts_with_wrong_identities(self):
3255 """Finds hosts which **likely** reference wrong identities.
3256
3257 Note: skips hosts which have conflicting identities for Git and Gerrit.
3258 """
3259 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003260 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003261 pair = self._get_git_gerrit_identity_pairs().get(host)
3262 if pair and pair[0] == pair[1]:
3263 _, domain = self._parse_identity(pair[0])
3264 if domain != expected:
3265 hosts.add(host)
3266 return hosts
3267
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003268 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003269 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003270 hosts = sorted(hosts)
3271 assert hosts
3272 if extra_column_func is None:
3273 extras = [''] * len(hosts)
3274 else:
3275 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003276 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3277 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003278 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003279 lines.append(tmpl % he)
3280 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003281
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003282 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003283 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003284 yield ('.googlesource.com wildcard record detected',
3285 ['Chrome Infrastructure team recommends to list full host names '
3286 'explicitly.'],
3287 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003288
3289 dups = self.get_duplicated_hosts()
3290 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003291 yield ('The following hosts were defined twice',
3292 self._format_hosts(dups),
3293 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003294
3295 partial = self.get_partially_configured_hosts()
3296 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003297 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3298 'These hosts are missing',
3299 self._format_hosts(partial, lambda host: 'but %s defined' %
3300 self._get_counterpart_host(host)),
3301 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003302
3303 conflicting = self.get_conflicting_hosts()
3304 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003305 yield ('The following Git hosts have differing credentials from their '
3306 'Gerrit counterparts',
3307 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3308 tuple(self._get_git_gerrit_identity_pairs()[host])),
3309 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003310
3311 wrong = self.get_hosts_with_wrong_identities()
3312 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003313 yield ('These hosts likely use wrong identity',
3314 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3315 (self._get_git_gerrit_identity_pairs()[host][0],
3316 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3317 wrong)
3318
3319 def find_and_report_problems(self):
3320 """Returns True if there was at least one problem, else False."""
3321 found = False
3322 bad_hosts = set()
3323 for title, sublines, hosts in self._find_problems():
3324 if not found:
3325 found = True
3326 print('\n\n.gitcookies problem report:\n')
3327 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003328 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003329 if sublines:
3330 print()
3331 print(' %s' % '\n '.join(sublines))
3332 print()
3333
3334 if bad_hosts:
3335 assert found
3336 print(' You can manually remove corresponding lines in your %s file and '
3337 'visit the following URLs with correct account to generate '
3338 'correct credential lines:\n' %
3339 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3340 print(' %s' % '\n '.join(sorted(set(
3341 gerrit_util.CookiesAuthenticator().get_new_password_url(
3342 self._canonical_git_googlesource_host(host))
3343 for host in bad_hosts
3344 ))))
3345 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003346
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003347
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003348@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003349def CMDcreds_check(parser, args):
3350 """Checks credentials and suggests changes."""
3351 _, _ = parser.parse_args(args)
3352
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003353 # Code below checks .gitcookies. Abort if using something else.
3354 authn = gerrit_util.Authenticator.get()
3355 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3356 if isinstance(authn, gerrit_util.GceAuthenticator):
3357 DieWithError(
3358 'This command is not designed for GCE, are you on a bot?\n'
3359 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3360 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003361 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003362 'This command is not designed for bot environment. It checks '
3363 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003364
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003365 checker = _GitCookiesChecker()
3366 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003367
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003368 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003369 checker.print_current_creds(include_netrc=True)
3370
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003371 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003372 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003373 return 0
3374 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003375
3376
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003377@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003378def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003379 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003380 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003381 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003382 _, args = parser.parse_args(args)
3383 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003384 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003385 return RunGit(['config', 'branch.%s.base-url' % branch],
3386 error_ok=False).strip()
3387 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003388 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003389 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3390 error_ok=False).strip()
3391
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003392
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003393def color_for_status(status):
3394 """Maps a Changelist status to color, for CMDstatus and other tools."""
3395 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003396 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003397 'waiting': Fore.BLUE,
3398 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003399 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003400 'lgtm': Fore.GREEN,
3401 'commit': Fore.MAGENTA,
3402 'closed': Fore.CYAN,
3403 'error': Fore.WHITE,
3404 }.get(status, Fore.WHITE)
3405
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003406
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003407def get_cl_statuses(changes, fine_grained, max_processes=None):
3408 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003409
3410 If fine_grained is true, this will fetch CL statuses from the server.
3411 Otherwise, simply indicate if there's a matching url for the given branches.
3412
3413 If max_processes is specified, it is used as the maximum number of processes
3414 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3415 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003416
3417 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003418 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003419 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003420 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003421
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003422 if not fine_grained:
3423 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003424 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003425 for cl in changes:
3426 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003427 return
3428
3429 # First, sort out authentication issues.
3430 logging.debug('ensuring credentials exist')
3431 for cl in changes:
3432 cl.EnsureAuthenticated(force=False, refresh=True)
3433
3434 def fetch(cl):
3435 try:
3436 return (cl, cl.GetStatus())
3437 except:
3438 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003439 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003440 raise
3441
3442 threads_count = len(changes)
3443 if max_processes:
3444 threads_count = max(1, min(threads_count, max_processes))
3445 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3446
Edward Lemur61bf4172020-02-24 23:22:37 +00003447 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003448 fetched_cls = set()
3449 try:
3450 it = pool.imap_unordered(fetch, changes).__iter__()
3451 while True:
3452 try:
3453 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003454 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003455 break
3456 fetched_cls.add(cl)
3457 yield cl, status
3458 finally:
3459 pool.close()
3460
3461 # Add any branches that failed to fetch.
3462 for cl in set(changes) - fetched_cls:
3463 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003464
rmistry@google.com2dd99862015-06-22 12:22:18 +00003465
3466def upload_branch_deps(cl, args):
3467 """Uploads CLs of local branches that are dependents of the current branch.
3468
3469 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003470
3471 test1 -> test2.1 -> test3.1
3472 -> test3.2
3473 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003474
3475 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3476 run on the dependent branches in this order:
3477 test2.1, test3.1, test3.2, test2.2, test3.3
3478
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003479 Note: This function does not rebase your local dependent branches. Use it
3480 when you make a change to the parent branch that will not conflict
3481 with its dependent branches, and you would like their dependencies
3482 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003483 """
3484 if git_common.is_dirty_git_tree('upload-branch-deps'):
3485 return 1
3486
3487 root_branch = cl.GetBranch()
3488 if root_branch is None:
3489 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3490 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003491 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003492 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3493 'patchset dependencies without an uploaded CL.')
3494
3495 branches = RunGit(['for-each-ref',
3496 '--format=%(refname:short) %(upstream:short)',
3497 'refs/heads'])
3498 if not branches:
3499 print('No local branches found.')
3500 return 0
3501
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003502 # Create a dictionary of all local branches to the branches that are
3503 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003504 tracked_to_dependents = collections.defaultdict(list)
3505 for b in branches.splitlines():
3506 tokens = b.split()
3507 if len(tokens) == 2:
3508 branch_name, tracked = tokens
3509 tracked_to_dependents[tracked].append(branch_name)
3510
vapiera7fbd5a2016-06-16 09:17:49 -07003511 print()
3512 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003513 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003514
rmistry@google.com2dd99862015-06-22 12:22:18 +00003515 def traverse_dependents_preorder(branch, padding=''):
3516 dependents_to_process = tracked_to_dependents.get(branch, [])
3517 padding += ' '
3518 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003519 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003520 dependents.append(dependent)
3521 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003522
rmistry@google.com2dd99862015-06-22 12:22:18 +00003523 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003524 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003525
3526 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003527 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003528 return 0
3529
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003530 confirm_or_exit('This command will checkout all dependent branches and run '
3531 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003532
rmistry@google.com2dd99862015-06-22 12:22:18 +00003533 # Record all dependents that failed to upload.
3534 failures = {}
3535 # Go through all dependents, checkout the branch and upload.
3536 try:
3537 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003538 print()
3539 print('--------------------------------------')
3540 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003541 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003542 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003543 try:
3544 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003545 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003546 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003547 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003548 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003549 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003550 finally:
3551 # Swap back to the original root branch.
3552 RunGit(['checkout', '-q', root_branch])
3553
vapiera7fbd5a2016-06-16 09:17:49 -07003554 print()
3555 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003556 for dependent_branch in dependents:
3557 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003558 print(' %s : %s' % (dependent_branch, upload_status))
3559 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003560
3561 return 0
3562
3563
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003564def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3565 """Given a proposed tag name, returns a tag name that is guaranteed to be
3566 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3567 or 'foo-3', and so on."""
3568
3569 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3570 for suffix_num in itertools.count(1):
3571 if suffix_num == 1:
3572 to_check = proposed_tag
3573 else:
3574 to_check = '%s-%d' % (proposed_tag, suffix_num)
3575
3576 if to_check not in existing_tags:
3577 return to_check
3578
3579
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003580@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003581def CMDarchive(parser, args):
3582 """Archives and deletes branches associated with closed changelists."""
3583 parser.add_option(
3584 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003585 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003586 parser.add_option(
3587 '-f', '--force', action='store_true',
3588 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003589 parser.add_option(
3590 '-d', '--dry-run', action='store_true',
3591 help='Skip the branch tagging and removal steps.')
3592 parser.add_option(
3593 '-t', '--notags', action='store_true',
3594 help='Do not tag archived branches. '
3595 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003596
kmarshall3bff56b2016-06-06 18:31:47 -07003597 options, args = parser.parse_args(args)
3598 if args:
3599 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003600
3601 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3602 if not branches:
3603 return 0
3604
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003605 tags = RunGit(['for-each-ref', '--format=%(refname)',
3606 'refs/tags']).splitlines() or []
3607 tags = [t.split('/')[-1] for t in tags]
3608
vapiera7fbd5a2016-06-16 09:17:49 -07003609 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003610 changes = [Changelist(branchref=b)
3611 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003612 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3613 statuses = get_cl_statuses(changes,
3614 fine_grained=True,
3615 max_processes=options.maxjobs)
3616 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003617 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3618 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003619 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003620 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003621 proposal.sort()
3622
3623 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003624 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003625 return 0
3626
Edward Lemur85153282020-02-14 22:06:29 +00003627 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003628
vapiera7fbd5a2016-06-16 09:17:49 -07003629 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003630 if options.notags:
3631 for next_item in proposal:
3632 print(' ' + next_item[0])
3633 else:
3634 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3635 for next_item in proposal:
3636 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003637
kmarshall9249e012016-08-23 12:02:16 -07003638 # Quit now on precondition failure or if instructed by the user, either
3639 # via an interactive prompt or by command line flags.
3640 if options.dry_run:
3641 print('\nNo changes were made (dry run).\n')
3642 return 0
3643 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003644 print('You are currently on a branch \'%s\' which is associated with a '
3645 'closed codereview issue, so archive cannot proceed. Please '
3646 'checkout another branch and run this command again.' %
3647 current_branch)
3648 return 1
kmarshall9249e012016-08-23 12:02:16 -07003649 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003650 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3651 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003652 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003653 return 1
3654
3655 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003656 if not options.notags:
3657 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003658
3659 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3660 # Clean up the tag if we failed to delete the branch.
3661 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003662
vapiera7fbd5a2016-06-16 09:17:49 -07003663 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003664
3665 return 0
3666
3667
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003668@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003669def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003670 """Show status of changelists.
3671
3672 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003673 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003674 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003675 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003676 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003677 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003678 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003679 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003680
3681 Also see 'git cl comments'.
3682 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003683 parser.add_option(
3684 '--no-branch-color',
3685 action='store_true',
3686 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003687 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003688 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003689 parser.add_option('-f', '--fast', action='store_true',
3690 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003691 parser.add_option(
3692 '-j', '--maxjobs', action='store', type=int,
3693 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003694 parser.add_option(
3695 '-i', '--issue', type=int,
3696 help='Operate on this issue instead of the current branch\'s implicit '
3697 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003698 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003699 if args:
3700 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003701
iannuccie53c9352016-08-17 14:40:40 -07003702 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003703 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003704
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003705 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003706 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003707 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003708 if cl.GetIssue():
3709 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003710 elif options.field == 'id':
3711 issueid = cl.GetIssue()
3712 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003713 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003714 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003715 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003716 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003717 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003718 elif options.field == 'status':
3719 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003720 elif options.field == 'url':
3721 url = cl.GetIssueURL()
3722 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003723 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003724 return 0
3725
3726 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3727 if not branches:
3728 print('No local branch found.')
3729 return 0
3730
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003731 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003732 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003733 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003734 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003735 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003736 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003737 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003738
Edward Lemur85153282020-02-14 22:06:29 +00003739 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003740
3741 def FormatBranchName(branch, colorize=False):
3742 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3743 an asterisk when it is the current branch."""
3744
3745 asterisk = ""
3746 color = Fore.RESET
3747 if branch == current_branch:
3748 asterisk = "* "
3749 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003750 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003751
3752 if colorize:
3753 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003754 return asterisk + branch_name
3755
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003756 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003757
3758 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003759 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3760 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003761 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003762 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003763 branch_statuses[c.GetBranch()] = status
3764 status = branch_statuses.pop(branch)
3765 url = cl.GetIssueURL()
3766 if url and (not status or status == 'error'):
3767 # The issue probably doesn't exist anymore.
3768 url += ' (broken)'
3769
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003770 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003771 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003772 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003773 color = ''
3774 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003775 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003776
Alan Cuttera3be9a52019-03-04 18:50:33 +00003777 branch_display = FormatBranchName(branch)
3778 padding = ' ' * (alignment - len(branch_display))
3779 if not options.no_branch_color:
3780 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003781
Alan Cuttera3be9a52019-03-04 18:50:33 +00003782 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3783 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003784
vapiera7fbd5a2016-06-16 09:17:49 -07003785 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003786 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003787 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003788 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003789 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003790 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003791 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003792 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003793 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003794 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003795 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003796 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003797 return 0
3798
3799
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003800def colorize_CMDstatus_doc():
3801 """To be called once in main() to add colors to git cl status help."""
3802 colors = [i for i in dir(Fore) if i[0].isupper()]
3803
3804 def colorize_line(line):
3805 for color in colors:
3806 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003807 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003808 indent = len(line) - len(line.lstrip(' ')) + 1
3809 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3810 return line
3811
3812 lines = CMDstatus.__doc__.splitlines()
3813 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3814
3815
phajdan.jre328cf92016-08-22 04:12:17 -07003816def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003817 if path == '-':
3818 json.dump(contents, sys.stdout)
3819 else:
3820 with open(path, 'w') as f:
3821 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003822
3823
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003824@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003825@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003826def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003827 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003828
3829 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003830 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003831 parser.add_option('-r', '--reverse', action='store_true',
3832 help='Lookup the branch(es) for the specified issues. If '
3833 'no issues are specified, all branches with mapped '
3834 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003835 parser.add_option('--json',
3836 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003837 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003838
dnj@chromium.org406c4402015-03-03 17:22:28 +00003839 if options.reverse:
3840 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003841 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003842 # Reverse issue lookup.
3843 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003844
3845 git_config = {}
3846 for config in RunGit(['config', '--get-regexp',
3847 r'branch\..*issue']).splitlines():
3848 name, _space, val = config.partition(' ')
3849 git_config[name] = val
3850
dnj@chromium.org406c4402015-03-03 17:22:28 +00003851 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003852 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003853 Changelist.IssueConfigKey())
3854 issue = git_config.get(config_key)
3855 if issue:
3856 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003857 if not args:
3858 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003859 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003860 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003861 try:
3862 issue_num = int(issue)
3863 except ValueError:
3864 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003865 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003866 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003867 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003868 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003869 if options.json:
3870 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003871 return 0
3872
3873 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003874 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003875 if not issue.valid:
3876 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3877 'or no argument to list it.\n'
3878 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003879 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003880 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003881 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003882 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003883 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3884 if options.json:
3885 write_json(options.json, {
3886 'issue': cl.GetIssue(),
3887 'issue_url': cl.GetIssueURL(),
3888 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003889 return 0
3890
3891
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003892@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003893def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003894 """Shows or posts review comments for any changelist."""
3895 parser.add_option('-a', '--add-comment', dest='comment',
3896 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003897 parser.add_option('-p', '--publish', action='store_true',
3898 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003899 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003900 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003901 parser.add_option('-m', '--machine-readable', dest='readable',
3902 action='store_false', default=True,
3903 help='output comments in a format compatible with '
3904 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003905 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003906 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003907 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003908
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003909 issue = None
3910 if options.issue:
3911 try:
3912 issue = int(options.issue)
3913 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003914 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003915
Edward Lemur934836a2019-09-09 20:16:54 +00003916 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003917
3918 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003919 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003920 return 0
3921
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003922 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3923 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003924 for comment in summary:
3925 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003926 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003927 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003928 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003929 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003930 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003931 elif comment.autogenerated:
3932 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003933 else:
3934 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003935 print('\n%s%s %s%s\n%s' % (
3936 color,
3937 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3938 comment.sender,
3939 Fore.RESET,
3940 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3941
smut@google.comc85ac942015-09-15 16:34:43 +00003942 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003943 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003944 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003945 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3946 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003947 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003948 return 0
3949
3950
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003951@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003952@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003953def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003954 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003955 parser.add_option('-d', '--display', action='store_true',
3956 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003957 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003958 help='New description to set for this issue (- for stdin, '
3959 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003960 parser.add_option('-f', '--force', action='store_true',
3961 help='Delete any unpublished Gerrit edits for this issue '
3962 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003963
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003964 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003965
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003966 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003967 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003968 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003969 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003970 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003971
Edward Lemur934836a2019-09-09 20:16:54 +00003972 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003973 if target_issue_arg:
3974 kwargs['issue'] = target_issue_arg.issue
3975 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003976
3977 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003978 if not cl.GetIssue():
3979 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003980
Edward Lemur678a6842019-10-03 22:25:05 +00003981 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003982 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003983
Edward Lemur6c6827c2020-02-06 21:15:18 +00003984 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003985
smut@google.com34fb6b12015-07-13 20:03:26 +00003986 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003987 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003988 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003989
3990 if options.new_description:
3991 text = options.new_description
3992 if text == '-':
3993 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003994 elif text == '+':
3995 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00003996 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003997
3998 description.set_description(text)
3999 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004000 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004001 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004002 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004003 return 0
4004
4005
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004006@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004007def CMDlint(parser, args):
4008 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004009 parser.add_option('--filter', action='append', metavar='-x,+y',
4010 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004011 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004012
4013 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004014 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004015 try:
4016 import cpplint
4017 import cpplint_chromium
4018 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004019 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004020 return 1
4021
4022 # Change the current working directory before calling lint so that it
4023 # shows the correct base.
4024 previous_cwd = os.getcwd()
4025 os.chdir(settings.GetRoot())
4026 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004027 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004028 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004029 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004030 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004031 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004032 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004033
4034 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004035 command = args + files
4036 if options.filter:
4037 command = ['--filter=' + ','.join(options.filter)] + command
4038 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004039
4040 white_regex = re.compile(settings.GetLintRegex())
4041 black_regex = re.compile(settings.GetLintIgnoreRegex())
4042 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4043 for filename in filenames:
4044 if white_regex.match(filename):
4045 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004046 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004047 else:
4048 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4049 extra_check_functions)
4050 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004051 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004052 finally:
4053 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004054 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004055 if cpplint._cpplint_state.error_count != 0:
4056 return 1
4057 return 0
4058
4059
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004060@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004061def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004062 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004063 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004064 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004065 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004066 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004067 parser.add_option('--all', action='store_true',
4068 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004069 parser.add_option('--parallel', action='store_true',
4070 help='Run all tests specified by input_api.RunTests in all '
4071 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004072 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004073
sbc@chromium.org71437c02015-04-09 19:29:40 +00004074 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004075 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004076 return 1
4077
Edward Lemur934836a2019-09-09 20:16:54 +00004078 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004079 if args:
4080 base_branch = args[0]
4081 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004082 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004083 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004084
Aaron Gable8076c282017-11-29 14:39:41 -08004085 if options.all:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004086 base_change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004087 files = [('M', f) for f in base_change.AllFiles()]
4088 change = presubmit_support.GitChange(
4089 base_change.Name(),
4090 base_change.FullDescriptionText(),
4091 base_change.RepositoryRoot(),
4092 files,
4093 base_change.issue,
4094 base_change.patchset,
4095 base_change.author_email,
4096 base_change._upstream)
4097 else:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004098 change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004099
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004100 cl.RunHook(
4101 committing=not options.upload,
4102 may_prompt=False,
4103 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004104 change=change,
4105 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004106 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004107
4108
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004109def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004110 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004111
4112 Works the same way as
4113 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4114 but can be called on demand on all platforms.
4115
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004116 The basic idea is to generate git hash of a state of the tree, original
4117 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004118 """
4119 lines = []
4120 tree_hash = RunGitSilent(['write-tree'])
4121 lines.append('tree %s' % tree_hash.strip())
4122 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4123 if code == 0:
4124 lines.append('parent %s' % parent.strip())
4125 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4126 lines.append('author %s' % author.strip())
4127 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4128 lines.append('committer %s' % committer.strip())
4129 lines.append('')
4130 # Note: Gerrit's commit-hook actually cleans message of some lines and
4131 # whitespace. This code is not doing this, but it clearly won't decrease
4132 # entropy.
4133 lines.append(message)
4134 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004135 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004136 return 'I%s' % change_hash.strip()
4137
4138
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004139def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004140 """Computes the remote branch ref to use for the CL.
4141
4142 Args:
4143 remote (str): The git remote for the CL.
4144 remote_branch (str): The git remote branch for the CL.
4145 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004146 """
4147 if not (remote and remote_branch):
4148 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004149
wittman@chromium.org455dc922015-01-26 20:15:50 +00004150 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004151 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004152 # refs, which are then translated into the remote full symbolic refs
4153 # below.
4154 if '/' not in target_branch:
4155 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4156 else:
4157 prefix_replacements = (
4158 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4159 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4160 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4161 )
4162 match = None
4163 for regex, replacement in prefix_replacements:
4164 match = re.search(regex, target_branch)
4165 if match:
4166 remote_branch = target_branch.replace(match.group(0), replacement)
4167 break
4168 if not match:
4169 # This is a branch path but not one we recognize; use as-is.
4170 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004171 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4172 # Handle the refs that need to land in different refs.
4173 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004174
wittman@chromium.org455dc922015-01-26 20:15:50 +00004175 # Create the true path to the remote branch.
4176 # Does the following translation:
4177 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4178 # * refs/remotes/origin/master -> refs/heads/master
4179 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4180 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4181 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4182 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4183 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4184 'refs/heads/')
4185 elif remote_branch.startswith('refs/remotes/branch-heads'):
4186 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004187
wittman@chromium.org455dc922015-01-26 20:15:50 +00004188 return remote_branch
4189
4190
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004191def cleanup_list(l):
4192 """Fixes a list so that comma separated items are put as individual items.
4193
4194 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4195 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4196 """
4197 items = sum((i.split(',') for i in l), [])
4198 stripped_items = (i.strip() for i in items)
4199 return sorted(filter(None, stripped_items))
4200
4201
Aaron Gable4db38df2017-11-03 14:59:07 -07004202@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004203@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004204def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004205 """Uploads the current changelist to codereview.
4206
4207 Can skip dependency patchset uploads for a branch by running:
4208 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004209 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004210 git config --unset branch.branch_name.skip-deps-uploads
4211 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004212
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004213 If the name of the checked out branch starts with "bug-" or "fix-" followed
4214 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004215 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004216
4217 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004218 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004219 [git-cl] add support for hashtags
4220 Foo bar: implement foo
4221 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004222 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004223 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4224 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004225 parser.add_option('--bypass-watchlists', action='store_true',
4226 dest='bypass_watchlists',
4227 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004228 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004229 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004230 parser.add_option('--message', '-m', dest='message',
4231 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004232 parser.add_option('-b', '--bug',
4233 help='pre-populate the bug number(s) for this issue. '
4234 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004235 parser.add_option('--message-file', dest='message_file',
4236 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004237 parser.add_option('--title', '-t', dest='title',
4238 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004239 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004240 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004241 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004242 parser.add_option('--tbrs',
4243 action='append', default=[],
4244 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004245 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004246 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004247 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004248 parser.add_option('--hashtag', dest='hashtags',
4249 action='append', default=[],
4250 help=('Gerrit hashtag for new CL; '
4251 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004252 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004253 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004254 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004255 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004256 metavar='TARGET',
4257 help='Apply CL to remote ref TARGET. ' +
4258 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004259 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004260 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004261 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004262 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004263 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004264 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004265 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4266 const='TBR', help='add a set of OWNERS to TBR')
4267 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4268 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004269 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004270 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004271 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004272 'implies --send-mail')
4273 parser.add_option('-d', '--cq-dry-run',
4274 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004275 help='Send the patchset to do a CQ dry run right after '
4276 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004277 parser.add_option('--preserve-tryjobs', action='store_true',
4278 help='instruct the CQ to let tryjobs running even after '
4279 'new patchsets are uploaded instead of canceling '
4280 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004281 parser.add_option('--dependencies', action='store_true',
4282 help='Uploads CLs of all the local branches that depend on '
4283 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004284 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4285 help='Sends your change to the CQ after an approval. Only '
4286 'works on repos that have the Auto-Submit label '
4287 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004288 parser.add_option('--parallel', action='store_true',
4289 help='Run all tests specified by input_api.RunTests in all '
4290 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004291 parser.add_option('--no-autocc', action='store_true',
4292 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004293 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004294 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004295 parser.add_option('-R', '--retry-failed', action='store_true',
4296 help='Retry failed tryjobs from old patchset immediately '
4297 'after uploading new patchset. Cannot be used with '
4298 '--use-commit-queue or --cq-dry-run.')
4299 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4300 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004301 parser.add_option('--fixed', '-x',
4302 help='List of bugs that will be commented on and marked '
4303 'fixed (pre-populates "Fixed:" tag). Same format as '
4304 '-b option / "Bug:" tag. If fixing several issues, '
4305 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004306 parser.add_option('--edit-description', action='store_true', default=False,
4307 help='Modify description before upload. Cannot be used '
4308 'with --force. It is a noop when --no-squash is set '
4309 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004310
rmistry@google.com2dd99862015-06-22 12:22:18 +00004311 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004312 (options, args) = parser.parse_args(args)
4313
sbc@chromium.org71437c02015-04-09 19:29:40 +00004314 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004315 return 1
4316
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004317 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004318 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004319 options.cc = cleanup_list(options.cc)
4320
Josipe827b0f2020-01-30 00:07:20 +00004321 if options.edit_description and options.force:
4322 parser.error('Only one of --force and --edit-description allowed')
4323
tandriib80458a2016-06-23 12:20:07 -07004324 if options.message_file:
4325 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004326 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004327 options.message = gclient_utils.FileRead(options.message_file)
4328 options.message_file = None
4329
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004330 if ([options.cq_dry_run,
4331 options.use_commit_queue,
4332 options.retry_failed].count(True) > 1):
4333 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4334 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004335
Aaron Gableedbc4132017-09-11 13:22:28 -07004336 if options.use_commit_queue:
4337 options.send_mail = True
4338
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004339 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4340 settings.GetIsGerrit()
4341
Edward Lemur934836a2019-09-09 20:16:54 +00004342 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004343 # Warm change details cache now to avoid RPCs later, reducing latency for
4344 # developers.
4345 if cl.GetIssue():
4346 cl._GetChangeDetail(
4347 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4348
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004349 if options.retry_failed and not cl.GetIssue():
4350 print('No previous patchsets, so --retry-failed has no effect.')
4351 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004352
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004353 # cl.GetMostRecentPatchset uses cached information, and can return the last
4354 # patchset before upload. Calling it here makes it clear that it's the
4355 # last patchset before upload. Note that GetMostRecentPatchset will fail
4356 # if no CL has been uploaded yet.
4357 if options.retry_failed:
4358 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004359
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004360 ret = cl.CMDUpload(options, args, orig_args)
4361
4362 if options.retry_failed:
4363 if ret != 0:
4364 print('Upload failed, so --retry-failed has no effect.')
4365 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004366 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004367 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004368 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004369 if len(buckets) == 0:
4370 print('No failed tryjobs, so --retry-failed has no effect.')
4371 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004372 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004373
4374 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004375
4376
Francois Dorayd42c6812017-05-30 15:10:20 -04004377@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004378@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004379def CMDsplit(parser, args):
4380 """Splits a branch into smaller branches and uploads CLs.
4381
4382 Creates a branch and uploads a CL for each group of files modified in the
4383 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004384 comment, '$directory' is replaced with the directory containing the changes
4385 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4386 sending out, and '$num_cls' is replaced with the total number of CLs that
4387 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004388 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004389 parser.add_option('-d', '--description', dest='description_file',
4390 help='A text file containing a CL description in which '
4391 '$directory will be replaced by each CL\'s directory.')
4392 parser.add_option('-c', '--comment', dest='comment_file',
4393 help='A text file containing a CL comment.')
4394 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004395 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004396 help='List the files and reviewers for each CL that would '
4397 'be created, but don\'t create branches or CLs.')
4398 parser.add_option('--cq-dry-run', action='store_true',
4399 help='If set, will do a cq dry run for each uploaded CL. '
4400 'Please be careful when doing this; more than ~10 CLs '
4401 'has the potential to overload our build '
4402 'infrastructure. Try to upload these not during high '
4403 'load times (usually 11-3 Mountain View time). Email '
4404 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004405 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4406 default=True,
4407 help='Sends your change to the CQ after an approval. Only '
4408 'works on repos that have the Auto-Submit label '
4409 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004410 options, _ = parser.parse_args(args)
4411
4412 if not options.description_file:
4413 parser.error('No --description flag specified.')
4414
4415 def WrappedCMDupload(args):
4416 return CMDupload(OptionParser(), args)
4417
4418 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004419 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004420 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004421
4422
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004423@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004424@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004425def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004426 """DEPRECATED: Used to commit the current changelist via git-svn."""
4427 message = ('git-cl no longer supports committing to SVN repositories via '
4428 'git-svn. You probably want to use `git cl land` instead.')
4429 print(message)
4430 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004431
4432
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004433@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004434@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004435def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004436 """Commits the current changelist via git.
4437
4438 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4439 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004440 """
4441 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4442 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004443 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004444 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004445 parser.add_option('--parallel', action='store_true',
4446 help='Run all tests specified by input_api.RunTests in all '
4447 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004448 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004449
Edward Lemur934836a2019-09-09 20:16:54 +00004450 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004451
Robert Iannucci2e73d432018-03-14 01:10:47 -07004452 if not cl.GetIssue():
4453 DieWithError('You must upload the change first to Gerrit.\n'
4454 ' If you would rather have `git cl land` upload '
4455 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004456 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004457 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004458
4459
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004460@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004461@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004462def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004463 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004464 parser.add_option('-b', dest='newbranch',
4465 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004466 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004467 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004468 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004469 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004470
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004471 group = optparse.OptionGroup(
4472 parser,
4473 'Options for continuing work on the current issue uploaded from a '
4474 'different clone (e.g. different machine). Must be used independently '
4475 'from the other options. No issue number should be specified, and the '
4476 'branch must have an issue number associated with it')
4477 group.add_option('--reapply', action='store_true', dest='reapply',
4478 help='Reset the branch and reapply the issue.\n'
4479 'CAUTION: This will undo any local changes in this '
4480 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004481
4482 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004483 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004484 parser.add_option_group(group)
4485
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004486 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004487
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004488 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004489 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004490 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004491 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004492 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004493
Edward Lemur934836a2019-09-09 20:16:54 +00004494 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004495 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004496 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004497
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004498 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004499 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004500 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004501
4502 RunGit(['reset', '--hard', upstream])
4503 if options.pull:
4504 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004505
Edward Lemur678a6842019-10-03 22:25:05 +00004506 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4507 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004508
4509 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004510 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004511
Edward Lemurf38bc172019-09-03 21:02:13 +00004512 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004513 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004514 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004515
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004516 # We don't want uncommitted changes mixed up with the patch.
4517 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004518 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004519
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004520 if options.newbranch:
4521 if options.force:
4522 RunGit(['branch', '-D', options.newbranch],
4523 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004524 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004525
Edward Lemur678a6842019-10-03 22:25:05 +00004526 cl = Changelist(
4527 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004528
Edward Lemur678a6842019-10-03 22:25:05 +00004529 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004530 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004531
Edward Lemurf38bc172019-09-03 21:02:13 +00004532 return cl.CMDPatchWithParsedIssue(
4533 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004534
4535
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004536def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004537 """Fetches the tree status and returns either 'open', 'closed',
4538 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004539 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004540 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004541 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004542 if status.find('closed') != -1 or status == '0':
4543 return 'closed'
4544 elif status.find('open') != -1 or status == '1':
4545 return 'open'
4546 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004547 return 'unset'
4548
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004549
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004550def GetTreeStatusReason():
4551 """Fetches the tree status from a json url and returns the message
4552 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004553 url = settings.GetTreeStatusUrl()
4554 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004555 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004556 status = json.loads(connection.read())
4557 connection.close()
4558 return status['message']
4559
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004560
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004561@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004562def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004563 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004564 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004565 status = GetTreeStatus()
4566 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004567 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004568 return 2
4569
vapiera7fbd5a2016-06-16 09:17:49 -07004570 print('The tree is %s' % status)
4571 print()
4572 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004573 if status != 'open':
4574 return 1
4575 return 0
4576
4577
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004578@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004579def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004580 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4581 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004582 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004583 '-b', '--bot', action='append',
4584 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4585 'times to specify multiple builders. ex: '
4586 '"-b win_rel -b win_layout". See '
4587 'the try server waterfall for the builders name and the tests '
4588 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004589 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004590 '-B', '--bucket', default='',
4591 help=('Buildbucket bucket to send the try requests.'))
4592 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004593 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004594 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004595 'be determined by the try recipe that builder runs, which usually '
4596 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004597 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004598 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004599 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004600 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004601 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004602 '--category', default='git_cl_try', help='Specify custom build category.')
4603 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004604 '--project',
4605 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004606 'in recipe to determine to which repository or directory to '
4607 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004608 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004609 '-p', '--property', dest='properties', action='append', default=[],
4610 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004611 'key2=value2 etc. The value will be treated as '
4612 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004613 'NOTE: using this may make your tryjob not usable for CQ, '
4614 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004615 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004616 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4617 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004618 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004619 parser.add_option(
4620 '-R', '--retry-failed', action='store_true', default=False,
4621 help='Retry failed jobs from the latest set of tryjobs. '
4622 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004623 parser.add_option(
4624 '-i', '--issue', type=int,
4625 help='Operate on this issue instead of the current branch\'s implicit '
4626 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004627 options, args = parser.parse_args(args)
4628
machenbach@chromium.org45453142015-09-15 08:45:22 +00004629 # Make sure that all properties are prop=value pairs.
4630 bad_params = [x for x in options.properties if '=' not in x]
4631 if bad_params:
4632 parser.error('Got properties with missing "=": %s' % bad_params)
4633
maruel@chromium.org15192402012-09-06 12:38:29 +00004634 if args:
4635 parser.error('Unknown arguments: %s' % args)
4636
Edward Lemur934836a2019-09-09 20:16:54 +00004637 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004638 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004639 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004640
Edward Lemurf38bc172019-09-03 21:02:13 +00004641 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004642 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004643
tandriie113dfd2016-10-11 10:20:12 -07004644 error_message = cl.CannotTriggerTryJobReason()
4645 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004646 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004647
Quinten Yearsley983111f2019-09-26 17:18:48 +00004648 if options.retry_failed:
4649 if options.bot or options.bucket:
4650 print('ERROR: The option --retry-failed is not compatible with '
4651 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4652 return 1
4653 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004654 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004655 if options.verbose:
4656 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004657 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004658 if not buckets:
4659 print('There are no failed jobs in the latest set of jobs '
4660 '(patchset #%d), doing nothing.' % patchset)
4661 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004662 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004663 if num_builders > 10:
4664 confirm_or_exit('There are %d builders with failed builds.'
4665 % num_builders, action='continue')
4666 else:
4667 buckets = _get_bucket_map(cl, options, parser)
4668 if buckets and any(b.startswith('master.') for b in buckets):
4669 print('ERROR: Buildbot masters are not supported.')
4670 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004671
qyearsleydd49f942016-10-28 11:57:22 -07004672 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4673 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004674 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004675 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004676 print('git cl try with no bots now defaults to CQ dry run.')
4677 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4678 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004679
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004680 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004681 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004682 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004683 'of bot requires an initial job from a parent (usually a builder). '
4684 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004685 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004686 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004687
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004688 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004689 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004690 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004691 except BuildbucketResponseException as ex:
4692 print('ERROR: %s' % ex)
4693 return 1
4694 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004695
4696
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004697@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004698def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004699 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004700 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004701 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004702 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004703 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004704 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004705 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004706 '--color', action='store_true', default=setup_color.IS_TTY,
4707 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004708 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004709 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4710 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004711 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004712 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004713 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004714 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004715 parser.add_option(
4716 '-i', '--issue', type=int,
4717 help='Operate on this issue instead of the current branch\'s implicit '
4718 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004719 options, args = parser.parse_args(args)
4720 if args:
4721 parser.error('Unrecognized args: %s' % ' '.join(args))
4722
Edward Lemur934836a2019-09-09 20:16:54 +00004723 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004724 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004725 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004726
tandrii221ab252016-10-06 08:12:04 -07004727 patchset = options.patchset
4728 if not patchset:
4729 patchset = cl.GetMostRecentPatchset()
4730 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004731 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004732 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004733 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004734 cl.GetIssue())
4735
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004736 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004737 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004738 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004739 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004740 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004741 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004742 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004743 else:
4744 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004745 return 0
4746
4747
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004748@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004749@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004750def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004751 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004752 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004753 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004754 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004755
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004756 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004757 if args:
4758 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004759 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004760 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004761 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004762 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004763
4764 # Clear configured merge-base, if there is one.
4765 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004766 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004767 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004768 return 0
4769
4770
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004771@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004772def CMDweb(parser, args):
4773 """Opens the current CL in the web browser."""
4774 _, args = parser.parse_args(args)
4775 if args:
4776 parser.error('Unrecognized args: %s' % ' '.join(args))
4777
4778 issue_url = Changelist().GetIssueURL()
4779 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004780 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004781 return 1
4782
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004783 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004784 # allows us to hide the "Created new window in existing browser session."
4785 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004786 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004787 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004788 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004789 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004790 os.open(os.devnull, os.O_RDWR)
4791 try:
4792 webbrowser.open(issue_url)
4793 finally:
4794 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004795 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004796 return 0
4797
4798
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004799@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004800def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004801 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004802 parser.add_option('-d', '--dry-run', action='store_true',
4803 help='trigger in dry run mode')
4804 parser.add_option('-c', '--clear', action='store_true',
4805 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004806 parser.add_option(
4807 '-i', '--issue', type=int,
4808 help='Operate on this issue instead of the current branch\'s implicit '
4809 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004810 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004811 if args:
4812 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004813 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004814 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004815
Edward Lemur934836a2019-09-09 20:16:54 +00004816 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004817 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004818 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004819 elif options.dry_run:
4820 state = _CQState.DRY_RUN
4821 else:
4822 state = _CQState.COMMIT
4823 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004824 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004825 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004826 return 0
4827
4828
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004829@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004830def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004831 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004832 parser.add_option(
4833 '-i', '--issue', type=int,
4834 help='Operate on this issue instead of the current branch\'s implicit '
4835 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004836 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004837 if args:
4838 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004839 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004840 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004841 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004842 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004843 cl.CloseIssue()
4844 return 0
4845
4846
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004847@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004848def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004849 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004850 parser.add_option(
4851 '--stat',
4852 action='store_true',
4853 dest='stat',
4854 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004855 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004856 if args:
4857 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004858
Edward Lemur934836a2019-09-09 20:16:54 +00004859 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004860 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004861 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004862 if not issue:
4863 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004864
Aaron Gablea718c3e2017-08-28 17:47:28 -07004865 base = cl._GitGetBranchConfigValue('last-upload-hash')
4866 if not base:
4867 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4868 if not base:
4869 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4870 revision_info = detail['revisions'][detail['current_revision']]
4871 fetch_info = revision_info['fetch']['http']
4872 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4873 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004874
Aaron Gablea718c3e2017-08-28 17:47:28 -07004875 cmd = ['git', 'diff']
4876 if options.stat:
4877 cmd.append('--stat')
4878 cmd.append(base)
4879 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004880
4881 return 0
4882
4883
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004884@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004885def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004886 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004887 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004888 '--ignore-current',
4889 action='store_true',
4890 help='Ignore the CL\'s current reviewers and start from scratch.')
4891 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004892 '--ignore-self',
4893 action='store_true',
4894 help='Do not consider CL\'s author as an owners.')
4895 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004896 '--no-color',
4897 action='store_true',
4898 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004899 parser.add_option(
4900 '--batch',
4901 action='store_true',
4902 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004903 # TODO: Consider moving this to another command, since other
4904 # git-cl owners commands deal with owners for a given CL.
4905 parser.add_option(
4906 '--show-all',
4907 action='store_true',
4908 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004909 options, args = parser.parse_args(args)
4910
4911 author = RunGit(['config', 'user.email']).strip() or None
4912
Edward Lemur934836a2019-09-09 20:16:54 +00004913 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004914
Yang Guo6e269a02019-06-26 11:17:02 +00004915 if options.show_all:
4916 for arg in args:
4917 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004918 database = owners.Database(settings.GetRoot(), file, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004919 database.load_data_needed_for([arg])
4920 print('Owners for %s:' % arg)
4921 for owner in sorted(database.all_possible_owners([arg], None)):
4922 print(' - %s' % owner)
4923 return 0
4924
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004925 if args:
4926 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004927 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004928 base_branch = args[0]
4929 else:
4930 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004931 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004932
Edward Lemur7f6dec02020-02-06 20:23:58 +00004933 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004934 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4935
4936 if options.batch:
4937 db = owners.Database(change.RepositoryRoot(), file, os.path)
4938 print('\n'.join(db.reviewers_for(affected_files, author)))
4939 return 0
4940
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004941 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004942 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004943 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004944 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004945 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004946 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004947 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004948 override_files=change.OriginalOwnersFiles(),
4949 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004950
4951
Aiden Bennerc08566e2018-10-03 17:52:42 +00004952def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004953 """Generates a diff command."""
4954 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004955 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4956
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004957 if allow_prefix:
4958 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4959 # case that diff.noprefix is set in the user's git config.
4960 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4961 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004962 diff_cmd += ['--no-prefix']
4963
4964 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004965
4966 if args:
4967 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004968 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004969 diff_cmd.append(arg)
4970 else:
4971 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004972
4973 return diff_cmd
4974
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004975
Jamie Madill5e96ad12020-01-13 16:08:35 +00004976def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4977 """Runs clang-format-diff and sets a return value if necessary."""
4978
4979 if not clang_diff_files:
4980 return 0
4981
4982 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4983 # formatted. This is used to block during the presubmit.
4984 return_value = 0
4985
4986 # Locate the clang-format binary in the checkout
4987 try:
4988 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4989 except clang_format.NotFoundError as e:
4990 DieWithError(e)
4991
4992 if opts.full or settings.GetFormatFullByDefault():
4993 cmd = [clang_format_tool]
4994 if not opts.dry_run and not opts.diff:
4995 cmd.append('-i')
4996 if opts.dry_run:
4997 for diff_file in clang_diff_files:
4998 with open(diff_file, 'r') as myfile:
4999 code = myfile.read().replace('\r\n', '\n')
5000 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5001 stdout = stdout.replace('\r\n', '\n')
5002 if opts.diff:
5003 sys.stdout.write(stdout)
5004 if code != stdout:
5005 return_value = 2
5006 else:
5007 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5008 if opts.diff:
5009 sys.stdout.write(stdout)
5010 else:
5011 env = os.environ.copy()
5012 env['PATH'] = str(os.path.dirname(clang_format_tool))
5013 try:
5014 script = clang_format.FindClangFormatScriptInChromiumTree(
5015 'clang-format-diff.py')
5016 except clang_format.NotFoundError as e:
5017 DieWithError(e)
5018
5019 cmd = [sys.executable, script, '-p0']
5020 if not opts.dry_run and not opts.diff:
5021 cmd.append('-i')
5022
5023 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5024 diff_output = RunGit(diff_cmd)
5025
5026 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5027 if opts.diff:
5028 sys.stdout.write(stdout)
5029 if opts.dry_run and len(stdout) > 0:
5030 return_value = 2
5031
5032 return return_value
5033
5034
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005035def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005036 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005037 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005038
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005039
enne@chromium.org555cfe42014-01-29 18:21:39 +00005040@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005041@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005042def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005043 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005044 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005045 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005046 parser.add_option('--full', action='store_true',
5047 help='Reformat the full content of all touched files')
5048 parser.add_option('--dry-run', action='store_true',
5049 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005050 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005051 '--no-clang-format',
5052 dest='clang_format',
5053 action='store_false',
5054 default=True,
5055 help='Disables formatting of various file types using clang-format.')
5056 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005057 '--python',
5058 action='store_true',
5059 default=None,
5060 help='Enables python formatting on all python files.')
5061 parser.add_option(
5062 '--no-python',
5063 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005064 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005065 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005066 'If neither --python or --no-python are set, python files that have a '
5067 '.style.yapf file in an ancestor directory will be formatted. '
5068 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005069 parser.add_option(
5070 '--js',
5071 action='store_true',
5072 help='Format javascript code with clang-format. '
5073 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005074 parser.add_option('--diff', action='store_true',
5075 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005076 parser.add_option('--presubmit', action='store_true',
5077 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005078 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005079
Garrett Beaty91a6f332020-01-06 16:57:24 +00005080 if opts.python is not None and opts.no_python:
5081 raise parser.error('Cannot set both --python and --no-python')
5082 if opts.no_python:
5083 opts.python = False
5084
Daniel Chengc55eecf2016-12-30 03:11:02 -08005085 # Normalize any remaining args against the current path, so paths relative to
5086 # the current directory are still resolved as expected.
5087 args = [os.path.join(os.getcwd(), arg) for arg in args]
5088
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005089 # git diff generates paths against the root of the repository. Change
5090 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005091 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005092 if rel_base_path:
5093 os.chdir(rel_base_path)
5094
digit@chromium.org29e47272013-05-17 17:01:46 +00005095 # Grab the merge-base commit, i.e. the upstream commit of the current
5096 # branch when it was created or the last time it was rebased. This is
5097 # to cover the case where the user may have called "git fetch origin",
5098 # moving the origin branch to a newer commit, but hasn't rebased yet.
5099 upstream_commit = None
5100 cl = Changelist()
5101 upstream_branch = cl.GetUpstreamBranch()
5102 if upstream_branch:
5103 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5104 upstream_commit = upstream_commit.strip()
5105
5106 if not upstream_commit:
5107 DieWithError('Could not find base commit for this branch. '
5108 'Are you in detached state?')
5109
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005110 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5111 diff_output = RunGit(changed_files_cmd)
5112 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005113 # Filter out files deleted by this CL
5114 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005115
Andreas Haas417d89c2020-02-06 10:24:27 +00005116 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005117 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005118
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005119 clang_diff_files = []
5120 if opts.clang_format:
5121 clang_diff_files = [
5122 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5123 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005124 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5125 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005126 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005127
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005128 top_dir = os.path.normpath(
5129 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5130
Jamie Madill5e96ad12020-01-13 16:08:35 +00005131 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5132 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005133
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005134 # Similar code to above, but using yapf on .py files rather than clang-format
5135 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005136 py_explicitly_disabled = opts.python is not None and not opts.python
5137 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005138 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5139 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5140 if sys.platform.startswith('win'):
5141 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005142
Aiden Bennerc08566e2018-10-03 17:52:42 +00005143 # Used for caching.
5144 yapf_configs = {}
5145 for f in python_diff_files:
5146 # Find the yapf style config for the current file, defaults to depot
5147 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005148 _FindYapfConfigFile(f, yapf_configs, top_dir)
5149
5150 # Turn on python formatting by default if a yapf config is specified.
5151 # This breaks in the case of this repo though since the specified
5152 # style file is also the global default.
5153 if opts.python is None:
5154 filtered_py_files = []
5155 for f in python_diff_files:
5156 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5157 filtered_py_files.append(f)
5158 else:
5159 filtered_py_files = python_diff_files
5160
5161 # Note: yapf still seems to fix indentation of the entire file
5162 # even if line ranges are specified.
5163 # See https://github.com/google/yapf/issues/499
5164 if not opts.full and filtered_py_files:
5165 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5166
Brian Sheedyb4307d52019-12-02 19:18:17 +00005167 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5168 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5169 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005170
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005171 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005172 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5173 # Default to pep8 if not .style.yapf is found.
5174 if not yapf_style:
5175 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005176
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005177 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005178
5179 has_formattable_lines = False
5180 if not opts.full:
5181 # Only run yapf over changed line ranges.
5182 for diff_start, diff_len in py_line_diffs[f]:
5183 diff_end = diff_start + diff_len - 1
5184 # Yapf errors out if diff_end < diff_start but this
5185 # is a valid line range diff for a removal.
5186 if diff_end >= diff_start:
5187 has_formattable_lines = True
5188 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5189 # If all line diffs were removals we have nothing to format.
5190 if not has_formattable_lines:
5191 continue
5192
5193 if opts.diff or opts.dry_run:
5194 cmd += ['--diff']
5195 # Will return non-zero exit code if non-empty diff.
5196 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5197 if opts.diff:
5198 sys.stdout.write(stdout)
5199 elif len(stdout) > 0:
5200 return_value = 2
5201 else:
5202 cmd += ['-i']
5203 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005204
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005205 # Dart's formatter does not have the nice property of only operating on
5206 # modified chunks, so hard code full.
5207 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005208 try:
5209 command = [dart_format.FindDartFmtToolInChromiumTree()]
5210 if not opts.dry_run and not opts.diff:
5211 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005212 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005213
ppi@chromium.org6593d932016-03-03 15:41:15 +00005214 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005215 if opts.dry_run and stdout:
5216 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005217 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005218 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5219 'found in this checkout. Files in other languages are still '
5220 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005221
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005222 # Format GN build files. Always run on full build files for canonical form.
5223 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005224 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005225 if opts.dry_run or opts.diff:
5226 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005227 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005228 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5229 shell=sys.platform == 'win32',
5230 cwd=top_dir)
5231 if opts.dry_run and gn_ret == 2:
5232 return_value = 2 # Not formatted.
5233 elif opts.diff and gn_ret == 2:
5234 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005235 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005236 elif gn_ret != 0:
5237 # For non-dry run cases (and non-2 return values for dry-run), a
5238 # nonzero error code indicates a failure, probably because the file
5239 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005240 DieWithError('gn format failed on ' + gn_diff_file +
5241 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005242
Ilya Shermane081cbe2017-08-15 17:51:04 -07005243 # Skip the metrics formatting from the global presubmit hook. These files have
5244 # a separate presubmit hook that issues an error if the files need formatting,
5245 # whereas the top-level presubmit script merely issues a warning. Formatting
5246 # these files is somewhat slow, so it's important not to duplicate the work.
5247 if not opts.presubmit:
5248 for xml_dir in GetDirtyMetricsDirs(diff_files):
5249 tool_dir = os.path.join(top_dir, xml_dir)
5250 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5251 if opts.dry_run or opts.diff:
5252 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005253 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005254 if opts.diff:
5255 sys.stdout.write(stdout)
5256 if opts.dry_run and stdout:
5257 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005258
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005259 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005260
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005261
Steven Holte2e664bf2017-04-21 13:10:47 -07005262def GetDirtyMetricsDirs(diff_files):
5263 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5264 metrics_xml_dirs = [
5265 os.path.join('tools', 'metrics', 'actions'),
5266 os.path.join('tools', 'metrics', 'histograms'),
5267 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005268 os.path.join('tools', 'metrics', 'ukm'),
5269 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005270 for xml_dir in metrics_xml_dirs:
5271 if any(file.startswith(xml_dir) for file in xml_diff_files):
5272 yield xml_dir
5273
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005274
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005275@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005276@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005277def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005278 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005279 _, args = parser.parse_args(args)
5280
5281 if len(args) != 1:
5282 parser.print_help()
5283 return 1
5284
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005285 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005286 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005287 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005288
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005289 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005290
Edward Lemur52969c92020-02-06 18:15:28 +00005291 issueprefix = Changelist.IssueConfigKey()
5292 output = RunGit(['config', '--local', '--get-regexp',
5293 r'branch\..*\.%s' % issueprefix],
5294 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005295
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005296 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005297 for key, issue in [x.split() for x in output.splitlines()]:
5298 if issue == target_issue:
5299 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5300
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005301 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005302 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005303 return 1
5304 if len(branches) == 1:
5305 RunGit(['checkout', branches[0]])
5306 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005307 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005308 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005309 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005310 which = raw_input('Choose by index: ')
5311 try:
5312 RunGit(['checkout', branches[int(which)]])
5313 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005314 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005315 return 1
5316
5317 return 0
5318
5319
maruel@chromium.org29404b52014-09-08 22:58:00 +00005320def CMDlol(parser, args):
5321 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005322 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005323 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5324 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5325 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005326 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005327 return 0
5328
5329
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005330class OptionParser(optparse.OptionParser):
5331 """Creates the option parse and add --verbose support."""
5332 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005333 optparse.OptionParser.__init__(
5334 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005335 self.add_option(
5336 '-v', '--verbose', action='count', default=0,
5337 help='Use 2 times for more debugging info')
5338
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005339 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005340 try:
5341 return self._parse_args(args)
5342 finally:
5343 # Regardless of success or failure of args parsing, we want to report
5344 # metrics, but only after logging has been initialized (if parsing
5345 # succeeded).
5346 global settings
5347 settings = Settings()
5348
5349 if not metrics.DISABLE_METRICS_COLLECTION:
5350 # GetViewVCUrl ultimately calls logging method.
5351 project_url = settings.GetViewVCUrl().strip('/+')
5352 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5353 metrics.collector.add('project_urls', [project_url])
5354
5355 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005356 # Create an optparse.Values object that will store only the actual passed
5357 # options, without the defaults.
5358 actual_options = optparse.Values()
5359 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5360 # Create an optparse.Values object with the default options.
5361 options = optparse.Values(self.get_default_values().__dict__)
5362 # Update it with the options passed by the user.
5363 options._update_careful(actual_options.__dict__)
5364 # Store the options passed by the user in an _actual_options attribute.
5365 # We store only the keys, and not the values, since the values can contain
5366 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005367 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005368
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005369 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005370 logging.basicConfig(
5371 level=levels[min(options.verbose, len(levels) - 1)],
5372 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5373 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005374
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005375 return options, args
5376
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005377
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005378def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005379 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005380 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005381 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005382 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005383
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005384 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005385 dispatcher = subcommand.CommandDispatcher(__name__)
5386 try:
5387 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005388 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005389 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005390 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005391 if e.code != 500:
5392 raise
5393 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005394 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005395 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005396 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005397
5398
5399if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005400 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5401 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005402 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005403 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005404 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005405 sys.exit(main(sys.argv[1:]))