blob: 2348620ec721e819640e015621c230ee6dc6ef01 [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')
Edward Lemur227d5102020-02-25 23:45:35 +000071PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000072
73# When collecting traces, Git hashes will be reduced to 6 characters to reduce
74# the size after compression.
75GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
76# Used to redact the cookies from the gitcookies file.
77GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
78
Edward Lemurd4d1ba42019-09-20 21:46:37 +000079MAX_ATTEMPTS = 3
80
Edward Lemur1b52d872019-05-09 21:12:12 +000081# The maximum number of traces we will keep. Multiplied by 3 since we store
82# 3 files per trace.
83MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000084# Message to be displayed to the user to inform where to find the traces for a
85# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000086TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000087'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000088'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000089' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'Copies of your gitcookies file and git config have been recorded at:\n'
91' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000092# Format of the message to be stored as part of the traces to give developers a
93# better context when they go through traces.
94TRACES_README_FORMAT = (
95'Date: %(now)s\n'
96'\n'
97'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
98'Title: %(title)s\n'
99'\n'
100'%(description)s\n'
101'\n'
102'Execution time: %(execution_time)s\n'
103'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000104
tandrii9d2c7a32016-06-22 03:42:45 -0700105COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800106POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000107DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000108REFS_THAT_ALIAS_TO_OTHER_REFS = {
109 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
110 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
111}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
thestig@chromium.org44202a22014-03-11 19:22:18 +0000113# Valid extensions for files we want to lint.
114DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
115DEFAULT_LINT_IGNORE_REGEX = r"$^"
116
Aiden Bennerc08566e2018-10-03 17:52:42 +0000117# File name for yapf style config files.
118YAPF_CONFIG_FILENAME = '.style.yapf'
119
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000120# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000121Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000122
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000123# Initialized in main()
124settings = None
125
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100126# Used by tests/git_cl_test.py to add extra logging.
127# Inside the weirdly failing test, add this:
128# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700129# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100130_IS_BEING_TESTED = False
131
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000132
Christopher Lamf732cd52017-01-24 12:40:11 +1100133def DieWithError(message, change_desc=None):
134 if change_desc:
135 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000136 print('\n ** Content of CL description **\n' +
137 '='*72 + '\n' +
138 change_desc.description + '\n' +
139 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100140
vapiera7fbd5a2016-06-16 09:17:49 -0700141 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000142 sys.exit(1)
143
144
Christopher Lamf732cd52017-01-24 12:40:11 +1100145def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000146 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000147 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000148 with open(backup_path, 'w') as backup_file:
149 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100150
151
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000152def GetNoGitPagerEnv():
153 env = os.environ.copy()
154 # 'cat' is a magical git string that disables pagers on all platforms.
155 env['GIT_PAGER'] = 'cat'
156 return env
157
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000158
bsep@chromium.org627d9002016-04-29 00:00:52 +0000159def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000160 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000161 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
162 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000163 except subprocess2.CalledProcessError as e:
164 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000165 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000166 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000167 'Command "%s" failed.\n%s' % (
168 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000169 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000170
171
172def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000173 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000174 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000175
176
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000177def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000178 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700179 if suppress_stderr:
180 stderr = subprocess2.VOID
181 else:
182 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000183 try:
tandrii5d48c322016-08-18 16:19:37 -0700184 (out, _), code = subprocess2.communicate(['git'] + args,
185 env=GetNoGitPagerEnv(),
186 stdout=subprocess2.PIPE,
187 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000188 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700189 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900190 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000191 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000192
193
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000194def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000195 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000196 return RunGitWithCode(args, suppress_stderr=True)[1]
197
198
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000199def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000200 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000201 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000202 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000203 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000204
205
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000206def BranchExists(branch):
207 """Return True if specified branch exists."""
208 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
209 suppress_stderr=True)
210 return not code
211
212
tandrii2a16b952016-10-19 07:09:44 -0700213def time_sleep(seconds):
214 # Use this so that it can be mocked in tests without interfering with python
215 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700216 return time.sleep(seconds)
217
218
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000219def time_time():
220 # Use this so that it can be mocked in tests without interfering with python
221 # system machinery.
222 return time.time()
223
224
Edward Lemur1b52d872019-05-09 21:12:12 +0000225def datetime_now():
226 # Use this so that it can be mocked in tests without interfering with python
227 # system machinery.
228 return datetime.datetime.now()
229
230
Edward Lemur1a83da12020-03-04 21:18:36 +0000231def _raw_input(message):
232 # Use this so that it can be mocked in tests on Python 2 and 3.
233 if sys.version_info.major == 2:
234 return raw_input(message)
235 return input(message)
236
237
maruel@chromium.org90541732011-04-01 17:54:18 +0000238def ask_for_data(prompt):
239 try:
Edward Lemur1a83da12020-03-04 21:18:36 +0000240 return _raw_input(prompt)
maruel@chromium.org90541732011-04-01 17:54:18 +0000241 except KeyboardInterrupt:
242 # Hide the exception.
243 sys.exit(1)
244
245
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100246def confirm_or_exit(prefix='', action='confirm'):
247 """Asks user to press enter to continue or press Ctrl+C to abort."""
248 if not prefix or prefix.endswith('\n'):
249 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100250 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100251 mid = ' Press'
252 elif prefix.endswith(' '):
253 mid = 'press'
254 else:
255 mid = ' press'
256 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
257
258
259def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000260 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100261 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
262 while True:
263 if 'yes'.startswith(result):
264 return True
265 if 'no'.startswith(result):
266 return False
267 result = ask_for_data('Please, type yes or no: ').lower()
268
269
tandrii5d48c322016-08-18 16:19:37 -0700270def _git_branch_config_key(branch, key):
271 """Helper method to return Git config key for a branch."""
272 assert branch, 'branch name is required to set git config for it'
273 return 'branch.%s.%s' % (branch, key)
274
275
machenbach@chromium.org45453142015-09-15 08:45:22 +0000276def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000277 prop_list = getattr(options, 'properties', [])
278 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000279 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000280 try:
281 properties[key] = json.loads(val)
282 except ValueError:
283 pass # If a value couldn't be evaluated, treat it as a string.
284 return properties
285
286
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000287# TODO(crbug.com/976104): Remove this function once git-cl try-results has
288# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000289def _buildbucket_retry(operation_name, http, *args, **kwargs):
290 """Retries requests to buildbucket service and returns parsed json content."""
291 try_count = 0
292 while True:
293 response, content = http.request(*args, **kwargs)
294 try:
295 content_json = json.loads(content)
296 except ValueError:
297 content_json = None
298
299 # Buildbucket could return an error even if status==200.
300 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000301 error = content_json.get('error')
302 if error.get('code') == 403:
303 raise BuildbucketResponseException(
304 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000305 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000306 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000307 raise BuildbucketResponseException(msg)
308
309 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700310 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000311 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000312 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700313 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000314 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000315 content)
316 return content_json
317 if response.status < 500 or try_count >= 2:
318 raise httplib2.HttpLib2Error(content)
319
320 # status >= 500 means transient failures.
321 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000322 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000323 try_count += 1
324 assert False, 'unreachable'
325
326
Edward Lemur4c707a22019-09-24 21:13:43 +0000327def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000328 """Calls a buildbucket v2 method and returns the parsed json response."""
329 headers = {
330 'Accept': 'application/json',
331 'Content-Type': 'application/json',
332 }
333 request = json.dumps(request)
334 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
335
336 logging.info('POST %s with %s' % (url, request))
337
338 attempts = 1
339 time_to_sleep = 1
340 while True:
341 response, content = http.request(url, 'POST', body=request, headers=headers)
342 if response.status == 200:
343 return json.loads(content[4:])
344 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
345 msg = '%s error when calling POST %s with %s: %s' % (
346 response.status, url, request, content)
347 raise BuildbucketResponseException(msg)
348 logging.debug(
349 '%s error when calling POST %s with %s. '
350 'Sleeping for %d seconds and retrying...' % (
351 response.status, url, request, time_to_sleep))
352 time.sleep(time_to_sleep)
353 time_to_sleep *= 2
354 attempts += 1
355
356 assert False, 'unreachable'
357
358
Edward Lemur6215c792019-10-03 21:59:05 +0000359def _parse_bucket(raw_bucket):
360 legacy = True
361 project = bucket = None
362 if '/' in raw_bucket:
363 legacy = False
364 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000365 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000366 elif raw_bucket.startswith('luci.'):
367 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000368 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000369 elif '.' in raw_bucket:
370 project = raw_bucket.split('.')[0]
371 bucket = raw_bucket
372 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000373 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000374 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
375 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000376
377
Quinten Yearsley777660f2020-03-04 23:37:06 +0000378def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000379 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700380
381 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000382 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000383 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700384 options: Command-line options.
385 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000386 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000387 for project, bucket, builder in jobs:
388 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000389 print('To see results here, run: git cl try-results')
390 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700391
Quinten Yearsley777660f2020-03-04 23:37:06 +0000392 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000393 if not requests:
394 return
395
Edward Lemur5b929a42019-10-21 17:57:39 +0000396 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000397 http.force_exception_to_status_code = True
398
399 batch_request = {'requests': requests}
400 batch_response = _call_buildbucket(
401 http, options.buildbucket_host, 'Batch', batch_request)
402
403 errors = [
404 ' ' + response['error']['message']
405 for response in batch_response.get('responses', [])
406 if 'error' in response
407 ]
408 if errors:
409 raise BuildbucketResponseException(
410 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
411
412
Quinten Yearsley777660f2020-03-04 23:37:06 +0000413def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000414 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000415 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000416 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000417 shared_properties['clobber'] = True
418 shared_properties.update(_get_properties_from_options(options) or {})
419
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000420 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
421 if options.retry_failed:
422 shared_tags.append({'key': 'retry_failed',
423 'value': '1'})
424
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000426 for (project, bucket, builder) in jobs:
427 properties = shared_properties.copy()
428 if 'presubmit' in builder.lower():
429 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000430
Edward Lemur45768512020-03-02 19:03:14 +0000431 requests.append({
432 'scheduleBuild': {
433 'requestId': str(uuid.uuid4()),
434 'builder': {
435 'project': getattr(options, 'project', None) or project,
436 'bucket': bucket,
437 'builder': builder,
438 },
439 'gerritChanges': gerrit_changes,
440 'properties': properties,
441 'tags': [
442 {'key': 'builder', 'value': builder},
443 ] + shared_tags,
444 }
445 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000446
Edward Lemur45768512020-03-02 19:03:14 +0000447 if options.revision:
448 requests[-1]['scheduleBuild']['gitilesCommit'] = {
449 'host': gerrit_changes[0]['host'],
450 'project': gerrit_changes[0]['project'],
451 'id': options.revision
452 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000453
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000454 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000455
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000456
Quinten Yearsley777660f2020-03-04 23:37:06 +0000457def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000458 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000459
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000460 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000461 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000462 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000463 request = {
464 'predicate': {
465 'gerritChanges': [changelist.GetGerritChange(patchset)],
466 },
467 'fields': ','.join('builds.*.' + field for field in fields),
468 }
tandrii221ab252016-10-06 08:12:04 -0700469
Edward Lemur5b929a42019-10-21 17:57:39 +0000470 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000471 if authenticator.has_cached_credentials():
472 http = authenticator.authorize(httplib2.Http())
473 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700474 print('Warning: Some results might be missing because %s' %
475 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000476 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000477 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000478 http.force_exception_to_status_code = True
479
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000480 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
481 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000482
Edward Lemur45768512020-03-02 19:03:14 +0000483
Edward Lemur5b929a42019-10-21 17:57:39 +0000484def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000485 """Fetches builds from the latest patchset that has builds (within
486 the last few patchsets).
487
488 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000489 changelist (Changelist): The CL to fetch builds for
490 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000491 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
492 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000494 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
495 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000496 """
497 assert buildbucket_host
498 assert changelist.GetIssue(), 'CL must be uploaded first'
499 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000500 if latest_patchset is None:
501 assert changelist.GetMostRecentPatchset()
502 ps = changelist.GetMostRecentPatchset()
503 else:
504 assert latest_patchset > 0, latest_patchset
505 ps = latest_patchset
506
Quinten Yearsley983111f2019-09-26 17:18:48 +0000507 min_ps = max(1, ps - 5)
508 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000509 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000510 if len(builds):
511 return builds, ps
512 ps -= 1
513 return [], 0
514
515
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000516def _filter_failed_for_retry(all_builds):
517 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000518
519 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000520 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000521 i.e. a list of buildbucket.v2.Builds which includes status and builder
522 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000523
524 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000525 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000526 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000527 """
Edward Lemur45768512020-03-02 19:03:14 +0000528 grouped = {}
529 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000530 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000531 key = (builder['project'], builder['bucket'], builder['builder'])
532 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000533
Edward Lemur45768512020-03-02 19:03:14 +0000534 jobs = []
535 for (project, bucket, builder), builds in grouped.items():
536 if 'triggered' in builder:
537 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
538 'from a parent. Please schedule a manual job for the parent '
539 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000540 continue
541 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
542 # Don't retry if any are running.
543 continue
Edward Lemur45768512020-03-02 19:03:14 +0000544 # If builder had several builds, retry only if the last one failed.
545 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
546 # build, but in case of retrying failed jobs retrying a flaky one makes
547 # sense.
548 builds = sorted(builds, key=lambda b: b['createTime'])
549 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
550 continue
551 # Don't retry experimental build previously triggered by CQ.
552 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
553 for t in builds[-1]['tags']):
554 continue
555 jobs.append((project, bucket, builder))
556
557 # Sort the jobs to make testing easier.
558 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000559
560
Quinten Yearsley777660f2020-03-04 23:37:06 +0000561def _print_tryjobs(options, builds):
562 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000563 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000564 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565 return
566
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000567 longest_builder = max(len(b['builder']['builder']) for b in builds)
568 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
571 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000572
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000573 builds_by_status = {}
574 for b in builds:
575 builds_by_status.setdefault(b['status'], []).append({
576 'id': b['id'],
577 'name': name_fmt.format(
578 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
579 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000581 sort_key = lambda b: (b['name'], b['id'])
582
583 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000585 if not builds:
586 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000587
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000588 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000589 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000590 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591 else:
592 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
593
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000594 print(colorize(title))
595 for b in sorted(builds, key=sort_key):
596 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000597
598 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000599 print_builds(
600 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
601 print_builds(
602 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
603 color=Fore.MAGENTA)
604 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
605 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
606 color=Fore.MAGENTA)
607 print_builds('Started:', builds_by_status.pop('STARTED', []))
608 print_builds(
609 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000610 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000611 print_builds(
612 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000613 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000614
615
Aiden Bennerc08566e2018-10-03 17:52:42 +0000616def _ComputeDiffLineRanges(files, upstream_commit):
617 """Gets the changed line ranges for each file since upstream_commit.
618
619 Parses a git diff on provided files and returns a dict that maps a file name
620 to an ordered list of range tuples in the form (start_line, count).
621 Ranges are in the same format as a git diff.
622 """
623 # If files is empty then diff_output will be a full diff.
624 if len(files) == 0:
625 return {}
626
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000627 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000628 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000629 diff_output = RunGit(diff_cmd)
630
631 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
632 # 2 capture groups
633 # 0 == fname of diff file
634 # 1 == 'diff_start,diff_count' or 'diff_start'
635 # will match each of
636 # diff --git a/foo.foo b/foo.py
637 # @@ -12,2 +14,3 @@
638 # @@ -12,2 +17 @@
639 # running re.findall on the above string with pattern will give
640 # [('foo.py', ''), ('', '14,3'), ('', '17')]
641
642 curr_file = None
643 line_diffs = {}
644 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
645 if match[0] != '':
646 # Will match the second filename in diff --git a/a.py b/b.py.
647 curr_file = match[0]
648 line_diffs[curr_file] = []
649 else:
650 # Matches +14,3
651 if ',' in match[1]:
652 diff_start, diff_count = match[1].split(',')
653 else:
654 # Single line changes are of the form +12 instead of +12,1.
655 diff_start = match[1]
656 diff_count = 1
657
658 diff_start = int(diff_start)
659 diff_count = int(diff_count)
660
661 # If diff_count == 0 this is a removal we can ignore.
662 line_diffs[curr_file].append((diff_start, diff_count))
663
664 return line_diffs
665
666
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000667def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000668 """Checks if a yapf file is in any parent directory of fpath until top_dir.
669
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000670 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000671 is found returns None. Uses yapf_config_cache as a cache for previously found
672 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000673 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000674 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000675 # Return result if we've already computed it.
676 if fpath in yapf_config_cache:
677 return yapf_config_cache[fpath]
678
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000679 parent_dir = os.path.dirname(fpath)
680 if os.path.isfile(fpath):
681 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000682 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000683 # Otherwise fpath is a directory
684 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
685 if os.path.isfile(yapf_file):
686 ret = yapf_file
687 elif fpath == top_dir or parent_dir == fpath:
688 # If we're at the top level directory, or if we're at root
689 # there is no provided style.
690 ret = None
691 else:
692 # Otherwise recurse on the current directory.
693 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000694 yapf_config_cache[fpath] = ret
695 return ret
696
697
Brian Sheedyb4307d52019-12-02 19:18:17 +0000698def _GetYapfIgnorePatterns(top_dir):
699 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000700
701 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
702 but this functionality appears to break when explicitly passing files to
703 yapf for formatting. According to
704 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
705 the .yapfignore file should be in the directory that yapf is invoked from,
706 which we assume to be the top level directory in this case.
707
708 Args:
709 top_dir: The top level directory for the repository being formatted.
710
711 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000712 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000713 """
714 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000715 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000716 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000717 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000718
Brian Sheedyb4307d52019-12-02 19:18:17 +0000719 with open(yapfignore_file) as f:
720 for line in f.readlines():
721 stripped_line = line.strip()
722 # Comments and blank lines should be ignored.
723 if stripped_line.startswith('#') or stripped_line == '':
724 continue
725 ignore_patterns.add(stripped_line)
726 return ignore_patterns
727
728
729def _FilterYapfIgnoredFiles(filepaths, patterns):
730 """Filters out any filepaths that match any of the given patterns.
731
732 Args:
733 filepaths: An iterable of strings containing filepaths to filter.
734 patterns: An iterable of strings containing fnmatch patterns to filter on.
735
736 Returns:
737 A list of strings containing all the elements of |filepaths| that did not
738 match any of the patterns in |patterns|.
739 """
740 # Not inlined so that tests can use the same implementation.
741 return [f for f in filepaths
742 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000743
744
Aaron Gable13101a62018-02-09 13:20:41 -0800745def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000746 """Prints statistics about the change to the user."""
747 # --no-ext-diff is broken in some versions of Git, so try to work around
748 # this by overriding the environment (but there is still a problem if the
749 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000750 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751 if 'GIT_EXTERNAL_DIFF' in env:
752 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000753
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800755 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000756 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757
758
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000759class BuildbucketResponseException(Exception):
760 pass
761
762
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763class Settings(object):
764 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000765 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000766 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000767 self.tree_status_url = None
768 self.viewvc_url = None
769 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000770 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000771 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000772 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000773 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000774 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775
Edward Lemur26964072020-02-19 19:18:51 +0000776 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000778 if self.updated:
779 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000780
Edward Lemur26964072020-02-19 19:18:51 +0000781 # The only value that actually changes the behavior is
782 # autoupdate = "false". Everything else means "true".
783 autoupdate = (
784 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
785
786 cr_settings_file = FindCodereviewSettingsFile()
787 if autoupdate != 'false' and cr_settings_file:
788 LoadCodereviewSettingsFromFile(cr_settings_file)
789 cr_settings_file.close()
790
791 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000792
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000793 @staticmethod
794 def GetRelativeRoot():
795 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000798 if self.root is None:
799 self.root = os.path.abspath(self.GetRelativeRoot())
800 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000801
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 def GetTreeStatusUrl(self, error_ok=False):
803 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000804 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
805 if self.tree_status_url is None and not error_ok:
806 DieWithError(
807 'You must configure your tree status URL by running '
808 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809 return self.tree_status_url
810
811 def GetViewVCUrl(self):
812 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000813 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814 return self.viewvc_url
815
rmistry@google.com90752582014-01-14 21:04:50 +0000816 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000817 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000818
rmistry@google.com5626a922015-02-26 14:03:30 +0000819 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000820 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000821 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000822 return run_post_upload_hook == "True"
823
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000824 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000825 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000826
ukai@chromium.orge8077812012-02-03 03:41:46 +0000827 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000828 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000829 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000830 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000831 return self.is_gerrit
832
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000833 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000834 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000835 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700836 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000837 if self.squash_gerrit_uploads is None:
838 # Default is squash now (http://crbug.com/611892#c23).
839 self.squash_gerrit_uploads = self._GetConfig(
840 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000841 return self.squash_gerrit_uploads
842
tandriia60502f2016-06-20 02:01:53 -0700843 def GetSquashGerritUploadsOverride(self):
844 """Return True or False if codereview.settings should be overridden.
845
846 Returns None if no override has been defined.
847 """
848 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000849 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700850 if result == 'true':
851 return True
852 if result == 'false':
853 return False
854 return None
855
tandrii@chromium.org28253532016-04-14 13:46:56 +0000856 def GetGerritSkipEnsureAuthenticated(self):
857 """Return True if EnsureAuthenticated should not be done for Gerrit
858 uploads."""
859 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000860 self.gerrit_skip_ensure_authenticated = self._GetConfig(
861 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000862 return self.gerrit_skip_ensure_authenticated
863
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000864 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000865 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000866 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000867 # Git requires single quotes for paths with spaces. We need to replace
868 # them with double quotes for Windows to treat such paths as a single
869 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000870 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000871 return self.git_editor or None
872
thestig@chromium.org44202a22014-03-11 19:22:18 +0000873 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000874 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000875
876 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000877 return self._GetConfig(
878 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000879
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000880 def GetFormatFullByDefault(self):
881 if self.format_full_by_default is None:
882 result = (
883 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
884 error_ok=True).strip())
885 self.format_full_by_default = (result == 'true')
886 return self.format_full_by_default
887
Edward Lemur26964072020-02-19 19:18:51 +0000888 def _GetConfig(self, key, default=''):
889 self._LazyUpdateIfNeeded()
890 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000891
892
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000893class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000894 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000895 NONE = 'none'
896 DRY_RUN = 'dry_run'
897 COMMIT = 'commit'
898
899 ALL_STATES = [NONE, DRY_RUN, COMMIT]
900
901
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000902class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000903 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000904 self.issue = issue
905 self.patchset = patchset
906 self.hostname = hostname
907
908 @property
909 def valid(self):
910 return self.issue is not None
911
912
Edward Lemurf38bc172019-09-03 21:02:13 +0000913def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000914 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
915 fail_result = _ParsedIssueNumberArgument()
916
Edward Lemur678a6842019-10-03 22:25:05 +0000917 if isinstance(arg, int):
918 return _ParsedIssueNumberArgument(issue=arg)
919 if not isinstance(arg, basestring):
920 return fail_result
921
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000922 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000923 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000924 if not arg.startswith('http'):
925 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700926
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000927 url = gclient_utils.UpgradeToHttps(arg)
928 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000929 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000930 except ValueError:
931 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200932
Edward Lemur678a6842019-10-03 22:25:05 +0000933 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
934 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
935 # Short urls like https://domain/<issue_number> can be used, but don't allow
936 # specifying the patchset (you'd 404), but we allow that here.
937 if parsed_url.path == '/':
938 part = parsed_url.fragment
939 else:
940 part = parsed_url.path
941
942 match = re.match(
943 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
944 if not match:
945 return fail_result
946
947 issue = int(match.group('issue'))
948 patchset = match.group('patchset')
949 return _ParsedIssueNumberArgument(
950 issue=issue,
951 patchset=int(patchset) if patchset else None,
952 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000953
954
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000955def _create_description_from_log(args):
956 """Pulls out the commit log to use as a base for the CL description."""
957 log_args = []
958 if len(args) == 1 and not args[0].endswith('.'):
959 log_args = [args[0] + '..']
960 elif len(args) == 1 and args[0].endswith('...'):
961 log_args = [args[0][:-1]]
962 elif len(args) == 2:
963 log_args = [args[0] + '..' + args[1]]
964 else:
965 log_args = args[:] # Hope for the best!
966 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
967
968
Aaron Gablea45ee112016-11-22 15:14:38 -0800969class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700970 def __init__(self, issue, url):
971 self.issue = issue
972 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800973 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700974
975 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800976 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700977 self.issue, self.url)
978
979
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100980_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000981 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100982 # TODO(tandrii): these two aren't known in Gerrit.
983 'approval', 'disapproval'])
984
985
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000986class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000987 """Changelist works with one changelist in local branch.
988
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000989 Notes:
990 * Not safe for concurrent multi-{thread,process} use.
991 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700992 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000993 """
994
Edward Lemur125d60a2019-09-13 18:25:41 +0000995 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000996 """Create a new ChangeList instance.
997
Edward Lemurf38bc172019-09-03 21:02:13 +0000998 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000999 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001000 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001001 global settings
1002 if not settings:
1003 # Happens when git_cl.py is used as a utility library.
1004 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001005
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001006 self.branchref = branchref
1007 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001008 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001009 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001010 else:
1011 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001012 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001013 self.lookedup_issue = False
1014 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001015 self.description = None
Edward Lemur9aa1a962020-02-25 00:58:38 +00001016 self.local_description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001017 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001019 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001020 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001021 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001022 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001023
Edward Lemur125d60a2019-09-13 18:25:41 +00001024 # Lazily cached values.
1025 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1026 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1027 # Map from change number (issue) to its detail cache.
1028 self._detail_cache = {}
1029
1030 if codereview_host is not None:
1031 assert not codereview_host.startswith('https://'), codereview_host
1032 self._gerrit_host = codereview_host
1033 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001034
1035 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001036 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001037
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001038 The return value is a string suitable for passing to git cl with the --cc
1039 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001040 """
1041 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001042 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001043 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001044 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1045 return self.cc
1046
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001047 def GetCCListWithoutDefault(self):
1048 """Return the users cc'd on this CL excluding default ones."""
1049 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001050 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001051 return self.cc
1052
Daniel Cheng7227d212017-11-17 08:12:37 -08001053 def ExtendCC(self, more_cc):
1054 """Extends the list of users to cc on this CL based on the changed files."""
1055 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001056
1057 def GetBranch(self):
1058 """Returns the short branch name, e.g. 'master'."""
1059 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001060 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001061 if not branchref:
1062 return None
1063 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001064 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001065 return self.branch
1066
1067 def GetBranchRef(self):
1068 """Returns the full branch name, e.g. 'refs/heads/master'."""
1069 self.GetBranch() # Poke the lazy loader.
1070 return self.branchref
1071
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001072 def ClearBranch(self):
1073 """Clears cached branch data of this object."""
1074 self.branch = self.branchref = None
1075
Edward Lemur85153282020-02-14 22:06:29 +00001076 def _GitGetBranchConfigValue(self, key, default=None):
1077 return scm.GIT.GetBranchConfig(
1078 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001079
Edward Lemur85153282020-02-14 22:06:29 +00001080 def _GitSetBranchConfigValue(self, key, value):
1081 action = 'set %s to %r' % (key, value)
1082 if not value:
1083 action = 'unset %s' % key
1084 assert self.GetBranch(), 'a branch is needed to ' + action
1085 return scm.GIT.SetBranchConfig(
1086 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001087
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001088 @staticmethod
1089 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001090 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001091 e.g. 'origin', 'refs/heads/master'
1092 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001093 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1094 settings.GetRoot(), branch)
1095 if not remote or not upstream_branch:
1096 DieWithError(
1097 'Unable to determine default branch to diff against.\n'
1098 'Either pass complete "git diff"-style arguments, like\n'
1099 ' git cl upload origin/master\n'
1100 'or verify this branch is set up to track another \n'
1101 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102
1103 return remote, upstream_branch
1104
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001105 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001106 upstream_branch = self.GetUpstreamBranch()
1107 if not BranchExists(upstream_branch):
1108 DieWithError('The upstream for the current branch (%s) does not exist '
1109 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001110 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001111 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001112
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001113 def GetUpstreamBranch(self):
1114 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001115 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001116 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001117 upstream_branch = upstream_branch.replace('refs/heads/',
1118 'refs/remotes/%s/' % remote)
1119 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1120 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001121 self.upstream_branch = upstream_branch
1122 return self.upstream_branch
1123
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001124 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001125 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001126 remote, branch = None, self.GetBranch()
1127 seen_branches = set()
1128 while branch not in seen_branches:
1129 seen_branches.add(branch)
1130 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001131 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001132 if remote != '.' or branch.startswith('refs/remotes'):
1133 break
1134 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001135 remotes = RunGit(['remote'], error_ok=True).split()
1136 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001137 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001138 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001139 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001140 logging.warn('Could not determine which remote this change is '
1141 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001142 else:
1143 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001144 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001145 branch = 'HEAD'
1146 if branch.startswith('refs/remotes'):
1147 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001148 elif branch.startswith('refs/branch-heads/'):
1149 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001150 else:
1151 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001152 return self._remote
1153
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001154 def GitSanityChecks(self, upstream_git_obj):
1155 """Checks git repo status and ensures diff is from local commits."""
1156
sbc@chromium.org79706062015-01-14 21:18:12 +00001157 if upstream_git_obj is None:
1158 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001159 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001160 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001161 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001162 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001163 return False
1164
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 # Verify the commit we're diffing against is in our current branch.
1166 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1167 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1168 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001169 print('ERROR: %s is not in the current branch. You may need to rebase '
1170 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001171 return False
1172
1173 # List the commits inside the diff, and verify they are all local.
1174 commits_in_diff = RunGit(
1175 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1176 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1177 remote_branch = remote_branch.strip()
1178 if code != 0:
1179 _, remote_branch = self.GetRemoteBranch()
1180
1181 commits_in_remote = RunGit(
1182 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1183
1184 common_commits = set(commits_in_diff) & set(commits_in_remote)
1185 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001186 print('ERROR: Your diff contains %d commits already in %s.\n'
1187 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1188 'the diff. If you are using a custom git flow, you can override'
1189 ' the reference used for this check with "git config '
1190 'gitcl.remotebranch <git-ref>".' % (
1191 len(common_commits), remote_branch, upstream_git_obj),
1192 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 return False
1194 return True
1195
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001196 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001197 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001198
1199 Returns None if it is not set.
1200 """
tandrii5d48c322016-08-18 16:19:37 -07001201 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001202
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001203 def GetRemoteUrl(self):
1204 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1205
1206 Returns None if there is no remote.
1207 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001208 is_cached, value = self._cached_remote_url
1209 if is_cached:
1210 return value
1211
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001212 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001213 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001214
Edward Lemur298f2cf2019-02-22 21:40:39 +00001215 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001216 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001217 if host:
1218 self._cached_remote_url = (True, url)
1219 return url
1220
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001221 # If it cannot be parsed as an url, assume it is a local directory,
1222 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001223 logging.warning('"%s" doesn\'t appear to point to a git host. '
1224 'Interpreting it as a local directory.', url)
1225 if not os.path.isdir(url):
1226 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001227 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1228 'but it doesn\'t exist.',
1229 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001230 return None
1231
1232 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001233 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001234
Edward Lemur79d4f992019-11-11 23:49:02 +00001235 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001236 if not host:
1237 logging.error(
1238 'Remote "%(remote)s" for branch "%(branch)s" points to '
1239 '"%(cache_path)s", but it is misconfigured.\n'
1240 '"%(cache_path)s" must be a git repo and must have a remote named '
1241 '"%(remote)s" pointing to the git host.', {
1242 'remote': remote,
1243 'cache_path': cache_path,
1244 'branch': self.GetBranch()})
1245 return None
1246
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001247 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001248 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001249
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001250 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001251 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001252 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001253 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1254 if self.issue is not None:
1255 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001256 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 return self.issue
1258
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259 def GetIssueURL(self):
1260 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001261 issue = self.GetIssue()
1262 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001263 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001264 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001265
Edward Lemur7f6dec02020-02-06 20:23:58 +00001266 def GetLocalDescription(self, upstream_branch):
1267 """Return the log messages of all commits up to the branch point."""
Edward Lemur9aa1a962020-02-25 00:58:38 +00001268 if self.local_description is None:
1269 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1270 self.local_description = RunGitWithCode(args)[1].strip()
1271 return self.local_description
Edward Lemur7f6dec02020-02-06 20:23:58 +00001272
Edward Lemur6c6827c2020-02-06 21:15:18 +00001273 def FetchDescription(self, pretty=False):
1274 assert self.GetIssue(), 'issue is required to query Gerrit'
1275
Edward Lemur9aa1a962020-02-25 00:58:38 +00001276 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001277 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1278 current_rev = data['current_revision']
1279 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001280
1281 if not pretty:
1282 return self.description
1283
1284 # Set width to 72 columns + 2 space indent.
1285 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1286 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1287 lines = self.description.splitlines()
1288 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001289
1290 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001291 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001292 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001293 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1294 if self.patchset is not None:
1295 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001296 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 return self.patchset
1298
Edward Lemur9aa1a962020-02-25 00:58:38 +00001299 def GetAuthor(self):
1300 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1301
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001302 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001303 """Set this branch's patchset. If patchset=0, clears the patchset."""
1304 assert self.GetBranch()
1305 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001306 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001307 else:
1308 self.patchset = int(patchset)
1309 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001310 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001311
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001312 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001313 """Set this branch's issue. If issue isn't given, clears the issue."""
1314 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001315 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001316 issue = int(issue)
1317 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001318 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001319 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001320 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001321 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001322 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001323 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001324 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001325 else:
tandrii5d48c322016-08-18 16:19:37 -07001326 # Reset all of these just to be clean.
1327 reset_suffixes = [
1328 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001329 self.IssueConfigKey(),
1330 self.PatchsetConfigKey(),
1331 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001332 ] + self._PostUnsetIssueProperties()
1333 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001334 try:
1335 self._GitSetBranchConfigValue(prop, None)
1336 except subprocess2.CalledProcessError:
1337 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001338 msg = RunGit(['log', '-1', '--format=%B']).strip()
1339 if msg and git_footers.get_footer_change_id(msg):
1340 print('WARNING: The change patched into this branch has a Change-Id. '
1341 'Removing it.')
1342 RunGit(['commit', '--amend', '-m',
1343 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001344 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001345 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001346 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001347
Edward Lemur7f6dec02020-02-06 20:23:58 +00001348 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001349 if not self.GitSanityChecks(upstream_branch):
1350 DieWithError('\nGit sanity check failure')
1351
Edward Lemur7f6dec02020-02-06 20:23:58 +00001352 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001353 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001354 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001355 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001356 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001357 except subprocess2.CalledProcessError:
1358 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001359 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001360 'This branch probably doesn\'t exist anymore. To reset the\n'
1361 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001362 ' git branch --set-upstream-to origin/master %s\n'
1363 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001364 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001365
maruel@chromium.org52424302012-08-29 15:14:30 +00001366 issue = self.GetIssue()
1367 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001368 if issue:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001369 description = self.FetchDescription()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001370 else:
1371 # If the change was never uploaded, use the log messages of all commits
1372 # up to the branch point, as git cl upload will prefill the description
1373 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001374 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001375
Edward Lemur9aa1a962020-02-25 00:58:38 +00001376 author = self.GetAuthor()
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001377 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001378 name,
1379 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001380 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001381 files,
1382 issue,
1383 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001384 author,
1385 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001386
dsansomee2d6fd92016-09-08 00:10:47 -07001387 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001388 assert self.GetIssue(), 'issue is required to update description'
1389
1390 if gerrit_util.HasPendingChangeEdit(
1391 self._GetGerritHost(), self._GerritChangeIdentifier()):
1392 if not force:
1393 confirm_or_exit(
1394 'The description cannot be modified while the issue has a pending '
1395 'unpublished edit. Either publish the edit in the Gerrit web UI '
1396 'or delete it.\n\n', action='delete the unpublished edit')
1397
1398 gerrit_util.DeletePendingChangeEdit(
1399 self._GetGerritHost(), self._GerritChangeIdentifier())
1400 gerrit_util.SetCommitMessage(
1401 self._GetGerritHost(), self._GerritChangeIdentifier(),
1402 description, notify='NONE')
1403
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001404 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001405
Edward Lemur75526302020-02-27 22:31:05 +00001406 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001407 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001408 '--root', settings.GetRoot(),
1409 '--upstream', upstream,
1410 ]
1411
1412 args.extend(['--verbose'] * verbose)
1413
Edward Lemur99df04e2020-03-05 19:39:43 +00001414 author = self.GetAuthor()
1415 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001416 issue = self.GetIssue()
1417 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001418 if author:
1419 args.extend(['--author', author])
1420 if gerrit_url:
1421 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001422 if issue:
1423 args.extend(['--issue', str(issue)])
1424 if patchset:
1425 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001426
Edward Lemur75526302020-02-27 22:31:05 +00001427 return args
1428
1429 def RunHook(
1430 self, committing, may_prompt, verbose, parallel, upstream, description,
1431 all_files):
1432 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1433 args = self._GetCommonPresubmitArgs(verbose, upstream)
1434 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001435 if may_prompt:
1436 args.append('--may_prompt')
1437 if parallel:
1438 args.append('--parallel')
1439 if all_files:
1440 args.append('--all_files')
1441
1442 with gclient_utils.temporary_file() as description_file:
1443 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001444
1445 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001446 args.extend(['--json_output', json_output])
1447 args.extend(['--description_file', description_file])
1448
1449 start = time_time()
1450 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1451 exit_code = p.wait()
1452 metrics.collector.add_repeated('sub_commands', {
1453 'command': 'presubmit',
1454 'execution_time': time_time() - start,
1455 'exit_code': exit_code,
1456 })
1457
1458 if exit_code:
1459 sys.exit(exit_code)
1460
1461 json_results = gclient_utils.FileRead(json_output)
1462 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001463
Edward Lemur75526302020-02-27 22:31:05 +00001464 def RunPostUploadHook(self, verbose, upstream, description):
1465 args = self._GetCommonPresubmitArgs(verbose, upstream)
1466 args.append('--post_upload')
1467
1468 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001469 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001470 args.extend(['--description_file', description_file])
1471 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1472 p.wait()
1473
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001474 def CMDUpload(self, options, git_diff_args, orig_args):
1475 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001476 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001477 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001478 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001479 else:
1480 if self.GetBranch() is None:
1481 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1482
1483 # Default to diffing against common ancestor of upstream branch
1484 base_branch = self.GetCommonAncestorWithUpstream()
1485 git_diff_args = [base_branch, 'HEAD']
1486
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001487 # Fast best-effort checks to abort before running potentially expensive
1488 # hooks if uploading is likely to fail anyway. Passing these checks does
1489 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001490 self.EnsureAuthenticated(force=options.force)
1491 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001492
1493 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001494 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001495 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1496 files = [f.LocalPath() for f in change.AffectedFiles()]
1497 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001498 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001499
Edward Lemur1a83da12020-03-04 21:18:36 +00001500 if self.GetIssue():
1501 description = self.FetchDescription()
1502 else:
1503 description = self.GetLocalDescription(base_branch)
Edward Lemur75526302020-02-27 22:31:05 +00001504 if options.reviewers or options.tbrs or options.add_owners_to:
1505 # Set the reviewer list now so that presubmit checks can access it.
1506 change_description = ChangeDescription(description)
1507 change_description.update_reviewers(options.reviewers,
1508 options.tbrs,
1509 options.add_owners_to,
1510 change)
1511 description = change_description.description
1512
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001513 if not options.bypass_hooks:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001514 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001515 may_prompt=not options.force,
1516 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001517 parallel=options.parallel,
1518 upstream=base_branch,
1519 description=description,
1520 all_files=False)
1521 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001522
Aaron Gable13101a62018-02-09 13:20:41 -08001523 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001524 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001525 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001526 self._GitSetBranchConfigValue(
1527 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001528 # Run post upload hooks, if specified.
1529 if settings.GetRunPostUploadHook():
Edward Lemur75526302020-02-27 22:31:05 +00001530 self.RunPostUploadHook(options.verbose, base_branch, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001531
1532 # Upload all dependencies if specified.
1533 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001534 print()
1535 print('--dependencies has been specified.')
1536 print('All dependent local branches will be re-uploaded.')
1537 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001538 # Remove the dependencies flag from args so that we do not end up in a
1539 # loop.
1540 orig_args.remove('--dependencies')
1541 ret = upload_branch_deps(self, orig_args)
1542 return ret
1543
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001544 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001545 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001546
1547 Issue must have been already uploaded and known.
1548 """
1549 assert new_state in _CQState.ALL_STATES
1550 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001551 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001552 vote_map = {
1553 _CQState.NONE: 0,
1554 _CQState.DRY_RUN: 1,
1555 _CQState.COMMIT: 2,
1556 }
1557 labels = {'Commit-Queue': vote_map[new_state]}
1558 notify = False if new_state == _CQState.DRY_RUN else None
1559 gerrit_util.SetReview(
1560 self._GetGerritHost(), self._GerritChangeIdentifier(),
1561 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001562 return 0
1563 except KeyboardInterrupt:
1564 raise
1565 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001566 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001567 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001568 ' * Your project has no CQ,\n'
1569 ' * You don\'t have permission to change the CQ state,\n'
1570 ' * There\'s a bug in this code (see stack trace below).\n'
1571 'Consider specifying which bots to trigger manually or asking your '
1572 'project owners for permissions or contacting Chrome Infra at:\n'
1573 'https://www.chromium.org/infra\n\n' %
1574 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001575 # Still raise exception so that stack trace is printed.
1576 raise
1577
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001578 def _GetGerritHost(self):
1579 # Lazy load of configs.
1580 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001581 if self._gerrit_host and '.' not in self._gerrit_host:
1582 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1583 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001584 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001585 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001586 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001587 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001588 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1589 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001590 return self._gerrit_host
1591
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001592 def _GetGitHost(self):
1593 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001594 remote_url = self.GetRemoteUrl()
1595 if not remote_url:
1596 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001597 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001598
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001599 def GetCodereviewServer(self):
1600 if not self._gerrit_server:
1601 # If we're on a branch then get the server potentially associated
1602 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001603 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001604 self._gerrit_server = self._GitGetBranchConfigValue(
1605 self.CodereviewServerConfigKey())
1606 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001607 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001608 if not self._gerrit_server:
1609 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1610 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001611 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001612 parts[0] = parts[0] + '-review'
1613 self._gerrit_host = '.'.join(parts)
1614 self._gerrit_server = 'https://%s' % self._gerrit_host
1615 return self._gerrit_server
1616
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001617 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001618 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001619 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001620 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001621 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001622 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001623 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001624 if project.endswith('.git'):
1625 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001626 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1627 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1628 # gitiles/git-over-https protocol. E.g.,
1629 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1630 # as
1631 # https://chromium.googlesource.com/v8/v8
1632 if project.startswith('a/'):
1633 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001634 return project
1635
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001636 def _GerritChangeIdentifier(self):
1637 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1638
1639 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001640 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001641 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001642 project = self._GetGerritProject()
1643 if project:
1644 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1645 # Fall back on still unique, but less efficient change number.
1646 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001647
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001648 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001649 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001650 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001651
tandrii5d48c322016-08-18 16:19:37 -07001652 @classmethod
1653 def PatchsetConfigKey(cls):
1654 return 'gerritpatchset'
1655
1656 @classmethod
1657 def CodereviewServerConfigKey(cls):
1658 return 'gerritserver'
1659
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001660 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001661 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001662 if settings.GetGerritSkipEnsureAuthenticated():
1663 # For projects with unusual authentication schemes.
1664 # See http://crbug.com/603378.
1665 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001666
1667 # Check presence of cookies only if using cookies-based auth method.
1668 cookie_auth = gerrit_util.Authenticator.get()
1669 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001670 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001671
Florian Mayerae510e82020-01-30 21:04:48 +00001672 remote_url = self.GetRemoteUrl()
1673 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001674 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001675 return
1676 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001677 logging.warning('Ignoring branch %(branch)s with non-https remote '
1678 '%(remote)s', {
1679 'branch': self.branch,
1680 'remote': self.GetRemoteUrl()
1681 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001682 return
1683
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001684 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001685 self.GetCodereviewServer()
1686 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001687 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001688
1689 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1690 git_auth = cookie_auth.get_auth_header(git_host)
1691 if gerrit_auth and git_auth:
1692 if gerrit_auth == git_auth:
1693 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001694 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001695 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001696 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001697 ' %s\n'
1698 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001699 ' Consider running the following command:\n'
1700 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001701 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001702 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001703 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001704 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001705 cookie_auth.get_new_password_message(git_host)))
1706 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001707 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001708 return
1709 else:
1710 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001711 ([] if gerrit_auth else [self._gerrit_host]) +
1712 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001713 DieWithError('Credentials for the following hosts are required:\n'
1714 ' %s\n'
1715 'These are read from %s (or legacy %s)\n'
1716 '%s' % (
1717 '\n '.join(missing),
1718 cookie_auth.get_gitcookies_path(),
1719 cookie_auth.get_netrc_path(),
1720 cookie_auth.get_new_password_message(git_host)))
1721
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001722 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001723 if not self.GetIssue():
1724 return
1725
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001726 status = self._GetChangeDetail()['status']
1727 if status in ('MERGED', 'ABANDONED'):
1728 DieWithError('Change %s has been %s, new uploads are not allowed' %
1729 (self.GetIssueURL(),
1730 'submitted' if status == 'MERGED' else 'abandoned'))
1731
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001732 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1733 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1734 # Apparently this check is not very important? Otherwise get_auth_email
1735 # could have been added to other implementations of Authenticator.
1736 cookies_auth = gerrit_util.Authenticator.get()
1737 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001738 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001739
1740 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001741 if self.GetIssueOwner() == cookies_user:
1742 return
1743 logging.debug('change %s owner is %s, cookies user is %s',
1744 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001745 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001746 # so ask what Gerrit thinks of this user.
1747 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1748 if details['email'] == self.GetIssueOwner():
1749 return
1750 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001751 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001752 'as %s.\n'
1753 'Uploading may fail due to lack of permissions.' %
1754 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1755 confirm_or_exit(action='upload')
1756
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001757 def _PostUnsetIssueProperties(self):
1758 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001759 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001760
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001761 def GetGerritObjForPresubmit(self):
1762 return presubmit_support.GerritAccessor(self._GetGerritHost())
1763
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001764 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001765 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001766 or CQ status, assuming adherence to a common workflow.
1767
1768 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001769 * 'error' - error from review tool (including deleted issues)
1770 * 'unsent' - no reviewers added
1771 * 'waiting' - waiting for review
1772 * 'reply' - waiting for uploader to reply to review
1773 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001774 * 'dry-run' - dry-running in the CQ
1775 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001776 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001777 """
1778 if not self.GetIssue():
1779 return None
1780
1781 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001782 data = self._GetChangeDetail([
1783 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001784 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001785 return 'error'
1786
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001787 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001788 return 'closed'
1789
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001790 cq_label = data['labels'].get('Commit-Queue', {})
1791 max_cq_vote = 0
1792 for vote in cq_label.get('all', []):
1793 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1794 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001795 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001796 if max_cq_vote == 1:
1797 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001798
Aaron Gable9ab38c62017-04-06 14:36:33 -07001799 if data['labels'].get('Code-Review', {}).get('approved'):
1800 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001801
1802 if not data.get('reviewers', {}).get('REVIEWER', []):
1803 return 'unsent'
1804
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001805 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001806 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001807 last_message_author = messages.pop().get('author', {})
1808 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001809 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1810 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001811 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001812 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001813 if last_message_author.get('_account_id') == owner:
1814 # Most recent message was by owner.
1815 return 'waiting'
1816 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001817 # Some reply from non-owner.
1818 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001819
1820 # Somehow there are no messages even though there are reviewers.
1821 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001822
1823 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001824 if not self.GetIssue():
1825 return None
1826
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001827 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001828 patchset = data['revisions'][data['current_revision']]['_number']
1829 self.SetPatchset(patchset)
1830 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001831
Aaron Gable636b13f2017-07-14 10:42:48 -07001832 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001833 gerrit_util.SetReview(
1834 self._GetGerritHost(), self._GerritChangeIdentifier(),
1835 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001836
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001837 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001838 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001839 # CURRENT_REVISION is included to get the latest patchset so that
1840 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001841 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001842 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1843 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001844 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001845 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001846 robot_file_comments = gerrit_util.GetChangeRobotComments(
1847 self._GetGerritHost(), self._GerritChangeIdentifier())
1848
1849 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001850 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001851 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001852 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001853 line_comments = file_comments.setdefault(path, [])
1854 line_comments.extend(
1855 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001856
1857 # Build dictionary of file comments for easy access and sorting later.
1858 # {author+date: {path: {patchset: {line: url+message}}}}
1859 comments = collections.defaultdict(
1860 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001861 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001862 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001863 tag = comment.get('tag', '')
1864 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001865 continue
1866 key = (comment['author']['email'], comment['updated'])
1867 if comment.get('side', 'REVISION') == 'PARENT':
1868 patchset = 'Base'
1869 else:
1870 patchset = 'PS%d' % comment['patch_set']
1871 line = comment.get('line', 0)
1872 url = ('https://%s/c/%s/%s/%s#%s%s' %
1873 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1874 'b' if comment.get('side') == 'PARENT' else '',
1875 str(line) if line else ''))
1876 comments[key][path][patchset][line] = (url, comment['message'])
1877
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001878 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001879 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001880 summary = self._BuildCommentSummary(msg, comments, readable)
1881 if summary:
1882 summaries.append(summary)
1883 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001884
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001885 @staticmethod
1886 def _BuildCommentSummary(msg, comments, readable):
1887 key = (msg['author']['email'], msg['date'])
1888 # Don't bother showing autogenerated messages that don't have associated
1889 # file or line comments. this will filter out most autogenerated
1890 # messages, but will keep robot comments like those from Tricium.
1891 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1892 if is_autogenerated and not comments.get(key):
1893 return None
1894 message = msg['message']
1895 # Gerrit spits out nanoseconds.
1896 assert len(msg['date'].split('.')[-1]) == 9
1897 date = datetime.datetime.strptime(msg['date'][:-3],
1898 '%Y-%m-%d %H:%M:%S.%f')
1899 if key in comments:
1900 message += '\n'
1901 for path, patchsets in sorted(comments.get(key, {}).items()):
1902 if readable:
1903 message += '\n%s' % path
1904 for patchset, lines in sorted(patchsets.items()):
1905 for line, (url, content) in sorted(lines.items()):
1906 if line:
1907 line_str = 'Line %d' % line
1908 path_str = '%s:%d:' % (path, line)
1909 else:
1910 line_str = 'File comment'
1911 path_str = '%s:0:' % path
1912 if readable:
1913 message += '\n %s, %s: %s' % (patchset, line_str, url)
1914 message += '\n %s\n' % content
1915 else:
1916 message += '\n%s ' % path_str
1917 message += '\n%s\n' % content
1918
1919 return _CommentSummary(
1920 date=date,
1921 message=message,
1922 sender=msg['author']['email'],
1923 autogenerated=is_autogenerated,
1924 # These could be inferred from the text messages and correlated with
1925 # Code-Review label maximum, however this is not reliable.
1926 # Leaving as is until the need arises.
1927 approval=False,
1928 disapproval=False,
1929 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001930
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001931 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001932 gerrit_util.AbandonChange(
1933 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001934
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001935 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001936 gerrit_util.SubmitChange(
1937 self._GetGerritHost(), self._GerritChangeIdentifier(),
1938 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001939
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001940 def _GetChangeDetail(self, options=None):
1941 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001942 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001943 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001944
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001945 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001946 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001947 options.append('CURRENT_COMMIT')
1948
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001949 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001950 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001951 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001952
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001953 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1954 # Assumption: data fetched before with extra options is suitable
1955 # for return for a smaller set of options.
1956 # For example, if we cached data for
1957 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1958 # and request is for options=[CURRENT_REVISION],
1959 # THEN we can return prior cached data.
1960 if options_set.issubset(cached_options_set):
1961 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001962
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001963 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001964 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001965 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001966 except gerrit_util.GerritError as e:
1967 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001968 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001969 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001970
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001971 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001972 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001973
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001974 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001975 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001976 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001977 data = gerrit_util.GetChangeCommit(
1978 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001979 except gerrit_util.GerritError as e:
1980 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001981 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001982 raise
agable32978d92016-11-01 12:55:02 -07001983 return data
1984
Karen Qian40c19422019-03-13 21:28:29 +00001985 def _IsCqConfigured(self):
1986 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001987 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001988
Olivier Robin75ee7252018-04-13 10:02:56 +02001989 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001990 if git_common.is_dirty_git_tree('land'):
1991 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001992
tandriid60367b2016-06-22 05:25:12 -07001993 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001994 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001995 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001996 'which can test and land changes for you. '
1997 'Are you sure you wish to bypass it?\n',
1998 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001999 differs = True
tandriic4344b52016-08-29 06:04:54 -07002000 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002001 # Note: git diff outputs nothing if there is no diff.
2002 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002003 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002004 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002005 if detail['current_revision'] == last_upload:
2006 differs = False
2007 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002008 print('WARNING: Local branch contents differ from latest uploaded '
2009 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002010 if differs:
2011 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002012 confirm_or_exit(
2013 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2014 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002015 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002016 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002017 upstream = self.GetCommonAncestorWithUpstream()
2018 if self.GetIssue():
2019 description = self.FetchDescription()
2020 else:
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00002021 description = self.GetLocalDescription(upstream)
Edward Lemur227d5102020-02-25 23:45:35 +00002022 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002023 committing=True,
2024 may_prompt=not force,
2025 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002026 parallel=parallel,
2027 upstream=upstream,
2028 description=description,
2029 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002030
2031 self.SubmitIssue(wait_for_merge=True)
2032 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002033 links = self._GetChangeCommit().get('web_links', [])
2034 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002035 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002036 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002037 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002038 return 0
2039
Edward Lemurf38bc172019-09-03 21:02:13 +00002040 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002041 assert parsed_issue_arg.valid
2042
Edward Lemur125d60a2019-09-13 18:25:41 +00002043 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002044
2045 if parsed_issue_arg.hostname:
2046 self._gerrit_host = parsed_issue_arg.hostname
2047 self._gerrit_server = 'https://%s' % self._gerrit_host
2048
tandriic2405f52016-10-10 08:13:15 -07002049 try:
2050 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002051 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002052 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002053
2054 if not parsed_issue_arg.patchset:
2055 # Use current revision by default.
2056 revision_info = detail['revisions'][detail['current_revision']]
2057 patchset = int(revision_info['_number'])
2058 else:
2059 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002060 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002061 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2062 break
2063 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002064 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002065 (parsed_issue_arg.patchset, self.GetIssue()))
2066
Edward Lemur125d60a2019-09-13 18:25:41 +00002067 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002068 if remote_url.endswith('.git'):
2069 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002070 remote_url = remote_url.rstrip('/')
2071
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002072 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002073 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002074
2075 if remote_url != fetch_info['url']:
2076 DieWithError('Trying to patch a change from %s but this repo appears '
2077 'to be %s.' % (fetch_info['url'], remote_url))
2078
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002079 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002080
Aaron Gable62619a32017-06-16 08:22:09 -07002081 if force:
2082 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2083 print('Checked out commit for change %i patchset %i locally' %
2084 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002085 elif nocommit:
2086 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2087 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002088 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002089 RunGit(['cherry-pick', 'FETCH_HEAD'])
2090 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002091 (parsed_issue_arg.issue, patchset))
2092 print('Note: this created a local commit which does not have '
2093 'the same hash as the one uploaded for review. This will make '
2094 'uploading changes based on top of this branch difficult.\n'
2095 'If you want to do that, use "git cl patch --force" instead.')
2096
Stefan Zagerd08043c2017-10-12 12:07:02 -07002097 if self.GetBranch():
2098 self.SetIssue(parsed_issue_arg.issue)
2099 self.SetPatchset(patchset)
2100 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2101 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2102 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2103 else:
2104 print('WARNING: You are in detached HEAD state.\n'
2105 'The patch has been applied to your checkout, but you will not be '
2106 'able to upload a new patch set to the gerrit issue.\n'
2107 'Try using the \'-b\' option if you would like to work on a '
2108 'branch and/or upload a new patch set.')
2109
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002110 return 0
2111
tandrii16e0b4e2016-06-07 10:34:28 -07002112 def _GerritCommitMsgHookCheck(self, offer_removal):
2113 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2114 if not os.path.exists(hook):
2115 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002116 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2117 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002118 data = gclient_utils.FileRead(hook)
2119 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2120 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002121 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002122 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002123 'and may interfere with it in subtle ways.\n'
2124 'We recommend you remove the commit-msg hook.')
2125 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002126 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002127 gclient_utils.rm_file_or_tree(hook)
2128 print('Gerrit commit-msg hook removed.')
2129 else:
2130 print('OK, will keep Gerrit commit-msg hook in place.')
2131
Edward Lemur1b52d872019-05-09 21:12:12 +00002132 def _CleanUpOldTraces(self):
2133 """Keep only the last |MAX_TRACES| traces."""
2134 try:
2135 traces = sorted([
2136 os.path.join(TRACES_DIR, f)
2137 for f in os.listdir(TRACES_DIR)
2138 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2139 and not f.startswith('tmp'))
2140 ])
2141 traces_to_delete = traces[:-MAX_TRACES]
2142 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002143 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002144 except OSError:
2145 print('WARNING: Failed to remove old git traces from\n'
2146 ' %s'
2147 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002148
Edward Lemur5737f022019-05-17 01:24:00 +00002149 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002150 """Zip and write the git push traces stored in traces_dir."""
2151 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002152 traces_zip = trace_name + '-traces'
2153 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002154 # Create a temporary dir to store git config and gitcookies in. It will be
2155 # compressed and stored next to the traces.
2156 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002157 git_info_zip = trace_name + '-git-info'
2158
Edward Lemur5737f022019-05-17 01:24:00 +00002159 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002160 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002161 git_push_metadata['now'] = git_push_metadata['now'].decode(
2162 sys.stdin.encoding)
2163
Edward Lemur1b52d872019-05-09 21:12:12 +00002164 git_push_metadata['trace_name'] = trace_name
2165 gclient_utils.FileWrite(
2166 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2167
2168 # Keep only the first 6 characters of the git hashes on the packet
2169 # trace. This greatly decreases size after compression.
2170 packet_traces = os.path.join(traces_dir, 'trace-packet')
2171 if os.path.isfile(packet_traces):
2172 contents = gclient_utils.FileRead(packet_traces)
2173 gclient_utils.FileWrite(
2174 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2175 shutil.make_archive(traces_zip, 'zip', traces_dir)
2176
2177 # Collect and compress the git config and gitcookies.
2178 git_config = RunGit(['config', '-l'])
2179 gclient_utils.FileWrite(
2180 os.path.join(git_info_dir, 'git-config'),
2181 git_config)
2182
2183 cookie_auth = gerrit_util.Authenticator.get()
2184 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2185 gitcookies_path = cookie_auth.get_gitcookies_path()
2186 if os.path.isfile(gitcookies_path):
2187 gitcookies = gclient_utils.FileRead(gitcookies_path)
2188 gclient_utils.FileWrite(
2189 os.path.join(git_info_dir, 'gitcookies'),
2190 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2191 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2192
Edward Lemur1b52d872019-05-09 21:12:12 +00002193 gclient_utils.rmtree(git_info_dir)
2194
2195 def _RunGitPushWithTraces(
2196 self, change_desc, refspec, refspec_opts, git_push_metadata):
2197 """Run git push and collect the traces resulting from the execution."""
2198 # Create a temporary directory to store traces in. Traces will be compressed
2199 # and stored in a 'traces' dir inside depot_tools.
2200 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002201 trace_name = os.path.join(
2202 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002203
2204 env = os.environ.copy()
2205 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2206 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002207 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002208 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2209 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2210 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2211
2212 try:
2213 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002214 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002215 before_push = time_time()
2216 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002217 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002218 env=env,
2219 print_stdout=True,
2220 # Flush after every line: useful for seeing progress when running as
2221 # recipe.
2222 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002223 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002224 except subprocess2.CalledProcessError as e:
2225 push_returncode = e.returncode
2226 DieWithError('Failed to create a change. Please examine output above '
2227 'for the reason of the failure.\n'
2228 'Hint: run command below to diagnose common Git/Gerrit '
2229 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002230 ' git cl creds-check\n'
2231 '\n'
2232 'If git-cl is not working correctly, file a bug under the '
2233 'Infra>SDK component including the files below.\n'
2234 'Review the files before upload, since they might contain '
2235 'sensitive information.\n'
2236 'Set the Restrict-View-Google label so that they are not '
2237 'publicly accessible.\n'
2238 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002239 change_desc)
2240 finally:
2241 execution_time = time_time() - before_push
2242 metrics.collector.add_repeated('sub_commands', {
2243 'command': 'git push',
2244 'execution_time': execution_time,
2245 'exit_code': push_returncode,
2246 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2247 })
2248
Edward Lemur1b52d872019-05-09 21:12:12 +00002249 git_push_metadata['execution_time'] = execution_time
2250 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002251 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002252
Edward Lemur1b52d872019-05-09 21:12:12 +00002253 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002254 gclient_utils.rmtree(traces_dir)
2255
2256 return push_stdout
2257
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002258 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002259 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002260 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002261 # Load default for user, repo, squash=true, in this order.
2262 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002263
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002264 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002265 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002266 # This may be None; default fallback value is determined in logic below.
2267 title = options.title
2268
Dominic Battre7d1c4842017-10-27 09:17:28 +02002269 # Extract bug number from branch name.
2270 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002271 fixed = options.fixed
2272 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2273 self.GetBranch())
2274 if not bug and not fixed and match:
2275 if match.group('type') == 'bug':
2276 bug = match.group('bugnum')
2277 else:
2278 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002279
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002280 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002281 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002282 if self.GetIssue():
2283 # Try to get the message from a previous upload.
Edward Lemur6c6827c2020-02-06 21:15:18 +00002284 message = self.FetchDescription()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 if not message:
2286 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002287 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002288 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002289 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002290 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002291 # When uploading a subsequent patchset, -m|--message is taken
2292 # as the patchset title if --title was not provided.
2293 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002294 else:
2295 default_title = RunGit(
2296 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002297 if options.force:
2298 title = default_title
2299 else:
2300 title = ask_for_data(
2301 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002302
2303 # User requested to change description
2304 if options.edit_description:
2305 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2306 change_desc.prompt()
2307 message = change_desc.description
2308
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002309 change_id = self._GetChangeDetail()['change_id']
2310 while True:
2311 footer_change_ids = git_footers.get_footer_change_id(message)
2312 if footer_change_ids == [change_id]:
2313 break
2314 if not footer_change_ids:
2315 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002316 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002317 continue
2318 # There is already a valid footer but with different or several ids.
2319 # Doing this automatically is non-trivial as we don't want to lose
2320 # existing other footers, yet we want to append just 1 desired
2321 # Change-Id. Thus, just create a new footer, but let user verify the
2322 # new description.
2323 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002324 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002325 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002326 print(
2327 'WARNING: change %s has Change-Id footer(s):\n'
2328 ' %s\n'
2329 'but change has Change-Id %s, according to Gerrit.\n'
2330 'Please, check the proposed correction to the description, '
2331 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2332 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2333 change_id))
2334 confirm_or_exit(action='edit')
2335 change_desc.prompt()
2336
2337 message = change_desc.description
2338 if not message:
2339 DieWithError("Description is empty. Aborting...")
2340
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002341 # Continue the while loop.
2342 # Sanity check of this code - we should end up with proper message
2343 # footer.
2344 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002345 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002346 else: # if not self.GetIssue()
2347 if options.message:
2348 message = options.message
2349 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002350 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002351 if options.title:
2352 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002353 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002354 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002355 change_desc.prompt()
2356
Aaron Gableb56ad332017-01-06 15:24:31 -08002357 # On first upload, patchset title is always this string, while
2358 # --title flag gets converted to first line of message.
2359 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002360 if not change_desc.description:
2361 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002362 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002363 if len(change_ids) > 1:
2364 DieWithError('too many Change-Id footers, at most 1 allowed.')
2365 if not change_ids:
2366 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002367 change_desc.set_description(git_footers.add_footer_change_id(
2368 change_desc.description,
2369 GenerateGerritChangeId(change_desc.description)))
2370 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002371 assert len(change_ids) == 1
2372 change_id = change_ids[0]
2373
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002374 if options.reviewers or options.tbrs or options.add_owners_to:
2375 change_desc.update_reviewers(options.reviewers, options.tbrs,
2376 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002377 if options.preserve_tryjobs:
2378 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002379
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002380 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002381 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2382 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002383 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002384 with gclient_utils.temporary_file() as desc_tempfile:
2385 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2386 ref_to_push = RunGit(
2387 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002388 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002389 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002390 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002391 if not change_desc.description:
2392 DieWithError("Description is empty. Aborting...")
2393
2394 if not git_footers.get_footer_change_id(change_desc.description):
2395 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002396 change_desc.set_description(
2397 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002398 if options.reviewers or options.tbrs or options.add_owners_to:
2399 change_desc.update_reviewers(options.reviewers, options.tbrs,
2400 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002401 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002402 # For no-squash mode, we assume the remote called "origin" is the one we
2403 # want. It is not worthwhile to support different workflows for
2404 # no-squash mode.
2405 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002406 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2407
2408 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002409 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002410 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2411 ref_to_push)]).splitlines()
2412 if len(commits) > 1:
2413 print('WARNING: This will upload %d commits. Run the following command '
2414 'to see which commits will be uploaded: ' % len(commits))
2415 print('git log %s..%s' % (parent, ref_to_push))
2416 print('You can also use `git squash-branch` to squash these into a '
2417 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002418 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002419
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002420 if options.reviewers or options.tbrs or options.add_owners_to:
2421 change_desc.update_reviewers(options.reviewers, options.tbrs,
2422 options.add_owners_to, change)
2423
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002424 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002425 cc = []
2426 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2427 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2428 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002429 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002430 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002431 if options.cc:
2432 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002433 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002434 if change_desc.get_cced():
2435 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002436 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2437 valid_accounts = set(reviewers + cc)
2438 # TODO(crbug/877717): relax this for all hosts.
2439 else:
2440 valid_accounts = gerrit_util.ValidAccounts(
2441 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002442 logging.info('accounts %s are recognized, %s invalid',
2443 sorted(valid_accounts),
2444 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002445
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002446 # Extra options that can be specified at push time. Doc:
2447 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002448 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002449
Aaron Gable844cf292017-06-28 11:32:59 -07002450 # By default, new changes are started in WIP mode, and subsequent patchsets
2451 # don't send email. At any time, passing --send-mail will mark the change
2452 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002453 if options.send_mail:
2454 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002455 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002456 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002457 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002458 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002459 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002460
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002461 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002462 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002463
Aaron Gable9b713dd2016-12-14 16:04:21 -08002464 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002465 # Punctuation and whitespace in |title| must be percent-encoded.
2466 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002467
agablec6787972016-09-09 16:13:34 -07002468 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002469 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002470
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002471 for r in sorted(reviewers):
2472 if r in valid_accounts:
2473 refspec_opts.append('r=%s' % r)
2474 reviewers.remove(r)
2475 else:
2476 # TODO(tandrii): this should probably be a hard failure.
2477 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2478 % r)
2479 for c in sorted(cc):
2480 # refspec option will be rejected if cc doesn't correspond to an
2481 # account, even though REST call to add such arbitrary cc may succeed.
2482 if c in valid_accounts:
2483 refspec_opts.append('cc=%s' % c)
2484 cc.remove(c)
2485
rmistry9eadede2016-09-19 11:22:43 -07002486 if options.topic:
2487 # Documentation on Gerrit topics is here:
2488 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002489 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002490
Edward Lemur687ca902018-12-05 02:30:30 +00002491 if options.enable_auto_submit:
2492 refspec_opts.append('l=Auto-Submit+1')
2493 if options.use_commit_queue:
2494 refspec_opts.append('l=Commit-Queue+2')
2495 elif options.cq_dry_run:
2496 refspec_opts.append('l=Commit-Queue+1')
2497
2498 if change_desc.get_reviewers(tbr_only=True):
2499 score = gerrit_util.GetCodeReviewTbrScore(
2500 self._GetGerritHost(),
2501 self._GetGerritProject())
2502 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002503
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002504 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002505 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002506 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002507 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002508 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2509
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002510 refspec_suffix = ''
2511 if refspec_opts:
2512 refspec_suffix = '%' + ','.join(refspec_opts)
2513 assert ' ' not in refspec_suffix, (
2514 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2515 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2516
Edward Lemur1b52d872019-05-09 21:12:12 +00002517 git_push_metadata = {
2518 'gerrit_host': self._GetGerritHost(),
2519 'title': title or '<untitled>',
2520 'change_id': change_id,
2521 'description': change_desc.description,
2522 }
2523 push_stdout = self._RunGitPushWithTraces(
2524 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002525
2526 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002527 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002528 change_numbers = [m.group(1)
2529 for m in map(regex.match, push_stdout.splitlines())
2530 if m]
2531 if len(change_numbers) != 1:
2532 DieWithError(
2533 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002534 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002535 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002536 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002537
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002538 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002539 # GetIssue() is not set in case of non-squash uploads according to tests.
2540 # TODO(agable): non-squash uploads in git cl should be removed.
2541 gerrit_util.AddReviewers(
2542 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002543 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002544 reviewers, cc,
2545 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002546
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002547 return 0
2548
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002549 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2550 change_desc):
2551 """Computes parent of the generated commit to be uploaded to Gerrit.
2552
2553 Returns revision or a ref name.
2554 """
2555 if custom_cl_base:
2556 # Try to avoid creating additional unintended CLs when uploading, unless
2557 # user wants to take this risk.
2558 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2559 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2560 local_ref_of_target_remote])
2561 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002562 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002563 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2564 'If you proceed with upload, more than 1 CL may be created by '
2565 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2566 'If you are certain that specified base `%s` has already been '
2567 'uploaded to Gerrit as another CL, you may proceed.\n' %
2568 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2569 if not force:
2570 confirm_or_exit(
2571 'Do you take responsibility for cleaning up potential mess '
2572 'resulting from proceeding with upload?',
2573 action='upload')
2574 return custom_cl_base
2575
Aaron Gablef97e33d2017-03-30 15:44:27 -07002576 if remote != '.':
2577 return self.GetCommonAncestorWithUpstream()
2578
2579 # If our upstream branch is local, we base our squashed commit on its
2580 # squashed version.
2581 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2582
Aaron Gablef97e33d2017-03-30 15:44:27 -07002583 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002584 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002585
2586 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002587 # TODO(tandrii): consider checking parent change in Gerrit and using its
2588 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2589 # the tree hash of the parent branch. The upside is less likely bogus
2590 # requests to reupload parent change just because it's uploadhash is
2591 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002592 parent = RunGit(['config',
2593 'branch.%s.gerritsquashhash' % upstream_branch_name],
2594 error_ok=True).strip()
2595 # Verify that the upstream branch has been uploaded too, otherwise
2596 # Gerrit will create additional CLs when uploading.
2597 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2598 RunGitSilent(['rev-parse', parent + ':'])):
2599 DieWithError(
2600 '\nUpload upstream branch %s first.\n'
2601 'It is likely that this branch has been rebased since its last '
2602 'upload, so you just need to upload it again.\n'
2603 '(If you uploaded it with --no-squash, then branch dependencies '
2604 'are not supported, and you should reupload with --squash.)'
2605 % upstream_branch_name,
2606 change_desc)
2607 return parent
2608
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002609 def _AddChangeIdToCommitMessage(self, options, args):
2610 """Re-commits using the current message, assumes the commit hook is in
2611 place.
2612 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002613 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002614 git_command = ['commit', '--amend', '-m', log_desc]
2615 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002616 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002617 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002618 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002619 return new_log_desc
2620 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002621 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002622
tandriie113dfd2016-10-11 10:20:12 -07002623 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002624 try:
2625 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002626 except GerritChangeNotExists:
2627 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002628
2629 if data['status'] in ('ABANDONED', 'MERGED'):
2630 return 'CL %s is closed' % self.GetIssue()
2631
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002632 def GetGerritChange(self, patchset=None):
2633 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002634 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002635 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002636 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002637 data = self._GetChangeDetail(['ALL_REVISIONS'])
2638
2639 assert host and issue and patchset, 'CL must be uploaded first'
2640
2641 has_patchset = any(
2642 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002643 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002644 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002645 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002646 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002647
tandrii8c5a3532016-11-04 07:52:02 -07002648 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002649 'host': host,
2650 'change': issue,
2651 'project': data['project'],
2652 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002653 }
tandriie113dfd2016-10-11 10:20:12 -07002654
tandriide281ae2016-10-12 06:02:30 -07002655 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002656 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002657
Edward Lemur707d70b2018-02-07 00:50:14 +01002658 def GetReviewers(self):
2659 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002660 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002661
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002662
tandriif9aefb72016-07-01 09:06:51 -07002663def _get_bug_line_values(default_project, bugs):
2664 """Given default_project and comma separated list of bugs, yields bug line
2665 values.
2666
2667 Each bug can be either:
2668 * a number, which is combined with default_project
2669 * string, which is left as is.
2670
2671 This function may produce more than one line, because bugdroid expects one
2672 project per line.
2673
2674 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2675 ['v8:123', 'chromium:789']
2676 """
2677 default_bugs = []
2678 others = []
2679 for bug in bugs.split(','):
2680 bug = bug.strip()
2681 if bug:
2682 try:
2683 default_bugs.append(int(bug))
2684 except ValueError:
2685 others.append(bug)
2686
2687 if default_bugs:
2688 default_bugs = ','.join(map(str, default_bugs))
2689 if default_project:
2690 yield '%s:%s' % (default_project, default_bugs)
2691 else:
2692 yield default_bugs
2693 for other in sorted(others):
2694 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2695 yield other
2696
2697
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002698class ChangeDescription(object):
2699 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002700 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002701 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002702 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002703 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002704 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002705 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2706 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002707 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002708 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002709
Dan Beamd8b04ca2019-10-10 21:23:26 +00002710 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002711 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002712 if bug:
2713 regexp = re.compile(self.BUG_LINE)
2714 prefix = settings.GetBugPrefix()
2715 if not any((regexp.match(line) for line in self._description_lines)):
2716 values = list(_get_bug_line_values(prefix, bug))
2717 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002718 if fixed:
2719 regexp = re.compile(self.FIXED_LINE)
2720 prefix = settings.GetBugPrefix()
2721 if not any((regexp.match(line) for line in self._description_lines)):
2722 values = list(_get_bug_line_values(prefix, fixed))
2723 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002724
agable@chromium.org42c20792013-09-12 17:34:49 +00002725 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002726 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002727 return '\n'.join(self._description_lines)
2728
2729 def set_description(self, desc):
2730 if isinstance(desc, basestring):
2731 lines = desc.splitlines()
2732 else:
2733 lines = [line.rstrip() for line in desc]
2734 while lines and not lines[0]:
2735 lines.pop(0)
2736 while lines and not lines[-1]:
2737 lines.pop(-1)
2738 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002739
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002740 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2741 """Rewrites the R=/TBR= line(s) as a single line each.
2742
2743 Args:
2744 reviewers (list(str)) - list of additional emails to use for reviewers.
2745 tbrs (list(str)) - list of additional emails to use for TBRs.
2746 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2747 the change that are missing OWNER coverage. If this is not None, you
2748 must also pass a value for `change`.
2749 change (Change) - The Change that should be used for OWNERS lookups.
2750 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002751 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002752 assert isinstance(tbrs, list), tbrs
2753
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002754 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002755 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002756
2757 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002758 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002759
2760 reviewers = set(reviewers)
2761 tbrs = set(tbrs)
2762 LOOKUP = {
2763 'TBR': tbrs,
2764 'R': reviewers,
2765 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002766
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002767 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002768 regexp = re.compile(self.R_LINE)
2769 matches = [regexp.match(line) for line in self._description_lines]
2770 new_desc = [l for i, l in enumerate(self._description_lines)
2771 if not matches[i]]
2772 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002773
agable@chromium.org42c20792013-09-12 17:34:49 +00002774 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002775
2776 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002777 for match in matches:
2778 if not match:
2779 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002780 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2781
2782 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002783 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002784 owners_db = owners.Database(change.RepositoryRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002785 fopen=open, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002786 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002787 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002788 LOOKUP[add_owners_to].update(
2789 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002790
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002791 # If any folks ended up in both groups, remove them from tbrs.
2792 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002793
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002794 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2795 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002796
2797 # Put the new lines in the description where the old first R= line was.
2798 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2799 if 0 <= line_loc < len(self._description_lines):
2800 if new_tbr_line:
2801 self._description_lines.insert(line_loc, new_tbr_line)
2802 if new_r_line:
2803 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002804 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002805 if new_r_line:
2806 self.append_footer(new_r_line)
2807 if new_tbr_line:
2808 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002809
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002810 def set_preserve_tryjobs(self):
2811 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2812 footers = git_footers.parse_footers(self.description)
2813 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2814 if v.lower() == 'true':
2815 return
2816 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2817
Anthony Polito8b955342019-09-24 19:01:36 +00002818 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002819 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002820 self.set_description([
2821 '# Enter a description of the change.',
2822 '# This will be displayed on the codereview site.',
2823 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002824 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002825 '--------------------',
2826 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002827 bug_regexp = re.compile(self.BUG_LINE)
2828 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002829 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002830 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2831 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002832 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002833
agable@chromium.org42c20792013-09-12 17:34:49 +00002834 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002835 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002836 if not content:
2837 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002838 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002839
Bruce Dawson2377b012018-01-11 16:46:49 -08002840 # Strip off comments and default inserted "Bug:" line.
2841 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002842 (line.startswith('#') or
2843 line.rstrip() == "Bug:" or
2844 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002845 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002846 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002847 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002848
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002849 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002850 """Adds a footer line to the description.
2851
2852 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2853 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2854 that Gerrit footers are always at the end.
2855 """
2856 parsed_footer_line = git_footers.parse_footer(line)
2857 if parsed_footer_line:
2858 # Line is a gerrit footer in the form: Footer-Key: any value.
2859 # Thus, must be appended observing Gerrit footer rules.
2860 self.set_description(
2861 git_footers.add_footer(self.description,
2862 key=parsed_footer_line[0],
2863 value=parsed_footer_line[1]))
2864 return
2865
2866 if not self._description_lines:
2867 self._description_lines.append(line)
2868 return
2869
2870 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2871 if gerrit_footers:
2872 # git_footers.split_footers ensures that there is an empty line before
2873 # actual (gerrit) footers, if any. We have to keep it that way.
2874 assert top_lines and top_lines[-1] == ''
2875 top_lines, separator = top_lines[:-1], top_lines[-1:]
2876 else:
2877 separator = [] # No need for separator if there are no gerrit_footers.
2878
2879 prev_line = top_lines[-1] if top_lines else ''
2880 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2881 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2882 top_lines.append('')
2883 top_lines.append(line)
2884 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002885
tandrii99a72f22016-08-17 14:33:24 -07002886 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002887 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002888 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002889 reviewers = [match.group(2).strip()
2890 for match in matches
2891 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002893
bradnelsond975b302016-10-23 12:20:23 -07002894 def get_cced(self):
2895 """Retrieves the list of reviewers."""
2896 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2897 cced = [match.group(2).strip() for match in matches if match]
2898 return cleanup_list(cced)
2899
Nodir Turakulov23b82142017-11-16 11:04:25 -08002900 def get_hash_tags(self):
2901 """Extracts and sanitizes a list of Gerrit hashtags."""
2902 subject = (self._description_lines or ('',))[0]
2903 subject = re.sub(
2904 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2905
2906 tags = []
2907 start = 0
2908 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2909 while True:
2910 m = bracket_exp.match(subject, start)
2911 if not m:
2912 break
2913 tags.append(self.sanitize_hash_tag(m.group(1)))
2914 start = m.end()
2915
2916 if not tags:
2917 # Try "Tag: " prefix.
2918 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2919 if m:
2920 tags.append(self.sanitize_hash_tag(m.group(1)))
2921 return tags
2922
2923 @classmethod
2924 def sanitize_hash_tag(cls, tag):
2925 """Returns a sanitized Gerrit hash tag.
2926
2927 A sanitized hashtag can be used as a git push refspec parameter value.
2928 """
2929 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2930
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002931 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2932 """Updates this commit description given the parent.
2933
2934 This is essentially what Gnumbd used to do.
2935 Consult https://goo.gl/WMmpDe for more details.
2936 """
2937 assert parent_msg # No, orphan branch creation isn't supported.
2938 assert parent_hash
2939 assert dest_ref
2940 parent_footer_map = git_footers.parse_footers(parent_msg)
2941 # This will also happily parse svn-position, which GnumbD is no longer
2942 # supporting. While we'd generate correct footers, the verifier plugin
2943 # installed in Gerrit will block such commit (ie git push below will fail).
2944 parent_position = git_footers.get_position(parent_footer_map)
2945
2946 # Cherry-picks may have last line obscuring their prior footers,
2947 # from git_footers perspective. This is also what Gnumbd did.
2948 cp_line = None
2949 if (self._description_lines and
2950 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2951 cp_line = self._description_lines.pop()
2952
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002953 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002954
2955 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2956 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002957 for i, line in enumerate(footer_lines):
2958 k, v = git_footers.parse_footer(line) or (None, None)
2959 if k and k.startswith('Cr-'):
2960 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002961
2962 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002963 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002964 if parent_position[0] == dest_ref:
2965 # Same branch as parent.
2966 number = int(parent_position[1]) + 1
2967 else:
2968 number = 1 # New branch, and extra lineage.
2969 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2970 int(parent_position[1])))
2971
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002972 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2973 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002974
2975 self._description_lines = top_lines
2976 if cp_line:
2977 self._description_lines.append(cp_line)
2978 if self._description_lines[-1] != '':
2979 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002980 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002981
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002982
Aaron Gablea1bab272017-04-11 16:38:18 -07002983def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002984 """Retrieves the reviewers that approved a CL from the issue properties with
2985 messages.
2986
2987 Note that the list may contain reviewers that are not committer, thus are not
2988 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002989
2990 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002991 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002992 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002993 return sorted(
2994 set(
2995 message['sender']
2996 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07002997 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002998 )
2999 )
3000
3001
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003002def FindCodereviewSettingsFile(filename='codereview.settings'):
3003 """Finds the given file starting in the cwd and going up.
3004
3005 Only looks up to the top of the repository unless an
3006 'inherit-review-settings-ok' file exists in the root of the repository.
3007 """
3008 inherit_ok_file = 'inherit-review-settings-ok'
3009 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003010 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003011 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3012 root = '/'
3013 while True:
3014 if filename in os.listdir(cwd):
3015 if os.path.isfile(os.path.join(cwd, filename)):
3016 return open(os.path.join(cwd, filename))
3017 if cwd == root:
3018 break
3019 cwd = os.path.dirname(cwd)
3020
3021
3022def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003023 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003024 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003025
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003026 def SetProperty(name, setting, unset_error_ok=False):
3027 fullname = 'rietveld.' + name
3028 if setting in keyvals:
3029 RunGit(['config', fullname, keyvals[setting]])
3030 else:
3031 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3032
tandrii48df5812016-10-17 03:55:37 -07003033 if not keyvals.get('GERRIT_HOST', False):
3034 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003035 # Only server setting is required. Other settings can be absent.
3036 # In that case, we ignore errors raised during option deletion attempt.
3037 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3038 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3039 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003040 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003041 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3042 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003043 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3044 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003045 SetProperty(
3046 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003047
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003048 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003049 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003050
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003051 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003052 RunGit(['config', 'gerrit.squash-uploads',
3053 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003054
tandrii@chromium.org28253532016-04-14 13:46:56 +00003055 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003056 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003057 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3058
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003059 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003060 # should be of the form
3061 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3062 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003063 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3064 keyvals['ORIGIN_URL_CONFIG']])
3065
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003066
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003067def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003068 """Downloads a network object to a local file, like urllib.urlretrieve.
3069
3070 This is necessary because urllib is broken for SSL connections via a proxy.
3071 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003072 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003073 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003074
3075
ukai@chromium.org712d6102013-11-27 00:52:58 +00003076def hasSheBang(fname):
3077 """Checks fname is a #! script."""
3078 with open(fname) as f:
3079 return f.read(2).startswith('#!')
3080
3081
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003082# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3083def DownloadHooks(*args, **kwargs):
3084 pass
3085
3086
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003087def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003088 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003089
3090 Args:
3091 force: True to update hooks. False to install hooks if not present.
3092 """
3093 if not settings.GetIsGerrit():
3094 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003095 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003096 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3097 if not os.access(dst, os.X_OK):
3098 if os.path.exists(dst):
3099 if not force:
3100 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003101 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003102 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003103 if not hasSheBang(dst):
3104 DieWithError('Not a script: %s\n'
3105 'You need to download from\n%s\n'
3106 'into .git/hooks/commit-msg and '
3107 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003108 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3109 except Exception:
3110 if os.path.exists(dst):
3111 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003112 DieWithError('\nFailed to download hooks.\n'
3113 'You need to download from\n%s\n'
3114 'into .git/hooks/commit-msg and '
3115 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003116
3117
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003118class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003119 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003120
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003121 _GOOGLESOURCE = 'googlesource.com'
3122
3123 def __init__(self):
3124 # Cached list of [host, identity, source], where source is either
3125 # .gitcookies or .netrc.
3126 self._all_hosts = None
3127
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003128 def ensure_configured_gitcookies(self):
3129 """Runs checks and suggests fixes to make git use .gitcookies from default
3130 path."""
3131 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3132 configured_path = RunGitSilent(
3133 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003134 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003135 if configured_path:
3136 self._ensure_default_gitcookies_path(configured_path, default)
3137 else:
3138 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003139
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003140 @staticmethod
3141 def _ensure_default_gitcookies_path(configured_path, default_path):
3142 assert configured_path
3143 if configured_path == default_path:
3144 print('git is already configured to use your .gitcookies from %s' %
3145 configured_path)
3146 return
3147
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003148 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003149 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3150 (configured_path, default_path))
3151
3152 if not os.path.exists(configured_path):
3153 print('However, your configured .gitcookies file is missing.')
3154 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3155 action='reconfigure')
3156 RunGit(['config', '--global', 'http.cookiefile', default_path])
3157 return
3158
3159 if os.path.exists(default_path):
3160 print('WARNING: default .gitcookies file already exists %s' %
3161 default_path)
3162 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3163 default_path)
3164
3165 confirm_or_exit('Move existing .gitcookies to default location?',
3166 action='move')
3167 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003168 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003169 print('Moved and reconfigured git to use .gitcookies from %s' %
3170 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003171
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003172 @staticmethod
3173 def _configure_gitcookies_path(default_path):
3174 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3175 if os.path.exists(netrc_path):
3176 print('You seem to be using outdated .netrc for git credentials: %s' %
3177 netrc_path)
3178 print('This tool will guide you through setting up recommended '
3179 '.gitcookies store for git credentials.\n'
3180 '\n'
3181 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3182 ' git config --global --unset http.cookiefile\n'
3183 ' mv %s %s.backup\n\n' % (default_path, default_path))
3184 confirm_or_exit(action='setup .gitcookies')
3185 RunGit(['config', '--global', 'http.cookiefile', default_path])
3186 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003187
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003188 def get_hosts_with_creds(self, include_netrc=False):
3189 if self._all_hosts is None:
3190 a = gerrit_util.CookiesAuthenticator()
3191 self._all_hosts = [
3192 (h, u, s)
3193 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003194 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3195 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003196 )
3197 if h.endswith(self._GOOGLESOURCE)
3198 ]
3199
3200 if include_netrc:
3201 return self._all_hosts
3202 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3203
3204 def print_current_creds(self, include_netrc=False):
3205 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3206 if not hosts:
3207 print('No Git/Gerrit credentials found')
3208 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003209 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003210 header = [('Host', 'User', 'Which file'),
3211 ['=' * l for l in lengths]]
3212 for row in (header + hosts):
3213 print('\t'.join((('%%+%ds' % l) % s)
3214 for l, s in zip(lengths, row)))
3215
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003216 @staticmethod
3217 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003218 """Parses identity "git-<username>.domain" into <username> and domain."""
3219 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003220 # distinguishable from sub-domains. But we do know typical domains:
3221 if identity.endswith('.chromium.org'):
3222 domain = 'chromium.org'
3223 username = identity[:-len('.chromium.org')]
3224 else:
3225 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003226 if username.startswith('git-'):
3227 username = username[len('git-'):]
3228 return username, domain
3229
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003230 def _canonical_git_googlesource_host(self, host):
3231 """Normalizes Gerrit hosts (with '-review') to Git host."""
3232 assert host.endswith(self._GOOGLESOURCE)
3233 # Prefix doesn't include '.' at the end.
3234 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3235 if prefix.endswith('-review'):
3236 prefix = prefix[:-len('-review')]
3237 return prefix + '.' + self._GOOGLESOURCE
3238
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003239 def _canonical_gerrit_googlesource_host(self, host):
3240 git_host = self._canonical_git_googlesource_host(host)
3241 prefix = git_host.split('.', 1)[0]
3242 return prefix + '-review.' + self._GOOGLESOURCE
3243
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003244 def _get_counterpart_host(self, host):
3245 assert host.endswith(self._GOOGLESOURCE)
3246 git = self._canonical_git_googlesource_host(host)
3247 gerrit = self._canonical_gerrit_googlesource_host(git)
3248 return git if gerrit == host else gerrit
3249
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003250 def has_generic_host(self):
3251 """Returns whether generic .googlesource.com has been configured.
3252
3253 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3254 """
3255 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3256 if host == '.' + self._GOOGLESOURCE:
3257 return True
3258 return False
3259
3260 def _get_git_gerrit_identity_pairs(self):
3261 """Returns map from canonic host to pair of identities (Git, Gerrit).
3262
3263 One of identities might be None, meaning not configured.
3264 """
3265 host_to_identity_pairs = {}
3266 for host, identity, _ in self.get_hosts_with_creds():
3267 canonical = self._canonical_git_googlesource_host(host)
3268 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3269 idx = 0 if canonical == host else 1
3270 pair[idx] = identity
3271 return host_to_identity_pairs
3272
3273 def get_partially_configured_hosts(self):
3274 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003275 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003276 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003277 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003278
3279 def get_conflicting_hosts(self):
3280 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003281 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003282 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003283 if None not in (i1, i2) and i1 != i2)
3284
3285 def get_duplicated_hosts(self):
3286 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003287 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003288
3289 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3290 'chromium.googlesource.com': 'chromium.org',
3291 'chrome-internal.googlesource.com': 'google.com',
3292 }
3293
3294 def get_hosts_with_wrong_identities(self):
3295 """Finds hosts which **likely** reference wrong identities.
3296
3297 Note: skips hosts which have conflicting identities for Git and Gerrit.
3298 """
3299 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003300 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003301 pair = self._get_git_gerrit_identity_pairs().get(host)
3302 if pair and pair[0] == pair[1]:
3303 _, domain = self._parse_identity(pair[0])
3304 if domain != expected:
3305 hosts.add(host)
3306 return hosts
3307
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003308 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003309 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003310 hosts = sorted(hosts)
3311 assert hosts
3312 if extra_column_func is None:
3313 extras = [''] * len(hosts)
3314 else:
3315 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003316 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3317 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003318 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003319 lines.append(tmpl % he)
3320 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003321
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003322 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003323 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003324 yield ('.googlesource.com wildcard record detected',
3325 ['Chrome Infrastructure team recommends to list full host names '
3326 'explicitly.'],
3327 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003328
3329 dups = self.get_duplicated_hosts()
3330 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003331 yield ('The following hosts were defined twice',
3332 self._format_hosts(dups),
3333 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003334
3335 partial = self.get_partially_configured_hosts()
3336 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003337 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3338 'These hosts are missing',
3339 self._format_hosts(partial, lambda host: 'but %s defined' %
3340 self._get_counterpart_host(host)),
3341 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003342
3343 conflicting = self.get_conflicting_hosts()
3344 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003345 yield ('The following Git hosts have differing credentials from their '
3346 'Gerrit counterparts',
3347 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3348 tuple(self._get_git_gerrit_identity_pairs()[host])),
3349 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003350
3351 wrong = self.get_hosts_with_wrong_identities()
3352 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003353 yield ('These hosts likely use wrong identity',
3354 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3355 (self._get_git_gerrit_identity_pairs()[host][0],
3356 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3357 wrong)
3358
3359 def find_and_report_problems(self):
3360 """Returns True if there was at least one problem, else False."""
3361 found = False
3362 bad_hosts = set()
3363 for title, sublines, hosts in self._find_problems():
3364 if not found:
3365 found = True
3366 print('\n\n.gitcookies problem report:\n')
3367 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003368 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003369 if sublines:
3370 print()
3371 print(' %s' % '\n '.join(sublines))
3372 print()
3373
3374 if bad_hosts:
3375 assert found
3376 print(' You can manually remove corresponding lines in your %s file and '
3377 'visit the following URLs with correct account to generate '
3378 'correct credential lines:\n' %
3379 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3380 print(' %s' % '\n '.join(sorted(set(
3381 gerrit_util.CookiesAuthenticator().get_new_password_url(
3382 self._canonical_git_googlesource_host(host))
3383 for host in bad_hosts
3384 ))))
3385 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003386
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003387
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003388@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003389def CMDcreds_check(parser, args):
3390 """Checks credentials and suggests changes."""
3391 _, _ = parser.parse_args(args)
3392
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003393 # Code below checks .gitcookies. Abort if using something else.
3394 authn = gerrit_util.Authenticator.get()
3395 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3396 if isinstance(authn, gerrit_util.GceAuthenticator):
3397 DieWithError(
3398 'This command is not designed for GCE, are you on a bot?\n'
3399 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3400 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003401 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003402 'This command is not designed for bot environment. It checks '
3403 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003404
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003405 checker = _GitCookiesChecker()
3406 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003407
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003408 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003409 checker.print_current_creds(include_netrc=True)
3410
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003411 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003412 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003413 return 0
3414 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003415
3416
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003417@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003418def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003419 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003420 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003421 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003422 _, args = parser.parse_args(args)
3423 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003424 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003425 return RunGit(['config', 'branch.%s.base-url' % branch],
3426 error_ok=False).strip()
3427 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003428 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003429 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3430 error_ok=False).strip()
3431
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003432
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003433def color_for_status(status):
3434 """Maps a Changelist status to color, for CMDstatus and other tools."""
3435 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003436 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003437 'waiting': Fore.BLUE,
3438 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003439 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003440 'lgtm': Fore.GREEN,
3441 'commit': Fore.MAGENTA,
3442 'closed': Fore.CYAN,
3443 'error': Fore.WHITE,
3444 }.get(status, Fore.WHITE)
3445
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003446
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003447def get_cl_statuses(changes, fine_grained, max_processes=None):
3448 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003449
3450 If fine_grained is true, this will fetch CL statuses from the server.
3451 Otherwise, simply indicate if there's a matching url for the given branches.
3452
3453 If max_processes is specified, it is used as the maximum number of processes
3454 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3455 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003456
3457 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003458 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003459 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003460 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003461
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003462 if not fine_grained:
3463 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003464 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003465 for cl in changes:
3466 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003467 return
3468
3469 # First, sort out authentication issues.
3470 logging.debug('ensuring credentials exist')
3471 for cl in changes:
3472 cl.EnsureAuthenticated(force=False, refresh=True)
3473
3474 def fetch(cl):
3475 try:
3476 return (cl, cl.GetStatus())
3477 except:
3478 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003479 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003480 raise
3481
3482 threads_count = len(changes)
3483 if max_processes:
3484 threads_count = max(1, min(threads_count, max_processes))
3485 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3486
Edward Lemur61bf4172020-02-24 23:22:37 +00003487 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003488 fetched_cls = set()
3489 try:
3490 it = pool.imap_unordered(fetch, changes).__iter__()
3491 while True:
3492 try:
3493 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003494 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003495 break
3496 fetched_cls.add(cl)
3497 yield cl, status
3498 finally:
3499 pool.close()
3500
3501 # Add any branches that failed to fetch.
3502 for cl in set(changes) - fetched_cls:
3503 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003504
rmistry@google.com2dd99862015-06-22 12:22:18 +00003505
3506def upload_branch_deps(cl, args):
3507 """Uploads CLs of local branches that are dependents of the current branch.
3508
3509 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003510
3511 test1 -> test2.1 -> test3.1
3512 -> test3.2
3513 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003514
3515 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3516 run on the dependent branches in this order:
3517 test2.1, test3.1, test3.2, test2.2, test3.3
3518
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003519 Note: This function does not rebase your local dependent branches. Use it
3520 when you make a change to the parent branch that will not conflict
3521 with its dependent branches, and you would like their dependencies
3522 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003523 """
3524 if git_common.is_dirty_git_tree('upload-branch-deps'):
3525 return 1
3526
3527 root_branch = cl.GetBranch()
3528 if root_branch is None:
3529 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3530 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003531 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003532 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3533 'patchset dependencies without an uploaded CL.')
3534
3535 branches = RunGit(['for-each-ref',
3536 '--format=%(refname:short) %(upstream:short)',
3537 'refs/heads'])
3538 if not branches:
3539 print('No local branches found.')
3540 return 0
3541
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003542 # Create a dictionary of all local branches to the branches that are
3543 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003544 tracked_to_dependents = collections.defaultdict(list)
3545 for b in branches.splitlines():
3546 tokens = b.split()
3547 if len(tokens) == 2:
3548 branch_name, tracked = tokens
3549 tracked_to_dependents[tracked].append(branch_name)
3550
vapiera7fbd5a2016-06-16 09:17:49 -07003551 print()
3552 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003553 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003554
rmistry@google.com2dd99862015-06-22 12:22:18 +00003555 def traverse_dependents_preorder(branch, padding=''):
3556 dependents_to_process = tracked_to_dependents.get(branch, [])
3557 padding += ' '
3558 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003559 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003560 dependents.append(dependent)
3561 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003562
rmistry@google.com2dd99862015-06-22 12:22:18 +00003563 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003564 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003565
3566 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003567 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003568 return 0
3569
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003570 confirm_or_exit('This command will checkout all dependent branches and run '
3571 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003572
rmistry@google.com2dd99862015-06-22 12:22:18 +00003573 # Record all dependents that failed to upload.
3574 failures = {}
3575 # Go through all dependents, checkout the branch and upload.
3576 try:
3577 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003578 print()
3579 print('--------------------------------------')
3580 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003581 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003582 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003583 try:
3584 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003585 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003586 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003587 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003588 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003589 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003590 finally:
3591 # Swap back to the original root branch.
3592 RunGit(['checkout', '-q', root_branch])
3593
vapiera7fbd5a2016-06-16 09:17:49 -07003594 print()
3595 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003596 for dependent_branch in dependents:
3597 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003598 print(' %s : %s' % (dependent_branch, upload_status))
3599 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003600
3601 return 0
3602
3603
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003604def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3605 """Given a proposed tag name, returns a tag name that is guaranteed to be
3606 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3607 or 'foo-3', and so on."""
3608
3609 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3610 for suffix_num in itertools.count(1):
3611 if suffix_num == 1:
3612 to_check = proposed_tag
3613 else:
3614 to_check = '%s-%d' % (proposed_tag, suffix_num)
3615
3616 if to_check not in existing_tags:
3617 return to_check
3618
3619
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003620@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003621def CMDarchive(parser, args):
3622 """Archives and deletes branches associated with closed changelists."""
3623 parser.add_option(
3624 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003625 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003626 parser.add_option(
3627 '-f', '--force', action='store_true',
3628 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003629 parser.add_option(
3630 '-d', '--dry-run', action='store_true',
3631 help='Skip the branch tagging and removal steps.')
3632 parser.add_option(
3633 '-t', '--notags', action='store_true',
3634 help='Do not tag archived branches. '
3635 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003636
kmarshall3bff56b2016-06-06 18:31:47 -07003637 options, args = parser.parse_args(args)
3638 if args:
3639 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003640
3641 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3642 if not branches:
3643 return 0
3644
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003645 tags = RunGit(['for-each-ref', '--format=%(refname)',
3646 'refs/tags']).splitlines() or []
3647 tags = [t.split('/')[-1] for t in tags]
3648
vapiera7fbd5a2016-06-16 09:17:49 -07003649 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003650 changes = [Changelist(branchref=b)
3651 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003652 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3653 statuses = get_cl_statuses(changes,
3654 fine_grained=True,
3655 max_processes=options.maxjobs)
3656 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003657 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3658 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003659 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003660 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003661 proposal.sort()
3662
3663 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003664 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003665 return 0
3666
Edward Lemur85153282020-02-14 22:06:29 +00003667 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003668
vapiera7fbd5a2016-06-16 09:17:49 -07003669 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003670 if options.notags:
3671 for next_item in proposal:
3672 print(' ' + next_item[0])
3673 else:
3674 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3675 for next_item in proposal:
3676 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003677
kmarshall9249e012016-08-23 12:02:16 -07003678 # Quit now on precondition failure or if instructed by the user, either
3679 # via an interactive prompt or by command line flags.
3680 if options.dry_run:
3681 print('\nNo changes were made (dry run).\n')
3682 return 0
3683 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003684 print('You are currently on a branch \'%s\' which is associated with a '
3685 'closed codereview issue, so archive cannot proceed. Please '
3686 'checkout another branch and run this command again.' %
3687 current_branch)
3688 return 1
kmarshall9249e012016-08-23 12:02:16 -07003689 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003690 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3691 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003692 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003693 return 1
3694
3695 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003696 if not options.notags:
3697 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003698
3699 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3700 # Clean up the tag if we failed to delete the branch.
3701 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003702
vapiera7fbd5a2016-06-16 09:17:49 -07003703 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003704
3705 return 0
3706
3707
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003708@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003709def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003710 """Show status of changelists.
3711
3712 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003713 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003714 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003715 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003716 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003717 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003718 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003719 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003720
3721 Also see 'git cl comments'.
3722 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003723 parser.add_option(
3724 '--no-branch-color',
3725 action='store_true',
3726 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003727 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003728 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003729 parser.add_option('-f', '--fast', action='store_true',
3730 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003731 parser.add_option(
3732 '-j', '--maxjobs', action='store', type=int,
3733 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003734 parser.add_option(
3735 '-i', '--issue', type=int,
3736 help='Operate on this issue instead of the current branch\'s implicit '
3737 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003738 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003739 if args:
3740 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003741
iannuccie53c9352016-08-17 14:40:40 -07003742 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003743 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003744
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003745 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003746 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003747 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003748 if cl.GetIssue():
3749 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003750 elif options.field == 'id':
3751 issueid = cl.GetIssue()
3752 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003753 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003754 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003755 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003756 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003757 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003758 elif options.field == 'status':
3759 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003760 elif options.field == 'url':
3761 url = cl.GetIssueURL()
3762 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003763 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003764 return 0
3765
3766 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3767 if not branches:
3768 print('No local branch found.')
3769 return 0
3770
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003771 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003772 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003773 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003774 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003775 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003776 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003777 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003778
Edward Lemur85153282020-02-14 22:06:29 +00003779 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003780
3781 def FormatBranchName(branch, colorize=False):
3782 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3783 an asterisk when it is the current branch."""
3784
3785 asterisk = ""
3786 color = Fore.RESET
3787 if branch == current_branch:
3788 asterisk = "* "
3789 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003790 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003791
3792 if colorize:
3793 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003794 return asterisk + branch_name
3795
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003796 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003797
3798 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003799 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3800 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003801 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003802 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003803 branch_statuses[c.GetBranch()] = status
3804 status = branch_statuses.pop(branch)
3805 url = cl.GetIssueURL()
3806 if url and (not status or status == 'error'):
3807 # The issue probably doesn't exist anymore.
3808 url += ' (broken)'
3809
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003810 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003811 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003812 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003813 color = ''
3814 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003815 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003816
Alan Cuttera3be9a52019-03-04 18:50:33 +00003817 branch_display = FormatBranchName(branch)
3818 padding = ' ' * (alignment - len(branch_display))
3819 if not options.no_branch_color:
3820 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003821
Alan Cuttera3be9a52019-03-04 18:50:33 +00003822 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3823 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003824
vapiera7fbd5a2016-06-16 09:17:49 -07003825 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003826 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003827 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003828 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003829 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003830 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003831 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003832 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003833 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003834 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003835 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003836 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003837 return 0
3838
3839
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003840def colorize_CMDstatus_doc():
3841 """To be called once in main() to add colors to git cl status help."""
3842 colors = [i for i in dir(Fore) if i[0].isupper()]
3843
3844 def colorize_line(line):
3845 for color in colors:
3846 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003847 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003848 indent = len(line) - len(line.lstrip(' ')) + 1
3849 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3850 return line
3851
3852 lines = CMDstatus.__doc__.splitlines()
3853 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3854
3855
phajdan.jre328cf92016-08-22 04:12:17 -07003856def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003857 if path == '-':
3858 json.dump(contents, sys.stdout)
3859 else:
3860 with open(path, 'w') as f:
3861 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003862
3863
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003864@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003865@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003866def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003867 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003868
3869 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003870 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003871 parser.add_option('-r', '--reverse', action='store_true',
3872 help='Lookup the branch(es) for the specified issues. If '
3873 'no issues are specified, all branches with mapped '
3874 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003875 parser.add_option('--json',
3876 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003877 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003878
dnj@chromium.org406c4402015-03-03 17:22:28 +00003879 if options.reverse:
3880 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003881 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003882 # Reverse issue lookup.
3883 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003884
3885 git_config = {}
3886 for config in RunGit(['config', '--get-regexp',
3887 r'branch\..*issue']).splitlines():
3888 name, _space, val = config.partition(' ')
3889 git_config[name] = val
3890
dnj@chromium.org406c4402015-03-03 17:22:28 +00003891 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003892 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003893 Changelist.IssueConfigKey())
3894 issue = git_config.get(config_key)
3895 if issue:
3896 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003897 if not args:
3898 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003899 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003900 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003901 try:
3902 issue_num = int(issue)
3903 except ValueError:
3904 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003905 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003906 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003907 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003908 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003909 if options.json:
3910 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003911 return 0
3912
3913 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003914 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003915 if not issue.valid:
3916 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3917 'or no argument to list it.\n'
3918 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003919 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003920 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003921 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003922 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003923 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3924 if options.json:
3925 write_json(options.json, {
3926 'issue': cl.GetIssue(),
3927 'issue_url': cl.GetIssueURL(),
3928 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003929 return 0
3930
3931
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003932@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003933def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003934 """Shows or posts review comments for any changelist."""
3935 parser.add_option('-a', '--add-comment', dest='comment',
3936 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003937 parser.add_option('-p', '--publish', action='store_true',
3938 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003939 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003940 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003941 parser.add_option('-m', '--machine-readable', dest='readable',
3942 action='store_false', default=True,
3943 help='output comments in a format compatible with '
3944 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003945 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003946 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003947 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003948
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003949 issue = None
3950 if options.issue:
3951 try:
3952 issue = int(options.issue)
3953 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003954 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003955
Edward Lemur934836a2019-09-09 20:16:54 +00003956 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003957
3958 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003959 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003960 return 0
3961
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003962 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3963 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003964 for comment in summary:
3965 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003966 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003967 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003968 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003969 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003970 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003971 elif comment.autogenerated:
3972 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003973 else:
3974 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003975 print('\n%s%s %s%s\n%s' % (
3976 color,
3977 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3978 comment.sender,
3979 Fore.RESET,
3980 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3981
smut@google.comc85ac942015-09-15 16:34:43 +00003982 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003983 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003984 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003985 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3986 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003987 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003988 return 0
3989
3990
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003991@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003992@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003993def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003994 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003995 parser.add_option('-d', '--display', action='store_true',
3996 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003997 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003998 help='New description to set for this issue (- for stdin, '
3999 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004000 parser.add_option('-f', '--force', action='store_true',
4001 help='Delete any unpublished Gerrit edits for this issue '
4002 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004003
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004004 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004005
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004006 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004007 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004008 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004009 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004010 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004011
Edward Lemur934836a2019-09-09 20:16:54 +00004012 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004013 if target_issue_arg:
4014 kwargs['issue'] = target_issue_arg.issue
4015 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004016
4017 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004018 if not cl.GetIssue():
4019 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004020
Edward Lemur678a6842019-10-03 22:25:05 +00004021 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004022 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004023
Edward Lemur6c6827c2020-02-06 21:15:18 +00004024 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004025
smut@google.com34fb6b12015-07-13 20:03:26 +00004026 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004027 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004028 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004029
4030 if options.new_description:
4031 text = options.new_description
4032 if text == '-':
4033 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004034 elif text == '+':
4035 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004036 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004037
4038 description.set_description(text)
4039 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004040 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004041 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004042 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004043 return 0
4044
4045
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004046@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004047def CMDlint(parser, args):
4048 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004049 parser.add_option('--filter', action='append', metavar='-x,+y',
4050 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004051 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004052
4053 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004054 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004055 try:
4056 import cpplint
4057 import cpplint_chromium
4058 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004059 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004060 return 1
4061
4062 # Change the current working directory before calling lint so that it
4063 # shows the correct base.
4064 previous_cwd = os.getcwd()
4065 os.chdir(settings.GetRoot())
4066 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004067 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004068 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004069 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004070 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004071 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004072 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004073
4074 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004075 command = args + files
4076 if options.filter:
4077 command = ['--filter=' + ','.join(options.filter)] + command
4078 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004079
4080 white_regex = re.compile(settings.GetLintRegex())
4081 black_regex = re.compile(settings.GetLintIgnoreRegex())
4082 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4083 for filename in filenames:
4084 if white_regex.match(filename):
4085 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004086 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004087 else:
4088 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4089 extra_check_functions)
4090 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004091 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004092 finally:
4093 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004094 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004095 if cpplint._cpplint_state.error_count != 0:
4096 return 1
4097 return 0
4098
4099
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004100@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004101def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004102 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004103 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004104 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004105 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004106 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004107 parser.add_option('--all', action='store_true',
4108 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004109 parser.add_option('--parallel', action='store_true',
4110 help='Run all tests specified by input_api.RunTests in all '
4111 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004112 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004113
sbc@chromium.org71437c02015-04-09 19:29:40 +00004114 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004115 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004116 return 1
4117
Edward Lemur934836a2019-09-09 20:16:54 +00004118 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004119 if args:
4120 base_branch = args[0]
4121 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004122 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004123 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004124
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004125 if cl.GetIssue():
4126 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004127 else:
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004128 description = cl.GetLocalDescription(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004129
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004130 cl.RunHook(
4131 committing=not options.upload,
4132 may_prompt=False,
4133 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004134 parallel=options.parallel,
4135 upstream=base_branch,
4136 description=description,
4137 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004138 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004139
4140
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004141def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004142 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004143
4144 Works the same way as
4145 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4146 but can be called on demand on all platforms.
4147
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004148 The basic idea is to generate git hash of a state of the tree, original
4149 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004150 """
4151 lines = []
4152 tree_hash = RunGitSilent(['write-tree'])
4153 lines.append('tree %s' % tree_hash.strip())
4154 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4155 if code == 0:
4156 lines.append('parent %s' % parent.strip())
4157 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4158 lines.append('author %s' % author.strip())
4159 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4160 lines.append('committer %s' % committer.strip())
4161 lines.append('')
4162 # Note: Gerrit's commit-hook actually cleans message of some lines and
4163 # whitespace. This code is not doing this, but it clearly won't decrease
4164 # entropy.
4165 lines.append(message)
4166 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004167 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004168 return 'I%s' % change_hash.strip()
4169
4170
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004171def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004172 """Computes the remote branch ref to use for the CL.
4173
4174 Args:
4175 remote (str): The git remote for the CL.
4176 remote_branch (str): The git remote branch for the CL.
4177 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004178 """
4179 if not (remote and remote_branch):
4180 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004181
wittman@chromium.org455dc922015-01-26 20:15:50 +00004182 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004183 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004184 # refs, which are then translated into the remote full symbolic refs
4185 # below.
4186 if '/' not in target_branch:
4187 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4188 else:
4189 prefix_replacements = (
4190 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4191 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4192 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4193 )
4194 match = None
4195 for regex, replacement in prefix_replacements:
4196 match = re.search(regex, target_branch)
4197 if match:
4198 remote_branch = target_branch.replace(match.group(0), replacement)
4199 break
4200 if not match:
4201 # This is a branch path but not one we recognize; use as-is.
4202 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004203 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4204 # Handle the refs that need to land in different refs.
4205 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004206
wittman@chromium.org455dc922015-01-26 20:15:50 +00004207 # Create the true path to the remote branch.
4208 # Does the following translation:
4209 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4210 # * refs/remotes/origin/master -> refs/heads/master
4211 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4212 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4213 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4214 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4215 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4216 'refs/heads/')
4217 elif remote_branch.startswith('refs/remotes/branch-heads'):
4218 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004219
wittman@chromium.org455dc922015-01-26 20:15:50 +00004220 return remote_branch
4221
4222
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004223def cleanup_list(l):
4224 """Fixes a list so that comma separated items are put as individual items.
4225
4226 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4227 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4228 """
4229 items = sum((i.split(',') for i in l), [])
4230 stripped_items = (i.strip() for i in items)
4231 return sorted(filter(None, stripped_items))
4232
4233
Aaron Gable4db38df2017-11-03 14:59:07 -07004234@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004235@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004236def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004237 """Uploads the current changelist to codereview.
4238
4239 Can skip dependency patchset uploads for a branch by running:
4240 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004241 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004242 git config --unset branch.branch_name.skip-deps-uploads
4243 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004244
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004245 If the name of the checked out branch starts with "bug-" or "fix-" followed
4246 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004247 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004248
4249 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004250 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004251 [git-cl] add support for hashtags
4252 Foo bar: implement foo
4253 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004254 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004255 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4256 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004257 parser.add_option('--bypass-watchlists', action='store_true',
4258 dest='bypass_watchlists',
4259 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004260 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004261 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004262 parser.add_option('--message', '-m', dest='message',
4263 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004264 parser.add_option('-b', '--bug',
4265 help='pre-populate the bug number(s) for this issue. '
4266 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004267 parser.add_option('--message-file', dest='message_file',
4268 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004269 parser.add_option('--title', '-t', dest='title',
4270 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004271 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004272 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004273 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004274 parser.add_option('--tbrs',
4275 action='append', default=[],
4276 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004277 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004278 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004279 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004280 parser.add_option('--hashtag', dest='hashtags',
4281 action='append', default=[],
4282 help=('Gerrit hashtag for new CL; '
4283 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004284 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004285 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004286 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004287 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004288 metavar='TARGET',
4289 help='Apply CL to remote ref TARGET. ' +
4290 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004291 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004292 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004293 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004294 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004295 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004296 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004297 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4298 const='TBR', help='add a set of OWNERS to TBR')
4299 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4300 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004301 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004302 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004303 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004304 'implies --send-mail')
4305 parser.add_option('-d', '--cq-dry-run',
4306 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004307 help='Send the patchset to do a CQ dry run right after '
4308 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004309 parser.add_option('--preserve-tryjobs', action='store_true',
4310 help='instruct the CQ to let tryjobs running even after '
4311 'new patchsets are uploaded instead of canceling '
4312 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004313 parser.add_option('--dependencies', action='store_true',
4314 help='Uploads CLs of all the local branches that depend on '
4315 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004316 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4317 help='Sends your change to the CQ after an approval. Only '
4318 'works on repos that have the Auto-Submit label '
4319 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004320 parser.add_option('--parallel', action='store_true',
4321 help='Run all tests specified by input_api.RunTests in all '
4322 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004323 parser.add_option('--no-autocc', action='store_true',
4324 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004325 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004326 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004327 parser.add_option('-R', '--retry-failed', action='store_true',
4328 help='Retry failed tryjobs from old patchset immediately '
4329 'after uploading new patchset. Cannot be used with '
4330 '--use-commit-queue or --cq-dry-run.')
4331 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4332 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004333 parser.add_option('--fixed', '-x',
4334 help='List of bugs that will be commented on and marked '
4335 'fixed (pre-populates "Fixed:" tag). Same format as '
4336 '-b option / "Bug:" tag. If fixing several issues, '
4337 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004338 parser.add_option('--edit-description', action='store_true', default=False,
4339 help='Modify description before upload. Cannot be used '
4340 'with --force. It is a noop when --no-squash is set '
4341 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004342
rmistry@google.com2dd99862015-06-22 12:22:18 +00004343 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004344 (options, args) = parser.parse_args(args)
4345
sbc@chromium.org71437c02015-04-09 19:29:40 +00004346 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004347 return 1
4348
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004349 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004350 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004351 options.cc = cleanup_list(options.cc)
4352
Josipe827b0f2020-01-30 00:07:20 +00004353 if options.edit_description and options.force:
4354 parser.error('Only one of --force and --edit-description allowed')
4355
tandriib80458a2016-06-23 12:20:07 -07004356 if options.message_file:
4357 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004358 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004359 options.message = gclient_utils.FileRead(options.message_file)
4360 options.message_file = None
4361
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004362 if ([options.cq_dry_run,
4363 options.use_commit_queue,
4364 options.retry_failed].count(True) > 1):
4365 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4366 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004367
Aaron Gableedbc4132017-09-11 13:22:28 -07004368 if options.use_commit_queue:
4369 options.send_mail = True
4370
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004371 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4372 settings.GetIsGerrit()
4373
Edward Lemur934836a2019-09-09 20:16:54 +00004374 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004375 # Warm change details cache now to avoid RPCs later, reducing latency for
4376 # developers.
4377 if cl.GetIssue():
4378 cl._GetChangeDetail(
4379 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4380
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004381 if options.retry_failed and not cl.GetIssue():
4382 print('No previous patchsets, so --retry-failed has no effect.')
4383 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004384
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004385 # cl.GetMostRecentPatchset uses cached information, and can return the last
4386 # patchset before upload. Calling it here makes it clear that it's the
4387 # last patchset before upload. Note that GetMostRecentPatchset will fail
4388 # if no CL has been uploaded yet.
4389 if options.retry_failed:
4390 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004391
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004392 ret = cl.CMDUpload(options, args, orig_args)
4393
4394 if options.retry_failed:
4395 if ret != 0:
4396 print('Upload failed, so --retry-failed has no effect.')
4397 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004398 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004399 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004400 jobs = _filter_failed_for_retry(builds)
4401 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004402 print('No failed tryjobs, so --retry-failed has no effect.')
4403 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004404 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004405
4406 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004407
4408
Francois Dorayd42c6812017-05-30 15:10:20 -04004409@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004410@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004411def CMDsplit(parser, args):
4412 """Splits a branch into smaller branches and uploads CLs.
4413
4414 Creates a branch and uploads a CL for each group of files modified in the
4415 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004416 comment, the string '$directory', is replaced with the directory containing
4417 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004418 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004419 parser.add_option('-d', '--description', dest='description_file',
4420 help='A text file containing a CL description in which '
4421 '$directory will be replaced by each CL\'s directory.')
4422 parser.add_option('-c', '--comment', dest='comment_file',
4423 help='A text file containing a CL comment.')
4424 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004425 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004426 help='List the files and reviewers for each CL that would '
4427 'be created, but don\'t create branches or CLs.')
4428 parser.add_option('--cq-dry-run', action='store_true',
4429 help='If set, will do a cq dry run for each uploaded CL. '
4430 'Please be careful when doing this; more than ~10 CLs '
4431 'has the potential to overload our build '
4432 'infrastructure. Try to upload these not during high '
4433 'load times (usually 11-3 Mountain View time). Email '
4434 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004435 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4436 default=True,
4437 help='Sends your change to the CQ after an approval. Only '
4438 'works on repos that have the Auto-Submit label '
4439 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004440 options, _ = parser.parse_args(args)
4441
4442 if not options.description_file:
4443 parser.error('No --description flag specified.')
4444
4445 def WrappedCMDupload(args):
4446 return CMDupload(OptionParser(), args)
4447
4448 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004449 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004450 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004451
4452
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004453@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004454@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004455def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004456 """DEPRECATED: Used to commit the current changelist via git-svn."""
4457 message = ('git-cl no longer supports committing to SVN repositories via '
4458 'git-svn. You probably want to use `git cl land` instead.')
4459 print(message)
4460 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004461
4462
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004463@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004464@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004465def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004466 """Commits the current changelist via git.
4467
4468 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4469 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004470 """
4471 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4472 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004473 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004474 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004475 parser.add_option('--parallel', action='store_true',
4476 help='Run all tests specified by input_api.RunTests in all '
4477 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004478 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004479
Edward Lemur934836a2019-09-09 20:16:54 +00004480 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004481
Robert Iannucci2e73d432018-03-14 01:10:47 -07004482 if not cl.GetIssue():
4483 DieWithError('You must upload the change first to Gerrit.\n'
4484 ' If you would rather have `git cl land` upload '
4485 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004486 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004487 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004488
4489
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004490@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004491@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004492def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004493 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004494 parser.add_option('-b', dest='newbranch',
4495 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004496 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004497 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004498 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004499 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004500
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004501 group = optparse.OptionGroup(
4502 parser,
4503 'Options for continuing work on the current issue uploaded from a '
4504 'different clone (e.g. different machine). Must be used independently '
4505 'from the other options. No issue number should be specified, and the '
4506 'branch must have an issue number associated with it')
4507 group.add_option('--reapply', action='store_true', dest='reapply',
4508 help='Reset the branch and reapply the issue.\n'
4509 'CAUTION: This will undo any local changes in this '
4510 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004511
4512 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004513 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004514 parser.add_option_group(group)
4515
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004516 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004517
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004518 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004519 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004520 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004521 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004522 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004523
Edward Lemur934836a2019-09-09 20:16:54 +00004524 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004525 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004526 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004527
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004528 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004529 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004530 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004531
4532 RunGit(['reset', '--hard', upstream])
4533 if options.pull:
4534 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004535
Edward Lemur678a6842019-10-03 22:25:05 +00004536 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4537 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004538
4539 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004540 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004541
Edward Lemurf38bc172019-09-03 21:02:13 +00004542 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004543 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004544 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004545
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004546 # We don't want uncommitted changes mixed up with the patch.
4547 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004548 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004549
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004550 if options.newbranch:
4551 if options.force:
4552 RunGit(['branch', '-D', options.newbranch],
4553 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004554 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004555
Edward Lemur678a6842019-10-03 22:25:05 +00004556 cl = Changelist(
4557 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004558
Edward Lemur678a6842019-10-03 22:25:05 +00004559 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004560 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004561
Edward Lemurf38bc172019-09-03 21:02:13 +00004562 return cl.CMDPatchWithParsedIssue(
4563 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004564
4565
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004566def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004567 """Fetches the tree status and returns either 'open', 'closed',
4568 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004569 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004570 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004571 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004572 if status.find('closed') != -1 or status == '0':
4573 return 'closed'
4574 elif status.find('open') != -1 or status == '1':
4575 return 'open'
4576 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004577 return 'unset'
4578
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004579
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004580def GetTreeStatusReason():
4581 """Fetches the tree status from a json url and returns the message
4582 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004583 url = settings.GetTreeStatusUrl()
4584 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004585 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004586 status = json.loads(connection.read())
4587 connection.close()
4588 return status['message']
4589
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004590
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004591@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004592def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004593 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004594 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004595 status = GetTreeStatus()
4596 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004597 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004598 return 2
4599
vapiera7fbd5a2016-06-16 09:17:49 -07004600 print('The tree is %s' % status)
4601 print()
4602 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004603 if status != 'open':
4604 return 1
4605 return 0
4606
4607
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004608@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004609def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004610 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4611 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004612 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004613 '-b', '--bot', action='append',
4614 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4615 'times to specify multiple builders. ex: '
4616 '"-b win_rel -b win_layout". See '
4617 'the try server waterfall for the builders name and the tests '
4618 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004619 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004620 '-B', '--bucket', default='',
4621 help=('Buildbucket bucket to send the try requests.'))
4622 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004623 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004624 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004625 'be determined by the try recipe that builder runs, which usually '
4626 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004627 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004628 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004629 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004630 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004631 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004632 '--category', default='git_cl_try', help='Specify custom build category.')
4633 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004634 '--project',
4635 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004636 'in recipe to determine to which repository or directory to '
4637 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004638 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004639 '-p', '--property', dest='properties', action='append', default=[],
4640 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004641 'key2=value2 etc. The value will be treated as '
4642 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004643 'NOTE: using this may make your tryjob not usable for CQ, '
4644 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004645 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004646 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4647 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004648 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004649 parser.add_option(
4650 '-R', '--retry-failed', action='store_true', default=False,
4651 help='Retry failed jobs from the latest set of tryjobs. '
4652 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004653 parser.add_option(
4654 '-i', '--issue', type=int,
4655 help='Operate on this issue instead of the current branch\'s implicit '
4656 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004657 options, args = parser.parse_args(args)
4658
machenbach@chromium.org45453142015-09-15 08:45:22 +00004659 # Make sure that all properties are prop=value pairs.
4660 bad_params = [x for x in options.properties if '=' not in x]
4661 if bad_params:
4662 parser.error('Got properties with missing "=": %s' % bad_params)
4663
maruel@chromium.org15192402012-09-06 12:38:29 +00004664 if args:
4665 parser.error('Unknown arguments: %s' % args)
4666
Edward Lemur934836a2019-09-09 20:16:54 +00004667 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004668 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004669 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004670
Edward Lemurf38bc172019-09-03 21:02:13 +00004671 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004672 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004673
tandriie113dfd2016-10-11 10:20:12 -07004674 error_message = cl.CannotTriggerTryJobReason()
4675 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004676 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004677
Edward Lemur45768512020-03-02 19:03:14 +00004678 if options.bot:
4679 if options.retry_failed:
4680 parser.error('--bot is not compatible with --retry-failed.')
4681 if not options.bucket:
4682 parser.error('A bucket (e.g. "chromium/try") is required.')
4683
4684 triggered = [b for b in options.bot if 'triggered' in b]
4685 if triggered:
4686 parser.error(
4687 'Cannot schedule builds on triggered bots: %s.\n'
4688 'This type of bot requires an initial job from a parent (usually a '
4689 'builder). Schedule a job on the parent instead.\n' % triggered)
4690
4691 if options.bucket.startswith('.master'):
4692 parser.error('Buildbot masters are not supported.')
4693
4694 project, bucket = _parse_bucket(options.bucket)
4695 if project is None or bucket is None:
4696 parser.error('Invalid bucket: %s.' % options.bucket)
4697 jobs = sorted((project, bucket, bot) for bot in options.bot)
4698 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004699 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004700 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004701 if options.verbose:
4702 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004703 jobs = _filter_failed_for_retry(builds)
4704 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004705 print('There are no failed jobs in the latest set of jobs '
4706 '(patchset #%d), doing nothing.' % patchset)
4707 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004708 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004709 if num_builders > 10:
4710 confirm_or_exit('There are %d builders with failed builds.'
4711 % num_builders, action='continue')
4712 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004713 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004714 print('git cl try with no bots now defaults to CQ dry run.')
4715 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4716 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004717
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004718 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004719 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004720 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004721 except BuildbucketResponseException as ex:
4722 print('ERROR: %s' % ex)
4723 return 1
4724 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004725
4726
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004727@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004728def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004729 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004730 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004731 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004732 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004733 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004734 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004735 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004736 '--color', action='store_true', default=setup_color.IS_TTY,
4737 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004738 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004739 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4740 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004741 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004742 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004743 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004744 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004745 parser.add_option(
4746 '-i', '--issue', type=int,
4747 help='Operate on this issue instead of the current branch\'s implicit '
4748 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004749 options, args = parser.parse_args(args)
4750 if args:
4751 parser.error('Unrecognized args: %s' % ' '.join(args))
4752
Edward Lemur934836a2019-09-09 20:16:54 +00004753 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004754 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004755 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004756
tandrii221ab252016-10-06 08:12:04 -07004757 patchset = options.patchset
4758 if not patchset:
4759 patchset = cl.GetMostRecentPatchset()
4760 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004761 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004762 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004763 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004764 cl.GetIssue())
4765
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004766 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004767 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004768 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004769 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004770 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004771 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004772 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004773 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004774 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004775 return 0
4776
4777
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004778@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004779@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004780def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004781 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004782 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004783 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004784 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004785
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004786 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004787 if args:
4788 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004789 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004790 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004791 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004792 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004793
4794 # Clear configured merge-base, if there is one.
4795 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004796 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004797 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004798 return 0
4799
4800
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004801@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004802def CMDweb(parser, args):
4803 """Opens the current CL in the web browser."""
4804 _, args = parser.parse_args(args)
4805 if args:
4806 parser.error('Unrecognized args: %s' % ' '.join(args))
4807
4808 issue_url = Changelist().GetIssueURL()
4809 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004810 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004811 return 1
4812
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004813 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004814 # allows us to hide the "Created new window in existing browser session."
4815 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004816 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004817 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004818 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004819 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004820 os.open(os.devnull, os.O_RDWR)
4821 try:
4822 webbrowser.open(issue_url)
4823 finally:
4824 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004825 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004826 return 0
4827
4828
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004829@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004830def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004831 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004832 parser.add_option('-d', '--dry-run', action='store_true',
4833 help='trigger in dry run mode')
4834 parser.add_option('-c', '--clear', action='store_true',
4835 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004836 parser.add_option(
4837 '-i', '--issue', type=int,
4838 help='Operate on this issue instead of the current branch\'s implicit '
4839 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004840 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004841 if args:
4842 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004843 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004844 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004845
Edward Lemur934836a2019-09-09 20:16:54 +00004846 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004847 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004848 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004849 elif options.dry_run:
4850 state = _CQState.DRY_RUN
4851 else:
4852 state = _CQState.COMMIT
4853 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004854 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004855 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004856 return 0
4857
4858
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004859@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004860def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004861 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004862 parser.add_option(
4863 '-i', '--issue', type=int,
4864 help='Operate on this issue instead of the current branch\'s implicit '
4865 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004866 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004867 if args:
4868 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004869 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004870 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004871 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004872 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004873 cl.CloseIssue()
4874 return 0
4875
4876
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004877@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004878def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004879 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004880 parser.add_option(
4881 '--stat',
4882 action='store_true',
4883 dest='stat',
4884 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004885 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004886 if args:
4887 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004888
Edward Lemur934836a2019-09-09 20:16:54 +00004889 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004890 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004891 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004892 if not issue:
4893 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004894
Aaron Gablea718c3e2017-08-28 17:47:28 -07004895 base = cl._GitGetBranchConfigValue('last-upload-hash')
4896 if not base:
4897 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4898 if not base:
4899 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4900 revision_info = detail['revisions'][detail['current_revision']]
4901 fetch_info = revision_info['fetch']['http']
4902 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4903 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004904
Aaron Gablea718c3e2017-08-28 17:47:28 -07004905 cmd = ['git', 'diff']
4906 if options.stat:
4907 cmd.append('--stat')
4908 cmd.append(base)
4909 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004910
4911 return 0
4912
4913
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004914@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004915def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004916 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004917 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004918 '--ignore-current',
4919 action='store_true',
4920 help='Ignore the CL\'s current reviewers and start from scratch.')
4921 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004922 '--ignore-self',
4923 action='store_true',
4924 help='Do not consider CL\'s author as an owners.')
4925 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004926 '--no-color',
4927 action='store_true',
4928 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004929 parser.add_option(
4930 '--batch',
4931 action='store_true',
4932 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004933 # TODO: Consider moving this to another command, since other
4934 # git-cl owners commands deal with owners for a given CL.
4935 parser.add_option(
4936 '--show-all',
4937 action='store_true',
4938 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004939 options, args = parser.parse_args(args)
4940
4941 author = RunGit(['config', 'user.email']).strip() or None
4942
Edward Lemur934836a2019-09-09 20:16:54 +00004943 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004944
Yang Guo6e269a02019-06-26 11:17:02 +00004945 if options.show_all:
4946 for arg in args:
4947 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004948 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004949 database.load_data_needed_for([arg])
4950 print('Owners for %s:' % arg)
4951 for owner in sorted(database.all_possible_owners([arg], None)):
4952 print(' - %s' % owner)
4953 return 0
4954
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004955 if args:
4956 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004957 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004958 base_branch = args[0]
4959 else:
4960 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004961 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004962
Edward Lemur7f6dec02020-02-06 20:23:58 +00004963 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004964 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4965
4966 if options.batch:
Edward Lemurb7f759f2020-03-04 21:20:56 +00004967 db = owners.Database(change.RepositoryRoot(), open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004968 print('\n'.join(db.reviewers_for(affected_files, author)))
4969 return 0
4970
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004971 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004972 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004973 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004974 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004975 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00004976 fopen=open, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004977 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004978 override_files=change.OriginalOwnersFiles(),
4979 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004980
4981
Aiden Bennerc08566e2018-10-03 17:52:42 +00004982def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004983 """Generates a diff command."""
4984 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004985 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4986
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004987 if allow_prefix:
4988 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4989 # case that diff.noprefix is set in the user's git config.
4990 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4991 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004992 diff_cmd += ['--no-prefix']
4993
4994 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004995
4996 if args:
4997 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004998 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004999 diff_cmd.append(arg)
5000 else:
5001 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005002
5003 return diff_cmd
5004
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005005
Jamie Madill5e96ad12020-01-13 16:08:35 +00005006def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5007 """Runs clang-format-diff and sets a return value if necessary."""
5008
5009 if not clang_diff_files:
5010 return 0
5011
5012 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5013 # formatted. This is used to block during the presubmit.
5014 return_value = 0
5015
5016 # Locate the clang-format binary in the checkout
5017 try:
5018 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5019 except clang_format.NotFoundError as e:
5020 DieWithError(e)
5021
5022 if opts.full or settings.GetFormatFullByDefault():
5023 cmd = [clang_format_tool]
5024 if not opts.dry_run and not opts.diff:
5025 cmd.append('-i')
5026 if opts.dry_run:
5027 for diff_file in clang_diff_files:
5028 with open(diff_file, 'r') as myfile:
5029 code = myfile.read().replace('\r\n', '\n')
5030 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5031 stdout = stdout.replace('\r\n', '\n')
5032 if opts.diff:
5033 sys.stdout.write(stdout)
5034 if code != stdout:
5035 return_value = 2
5036 else:
5037 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5038 if opts.diff:
5039 sys.stdout.write(stdout)
5040 else:
5041 env = os.environ.copy()
5042 env['PATH'] = str(os.path.dirname(clang_format_tool))
5043 try:
5044 script = clang_format.FindClangFormatScriptInChromiumTree(
5045 'clang-format-diff.py')
5046 except clang_format.NotFoundError as e:
5047 DieWithError(e)
5048
5049 cmd = [sys.executable, script, '-p0']
5050 if not opts.dry_run and not opts.diff:
5051 cmd.append('-i')
5052
5053 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005054 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005055
5056 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5057 if opts.diff:
5058 sys.stdout.write(stdout)
5059 if opts.dry_run and len(stdout) > 0:
5060 return_value = 2
5061
5062 return return_value
5063
5064
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005065def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005066 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005067 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005068
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005069
enne@chromium.org555cfe42014-01-29 18:21:39 +00005070@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005071@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005072def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005073 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005074 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005075 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005076 parser.add_option('--full', action='store_true',
5077 help='Reformat the full content of all touched files')
5078 parser.add_option('--dry-run', action='store_true',
5079 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005080 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005081 '--no-clang-format',
5082 dest='clang_format',
5083 action='store_false',
5084 default=True,
5085 help='Disables formatting of various file types using clang-format.')
5086 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005087 '--python',
5088 action='store_true',
5089 default=None,
5090 help='Enables python formatting on all python files.')
5091 parser.add_option(
5092 '--no-python',
5093 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005094 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005095 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005096 'If neither --python or --no-python are set, python files that have a '
5097 '.style.yapf file in an ancestor directory will be formatted. '
5098 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005099 parser.add_option(
5100 '--js',
5101 action='store_true',
5102 help='Format javascript code with clang-format. '
5103 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005104 parser.add_option('--diff', action='store_true',
5105 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005106 parser.add_option('--presubmit', action='store_true',
5107 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005108 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005109
Garrett Beaty91a6f332020-01-06 16:57:24 +00005110 if opts.python is not None and opts.no_python:
5111 raise parser.error('Cannot set both --python and --no-python')
5112 if opts.no_python:
5113 opts.python = False
5114
Daniel Chengc55eecf2016-12-30 03:11:02 -08005115 # Normalize any remaining args against the current path, so paths relative to
5116 # the current directory are still resolved as expected.
5117 args = [os.path.join(os.getcwd(), arg) for arg in args]
5118
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005119 # git diff generates paths against the root of the repository. Change
5120 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005121 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005122 if rel_base_path:
5123 os.chdir(rel_base_path)
5124
digit@chromium.org29e47272013-05-17 17:01:46 +00005125 # Grab the merge-base commit, i.e. the upstream commit of the current
5126 # branch when it was created or the last time it was rebased. This is
5127 # to cover the case where the user may have called "git fetch origin",
5128 # moving the origin branch to a newer commit, but hasn't rebased yet.
5129 upstream_commit = None
5130 cl = Changelist()
5131 upstream_branch = cl.GetUpstreamBranch()
5132 if upstream_branch:
5133 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5134 upstream_commit = upstream_commit.strip()
5135
5136 if not upstream_commit:
5137 DieWithError('Could not find base commit for this branch. '
5138 'Are you in detached state?')
5139
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005140 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5141 diff_output = RunGit(changed_files_cmd)
5142 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005143 # Filter out files deleted by this CL
5144 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005145
Andreas Haas417d89c2020-02-06 10:24:27 +00005146 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005147 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005148
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005149 clang_diff_files = []
5150 if opts.clang_format:
5151 clang_diff_files = [
5152 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5153 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005154 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5155 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005156 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005157
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005158 top_dir = os.path.normpath(
5159 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5160
Jamie Madill5e96ad12020-01-13 16:08:35 +00005161 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5162 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005163
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005164 # Similar code to above, but using yapf on .py files rather than clang-format
5165 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005166 py_explicitly_disabled = opts.python is not None and not opts.python
5167 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005168 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5169 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5170 if sys.platform.startswith('win'):
5171 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005172
Aiden Bennerc08566e2018-10-03 17:52:42 +00005173 # Used for caching.
5174 yapf_configs = {}
5175 for f in python_diff_files:
5176 # Find the yapf style config for the current file, defaults to depot
5177 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005178 _FindYapfConfigFile(f, yapf_configs, top_dir)
5179
5180 # Turn on python formatting by default if a yapf config is specified.
5181 # This breaks in the case of this repo though since the specified
5182 # style file is also the global default.
5183 if opts.python is None:
5184 filtered_py_files = []
5185 for f in python_diff_files:
5186 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5187 filtered_py_files.append(f)
5188 else:
5189 filtered_py_files = python_diff_files
5190
5191 # Note: yapf still seems to fix indentation of the entire file
5192 # even if line ranges are specified.
5193 # See https://github.com/google/yapf/issues/499
5194 if not opts.full and filtered_py_files:
5195 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5196
Brian Sheedyb4307d52019-12-02 19:18:17 +00005197 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5198 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5199 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005200
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005201 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005202 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5203 # Default to pep8 if not .style.yapf is found.
5204 if not yapf_style:
5205 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005206
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005207 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005208
5209 has_formattable_lines = False
5210 if not opts.full:
5211 # Only run yapf over changed line ranges.
5212 for diff_start, diff_len in py_line_diffs[f]:
5213 diff_end = diff_start + diff_len - 1
5214 # Yapf errors out if diff_end < diff_start but this
5215 # is a valid line range diff for a removal.
5216 if diff_end >= diff_start:
5217 has_formattable_lines = True
5218 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5219 # If all line diffs were removals we have nothing to format.
5220 if not has_formattable_lines:
5221 continue
5222
5223 if opts.diff or opts.dry_run:
5224 cmd += ['--diff']
5225 # Will return non-zero exit code if non-empty diff.
5226 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5227 if opts.diff:
5228 sys.stdout.write(stdout)
5229 elif len(stdout) > 0:
5230 return_value = 2
5231 else:
5232 cmd += ['-i']
5233 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005234
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005235 # Dart's formatter does not have the nice property of only operating on
5236 # modified chunks, so hard code full.
5237 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005238 try:
5239 command = [dart_format.FindDartFmtToolInChromiumTree()]
5240 if not opts.dry_run and not opts.diff:
5241 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005242 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005243
ppi@chromium.org6593d932016-03-03 15:41:15 +00005244 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005245 if opts.dry_run and stdout:
5246 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005247 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005248 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5249 'found in this checkout. Files in other languages are still '
5250 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005251
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005252 # Format GN build files. Always run on full build files for canonical form.
5253 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005254 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005255 if opts.dry_run or opts.diff:
5256 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005257 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005258 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5259 shell=sys.platform == 'win32',
5260 cwd=top_dir)
5261 if opts.dry_run and gn_ret == 2:
5262 return_value = 2 # Not formatted.
5263 elif opts.diff and gn_ret == 2:
5264 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005265 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005266 elif gn_ret != 0:
5267 # For non-dry run cases (and non-2 return values for dry-run), a
5268 # nonzero error code indicates a failure, probably because the file
5269 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005270 DieWithError('gn format failed on ' + gn_diff_file +
5271 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005272
Ilya Shermane081cbe2017-08-15 17:51:04 -07005273 # Skip the metrics formatting from the global presubmit hook. These files have
5274 # a separate presubmit hook that issues an error if the files need formatting,
5275 # whereas the top-level presubmit script merely issues a warning. Formatting
5276 # these files is somewhat slow, so it's important not to duplicate the work.
5277 if not opts.presubmit:
5278 for xml_dir in GetDirtyMetricsDirs(diff_files):
5279 tool_dir = os.path.join(top_dir, xml_dir)
5280 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5281 if opts.dry_run or opts.diff:
5282 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005283 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005284 if opts.diff:
5285 sys.stdout.write(stdout)
5286 if opts.dry_run and stdout:
5287 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005288
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005289 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005290
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005291
Steven Holte2e664bf2017-04-21 13:10:47 -07005292def GetDirtyMetricsDirs(diff_files):
5293 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5294 metrics_xml_dirs = [
5295 os.path.join('tools', 'metrics', 'actions'),
5296 os.path.join('tools', 'metrics', 'histograms'),
5297 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005298 os.path.join('tools', 'metrics', 'ukm'),
5299 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005300 for xml_dir in metrics_xml_dirs:
5301 if any(file.startswith(xml_dir) for file in xml_diff_files):
5302 yield xml_dir
5303
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005304
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005305@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005306@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005307def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005308 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005309 _, args = parser.parse_args(args)
5310
5311 if len(args) != 1:
5312 parser.print_help()
5313 return 1
5314
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005315 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005316 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005317 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005318
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005319 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005320
Edward Lemur52969c92020-02-06 18:15:28 +00005321 issueprefix = Changelist.IssueConfigKey()
5322 output = RunGit(['config', '--local', '--get-regexp',
5323 r'branch\..*\.%s' % issueprefix],
5324 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005325
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005326 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005327 for key, issue in [x.split() for x in output.splitlines()]:
5328 if issue == target_issue:
5329 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5330
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005331 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005332 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005333 return 1
5334 if len(branches) == 1:
5335 RunGit(['checkout', branches[0]])
5336 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005337 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005338 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005339 print('%d: %s' % (i, branches[i]))
Edward Lemur1a83da12020-03-04 21:18:36 +00005340 which = ask_for_data('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005341 try:
5342 RunGit(['checkout', branches[int(which)]])
5343 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005344 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005345 return 1
5346
5347 return 0
5348
5349
maruel@chromium.org29404b52014-09-08 22:58:00 +00005350def CMDlol(parser, args):
5351 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005352 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005353 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5354 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5355 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005356 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005357 return 0
5358
5359
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005360class OptionParser(optparse.OptionParser):
5361 """Creates the option parse and add --verbose support."""
5362 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005363 optparse.OptionParser.__init__(
5364 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005365 self.add_option(
5366 '-v', '--verbose', action='count', default=0,
5367 help='Use 2 times for more debugging info')
5368
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005369 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005370 try:
5371 return self._parse_args(args)
5372 finally:
5373 # Regardless of success or failure of args parsing, we want to report
5374 # metrics, but only after logging has been initialized (if parsing
5375 # succeeded).
5376 global settings
5377 settings = Settings()
5378
5379 if not metrics.DISABLE_METRICS_COLLECTION:
5380 # GetViewVCUrl ultimately calls logging method.
5381 project_url = settings.GetViewVCUrl().strip('/+')
5382 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5383 metrics.collector.add('project_urls', [project_url])
5384
5385 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005386 # Create an optparse.Values object that will store only the actual passed
5387 # options, without the defaults.
5388 actual_options = optparse.Values()
5389 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5390 # Create an optparse.Values object with the default options.
5391 options = optparse.Values(self.get_default_values().__dict__)
5392 # Update it with the options passed by the user.
5393 options._update_careful(actual_options.__dict__)
5394 # Store the options passed by the user in an _actual_options attribute.
5395 # We store only the keys, and not the values, since the values can contain
5396 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005397 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005398
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005399 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005400 logging.basicConfig(
5401 level=levels[min(options.verbose, len(levels) - 1)],
5402 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5403 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005404
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005405 return options, args
5406
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005407
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005408def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005409 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005410 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005411 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005412 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005413
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005414 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005415 dispatcher = subcommand.CommandDispatcher(__name__)
5416 try:
5417 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005418 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005419 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005420 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005421 if e.code != 500:
5422 raise
5423 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005424 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005425 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005426 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005427
5428
5429if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005430 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5431 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005432 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005433 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005434 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005435 sys.exit(main(sys.argv[1:]))