blob: e306baf57fd798e943c1309b7195279cdd4a5320 [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):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000414 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000415 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000416 shared_properties = {
417 'category': options.ensure_value('category', 'git_cl_try')
418 }
419 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000420 shared_properties['clobber'] = True
421 shared_properties.update(_get_properties_from_options(options) or {})
422
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000423 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000424 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000425 shared_tags.append({'key': 'retry_failed',
426 'value': '1'})
427
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000428 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000429 for (project, bucket, builder) in jobs:
430 properties = shared_properties.copy()
431 if 'presubmit' in builder.lower():
432 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000433
Edward Lemur45768512020-03-02 19:03:14 +0000434 requests.append({
435 'scheduleBuild': {
436 'requestId': str(uuid.uuid4()),
437 'builder': {
438 'project': getattr(options, 'project', None) or project,
439 'bucket': bucket,
440 'builder': builder,
441 },
442 'gerritChanges': gerrit_changes,
443 'properties': properties,
444 'tags': [
445 {'key': 'builder', 'value': builder},
446 ] + shared_tags,
447 }
448 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000449
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000450 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000451 requests[-1]['scheduleBuild']['gitilesCommit'] = {
452 'host': gerrit_changes[0]['host'],
453 'project': gerrit_changes[0]['project'],
454 'id': options.revision
455 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000456
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000457 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000458
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000459
Quinten Yearsley777660f2020-03-04 23:37:06 +0000460def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000461 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000462
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000463 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000464 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000465 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000466 request = {
467 'predicate': {
468 'gerritChanges': [changelist.GetGerritChange(patchset)],
469 },
470 'fields': ','.join('builds.*.' + field for field in fields),
471 }
tandrii221ab252016-10-06 08:12:04 -0700472
Edward Lemur5b929a42019-10-21 17:57:39 +0000473 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000474 if authenticator.has_cached_credentials():
475 http = authenticator.authorize(httplib2.Http())
476 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700477 print('Warning: Some results might be missing because %s' %
478 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000479 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000480 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000481 http.force_exception_to_status_code = True
482
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000483 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
484 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000485
Edward Lemur45768512020-03-02 19:03:14 +0000486
Edward Lemur5b929a42019-10-21 17:57:39 +0000487def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000488 """Fetches builds from the latest patchset that has builds (within
489 the last few patchsets).
490
491 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000492 changelist (Changelist): The CL to fetch builds for
493 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000494 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
495 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000496 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000497 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
498 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000499 """
500 assert buildbucket_host
501 assert changelist.GetIssue(), 'CL must be uploaded first'
502 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000503 if latest_patchset is None:
504 assert changelist.GetMostRecentPatchset()
505 ps = changelist.GetMostRecentPatchset()
506 else:
507 assert latest_patchset > 0, latest_patchset
508 ps = latest_patchset
509
Quinten Yearsley983111f2019-09-26 17:18:48 +0000510 min_ps = max(1, ps - 5)
511 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000512 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000513 if len(builds):
514 return builds, ps
515 ps -= 1
516 return [], 0
517
518
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000519def _filter_failed_for_retry(all_builds):
520 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000521
522 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000523 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000524 i.e. a list of buildbucket.v2.Builds which includes status and builder
525 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000526
527 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000528 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000529 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000530 """
Edward Lemur45768512020-03-02 19:03:14 +0000531 grouped = {}
532 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000533 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000534 key = (builder['project'], builder['bucket'], builder['builder'])
535 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000536
Edward Lemur45768512020-03-02 19:03:14 +0000537 jobs = []
538 for (project, bucket, builder), builds in grouped.items():
539 if 'triggered' in builder:
540 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
541 'from a parent. Please schedule a manual job for the parent '
542 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000543 continue
544 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
545 # Don't retry if any are running.
546 continue
Edward Lemur45768512020-03-02 19:03:14 +0000547 # If builder had several builds, retry only if the last one failed.
548 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
549 # build, but in case of retrying failed jobs retrying a flaky one makes
550 # sense.
551 builds = sorted(builds, key=lambda b: b['createTime'])
552 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
553 continue
554 # Don't retry experimental build previously triggered by CQ.
555 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
556 for t in builds[-1]['tags']):
557 continue
558 jobs.append((project, bucket, builder))
559
560 # Sort the jobs to make testing easier.
561 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000562
563
Quinten Yearsley777660f2020-03-04 23:37:06 +0000564def _print_tryjobs(options, builds):
565 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000567 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 return
569
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 longest_builder = max(len(b['builder']['builder']) for b in builds)
571 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000572 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000573 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
574 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000575
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000576 builds_by_status = {}
577 for b in builds:
578 builds_by_status.setdefault(b['status'], []).append({
579 'id': b['id'],
580 'name': name_fmt.format(
581 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
582 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000583
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000584 sort_key = lambda b: (b['name'], b['id'])
585
586 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000587 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000588 if not builds:
589 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000590
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000591 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000592 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594 else:
595 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
596
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000597 print(colorize(title))
598 for b in sorted(builds, key=sort_key):
599 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600
601 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 print_builds(
603 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
604 print_builds(
605 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
606 color=Fore.MAGENTA)
607 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
608 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
609 color=Fore.MAGENTA)
610 print_builds('Started:', builds_by_status.pop('STARTED', []))
611 print_builds(
612 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000613 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000614 print_builds(
615 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000616 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000617
618
Aiden Bennerc08566e2018-10-03 17:52:42 +0000619def _ComputeDiffLineRanges(files, upstream_commit):
620 """Gets the changed line ranges for each file since upstream_commit.
621
622 Parses a git diff on provided files and returns a dict that maps a file name
623 to an ordered list of range tuples in the form (start_line, count).
624 Ranges are in the same format as a git diff.
625 """
626 # If files is empty then diff_output will be a full diff.
627 if len(files) == 0:
628 return {}
629
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000630 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000631 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000632 diff_output = RunGit(diff_cmd)
633
634 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
635 # 2 capture groups
636 # 0 == fname of diff file
637 # 1 == 'diff_start,diff_count' or 'diff_start'
638 # will match each of
639 # diff --git a/foo.foo b/foo.py
640 # @@ -12,2 +14,3 @@
641 # @@ -12,2 +17 @@
642 # running re.findall on the above string with pattern will give
643 # [('foo.py', ''), ('', '14,3'), ('', '17')]
644
645 curr_file = None
646 line_diffs = {}
647 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
648 if match[0] != '':
649 # Will match the second filename in diff --git a/a.py b/b.py.
650 curr_file = match[0]
651 line_diffs[curr_file] = []
652 else:
653 # Matches +14,3
654 if ',' in match[1]:
655 diff_start, diff_count = match[1].split(',')
656 else:
657 # Single line changes are of the form +12 instead of +12,1.
658 diff_start = match[1]
659 diff_count = 1
660
661 diff_start = int(diff_start)
662 diff_count = int(diff_count)
663
664 # If diff_count == 0 this is a removal we can ignore.
665 line_diffs[curr_file].append((diff_start, diff_count))
666
667 return line_diffs
668
669
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000670def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000671 """Checks if a yapf file is in any parent directory of fpath until top_dir.
672
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000673 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000674 is found returns None. Uses yapf_config_cache as a cache for previously found
675 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000677 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000678 # Return result if we've already computed it.
679 if fpath in yapf_config_cache:
680 return yapf_config_cache[fpath]
681
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000682 parent_dir = os.path.dirname(fpath)
683 if os.path.isfile(fpath):
684 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000685 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000686 # Otherwise fpath is a directory
687 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
688 if os.path.isfile(yapf_file):
689 ret = yapf_file
690 elif fpath == top_dir or parent_dir == fpath:
691 # If we're at the top level directory, or if we're at root
692 # there is no provided style.
693 ret = None
694 else:
695 # Otherwise recurse on the current directory.
696 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000697 yapf_config_cache[fpath] = ret
698 return ret
699
700
Brian Sheedyb4307d52019-12-02 19:18:17 +0000701def _GetYapfIgnorePatterns(top_dir):
702 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000703
704 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
705 but this functionality appears to break when explicitly passing files to
706 yapf for formatting. According to
707 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
708 the .yapfignore file should be in the directory that yapf is invoked from,
709 which we assume to be the top level directory in this case.
710
711 Args:
712 top_dir: The top level directory for the repository being formatted.
713
714 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000715 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000716 """
717 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000718 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000719 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000720 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000721
Brian Sheedyb4307d52019-12-02 19:18:17 +0000722 with open(yapfignore_file) as f:
723 for line in f.readlines():
724 stripped_line = line.strip()
725 # Comments and blank lines should be ignored.
726 if stripped_line.startswith('#') or stripped_line == '':
727 continue
728 ignore_patterns.add(stripped_line)
729 return ignore_patterns
730
731
732def _FilterYapfIgnoredFiles(filepaths, patterns):
733 """Filters out any filepaths that match any of the given patterns.
734
735 Args:
736 filepaths: An iterable of strings containing filepaths to filter.
737 patterns: An iterable of strings containing fnmatch patterns to filter on.
738
739 Returns:
740 A list of strings containing all the elements of |filepaths| that did not
741 match any of the patterns in |patterns|.
742 """
743 # Not inlined so that tests can use the same implementation.
744 return [f for f in filepaths
745 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000746
747
Aaron Gable13101a62018-02-09 13:20:41 -0800748def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000749 """Prints statistics about the change to the user."""
750 # --no-ext-diff is broken in some versions of Git, so try to work around
751 # this by overriding the environment (but there is still a problem if the
752 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000753 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 if 'GIT_EXTERNAL_DIFF' in env:
755 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000756
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800758 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000759 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000760
761
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000762class BuildbucketResponseException(Exception):
763 pass
764
765
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000766class Settings(object):
767 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000769 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000770 self.tree_status_url = None
771 self.viewvc_url = None
772 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000773 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000774 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000775 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000776 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000777 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000778
Edward Lemur26964072020-02-19 19:18:51 +0000779 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000780 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000781 if self.updated:
782 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000783
Edward Lemur26964072020-02-19 19:18:51 +0000784 # The only value that actually changes the behavior is
785 # autoupdate = "false". Everything else means "true".
786 autoupdate = (
787 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
788
789 cr_settings_file = FindCodereviewSettingsFile()
790 if autoupdate != 'false' and cr_settings_file:
791 LoadCodereviewSettingsFromFile(cr_settings_file)
792 cr_settings_file.close()
793
794 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000796 @staticmethod
797 def GetRelativeRoot():
798 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000799
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000801 if self.root is None:
802 self.root = os.path.abspath(self.GetRelativeRoot())
803 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805 def GetTreeStatusUrl(self, error_ok=False):
806 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000807 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
808 if self.tree_status_url is None and not error_ok:
809 DieWithError(
810 'You must configure your tree status URL by running '
811 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812 return self.tree_status_url
813
814 def GetViewVCUrl(self):
815 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000816 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000817 return self.viewvc_url
818
rmistry@google.com90752582014-01-14 21:04:50 +0000819 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000820 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000821
rmistry@google.com5626a922015-02-26 14:03:30 +0000822 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000823 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000824 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000825 return run_post_upload_hook == "True"
826
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000827 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000828 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000829
ukai@chromium.orge8077812012-02-03 03:41:46 +0000830 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000831 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000832 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000833 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000834 return self.is_gerrit
835
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000836 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000837 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000838 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700839 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000840 if self.squash_gerrit_uploads is None:
841 # Default is squash now (http://crbug.com/611892#c23).
842 self.squash_gerrit_uploads = self._GetConfig(
843 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000844 return self.squash_gerrit_uploads
845
tandriia60502f2016-06-20 02:01:53 -0700846 def GetSquashGerritUploadsOverride(self):
847 """Return True or False if codereview.settings should be overridden.
848
849 Returns None if no override has been defined.
850 """
851 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000852 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700853 if result == 'true':
854 return True
855 if result == 'false':
856 return False
857 return None
858
tandrii@chromium.org28253532016-04-14 13:46:56 +0000859 def GetGerritSkipEnsureAuthenticated(self):
860 """Return True if EnsureAuthenticated should not be done for Gerrit
861 uploads."""
862 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000863 self.gerrit_skip_ensure_authenticated = self._GetConfig(
864 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000865 return self.gerrit_skip_ensure_authenticated
866
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000867 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000868 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000869 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000870 # Git requires single quotes for paths with spaces. We need to replace
871 # them with double quotes for Windows to treat such paths as a single
872 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000873 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000874 return self.git_editor or None
875
thestig@chromium.org44202a22014-03-11 19:22:18 +0000876 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000877 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000878
879 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000880 return self._GetConfig(
881 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000882
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000883 def GetFormatFullByDefault(self):
884 if self.format_full_by_default is None:
885 result = (
886 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
887 error_ok=True).strip())
888 self.format_full_by_default = (result == 'true')
889 return self.format_full_by_default
890
Edward Lemur26964072020-02-19 19:18:51 +0000891 def _GetConfig(self, key, default=''):
892 self._LazyUpdateIfNeeded()
893 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000894
895
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000896class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000897 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000898 NONE = 'none'
899 DRY_RUN = 'dry_run'
900 COMMIT = 'commit'
901
902 ALL_STATES = [NONE, DRY_RUN, COMMIT]
903
904
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000905class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000906 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000907 self.issue = issue
908 self.patchset = patchset
909 self.hostname = hostname
910
911 @property
912 def valid(self):
913 return self.issue is not None
914
915
Edward Lemurf38bc172019-09-03 21:02:13 +0000916def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000917 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
918 fail_result = _ParsedIssueNumberArgument()
919
Edward Lemur678a6842019-10-03 22:25:05 +0000920 if isinstance(arg, int):
921 return _ParsedIssueNumberArgument(issue=arg)
922 if not isinstance(arg, basestring):
923 return fail_result
924
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000925 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000926 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000927 if not arg.startswith('http'):
928 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700929
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000930 url = gclient_utils.UpgradeToHttps(arg)
931 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000932 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000933 except ValueError:
934 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200935
Edward Lemur678a6842019-10-03 22:25:05 +0000936 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
937 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
938 # Short urls like https://domain/<issue_number> can be used, but don't allow
939 # specifying the patchset (you'd 404), but we allow that here.
940 if parsed_url.path == '/':
941 part = parsed_url.fragment
942 else:
943 part = parsed_url.path
944
945 match = re.match(
946 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
947 if not match:
948 return fail_result
949
950 issue = int(match.group('issue'))
951 patchset = match.group('patchset')
952 return _ParsedIssueNumberArgument(
953 issue=issue,
954 patchset=int(patchset) if patchset else None,
955 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000956
957
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000958def _create_description_from_log(args):
959 """Pulls out the commit log to use as a base for the CL description."""
960 log_args = []
961 if len(args) == 1 and not args[0].endswith('.'):
962 log_args = [args[0] + '..']
963 elif len(args) == 1 and args[0].endswith('...'):
964 log_args = [args[0][:-1]]
965 elif len(args) == 2:
966 log_args = [args[0] + '..' + args[1]]
967 else:
968 log_args = args[:] # Hope for the best!
969 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
970
971
Aaron Gablea45ee112016-11-22 15:14:38 -0800972class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700973 def __init__(self, issue, url):
974 self.issue = issue
975 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800976 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700977
978 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800979 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700980 self.issue, self.url)
981
982
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100983_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000984 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100985 # TODO(tandrii): these two aren't known in Gerrit.
986 'approval', 'disapproval'])
987
988
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000989class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000990 """Changelist works with one changelist in local branch.
991
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000992 Notes:
993 * Not safe for concurrent multi-{thread,process} use.
994 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700995 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000996 """
997
Edward Lemur125d60a2019-09-13 18:25:41 +0000998 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000999 """Create a new ChangeList instance.
1000
Edward Lemurf38bc172019-09-03 21:02:13 +00001001 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001002 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001003 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001004 global settings
1005 if not settings:
1006 # Happens when git_cl.py is used as a utility library.
1007 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009 self.branchref = branchref
1010 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001011 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001012 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001013 else:
1014 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001015 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001016 self.lookedup_issue = False
1017 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018 self.description = None
Edward Lemur9aa1a962020-02-25 00:58:38 +00001019 self.local_description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001020 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001021 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001022 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001023 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001024 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001025 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001026
Edward Lemur125d60a2019-09-13 18:25:41 +00001027 # Lazily cached values.
1028 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1029 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1030 # Map from change number (issue) to its detail cache.
1031 self._detail_cache = {}
1032
1033 if codereview_host is not None:
1034 assert not codereview_host.startswith('https://'), codereview_host
1035 self._gerrit_host = codereview_host
1036 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001037
1038 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001039 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001040
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001041 The return value is a string suitable for passing to git cl with the --cc
1042 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001043 """
1044 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001045 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001046 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001047 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1048 return self.cc
1049
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001050 def GetCCListWithoutDefault(self):
1051 """Return the users cc'd on this CL excluding default ones."""
1052 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001053 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001054 return self.cc
1055
Daniel Cheng7227d212017-11-17 08:12:37 -08001056 def ExtendCC(self, more_cc):
1057 """Extends the list of users to cc on this CL based on the changed files."""
1058 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059
1060 def GetBranch(self):
1061 """Returns the short branch name, e.g. 'master'."""
1062 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001063 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001064 if not branchref:
1065 return None
1066 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001067 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001068 return self.branch
1069
1070 def GetBranchRef(self):
1071 """Returns the full branch name, e.g. 'refs/heads/master'."""
1072 self.GetBranch() # Poke the lazy loader.
1073 return self.branchref
1074
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001075 def ClearBranch(self):
1076 """Clears cached branch data of this object."""
1077 self.branch = self.branchref = None
1078
Edward Lemur85153282020-02-14 22:06:29 +00001079 def _GitGetBranchConfigValue(self, key, default=None):
1080 return scm.GIT.GetBranchConfig(
1081 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001082
Edward Lemur85153282020-02-14 22:06:29 +00001083 def _GitSetBranchConfigValue(self, key, value):
1084 action = 'set %s to %r' % (key, value)
1085 if not value:
1086 action = 'unset %s' % key
1087 assert self.GetBranch(), 'a branch is needed to ' + action
1088 return scm.GIT.SetBranchConfig(
1089 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001090
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001091 @staticmethod
1092 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001093 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001094 e.g. 'origin', 'refs/heads/master'
1095 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001096 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1097 settings.GetRoot(), branch)
1098 if not remote or not upstream_branch:
1099 DieWithError(
1100 'Unable to determine default branch to diff against.\n'
1101 'Either pass complete "git diff"-style arguments, like\n'
1102 ' git cl upload origin/master\n'
1103 'or verify this branch is set up to track another \n'
1104 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105
1106 return remote, upstream_branch
1107
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001108 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001109 upstream_branch = self.GetUpstreamBranch()
1110 if not BranchExists(upstream_branch):
1111 DieWithError('The upstream for the current branch (%s) does not exist '
1112 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001113 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001114 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001115
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 def GetUpstreamBranch(self):
1117 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001118 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001119 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001120 upstream_branch = upstream_branch.replace('refs/heads/',
1121 'refs/remotes/%s/' % remote)
1122 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1123 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001124 self.upstream_branch = upstream_branch
1125 return self.upstream_branch
1126
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001127 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001128 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001129 remote, branch = None, self.GetBranch()
1130 seen_branches = set()
1131 while branch not in seen_branches:
1132 seen_branches.add(branch)
1133 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001134 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001135 if remote != '.' or branch.startswith('refs/remotes'):
1136 break
1137 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001138 remotes = RunGit(['remote'], error_ok=True).split()
1139 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001140 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001141 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001142 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001143 logging.warn('Could not determine which remote this change is '
1144 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001145 else:
1146 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001147 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001148 branch = 'HEAD'
1149 if branch.startswith('refs/remotes'):
1150 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001151 elif branch.startswith('refs/branch-heads/'):
1152 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001153 else:
1154 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001155 return self._remote
1156
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001157 def GitSanityChecks(self, upstream_git_obj):
1158 """Checks git repo status and ensures diff is from local commits."""
1159
sbc@chromium.org79706062015-01-14 21:18:12 +00001160 if upstream_git_obj is None:
1161 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001162 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001163 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001164 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001165 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001166 return False
1167
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001168 # Verify the commit we're diffing against is in our current branch.
1169 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1170 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1171 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001172 print('ERROR: %s is not in the current branch. You may need to rebase '
1173 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 return False
1175
1176 # List the commits inside the diff, and verify they are all local.
1177 commits_in_diff = RunGit(
1178 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1179 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1180 remote_branch = remote_branch.strip()
1181 if code != 0:
1182 _, remote_branch = self.GetRemoteBranch()
1183
1184 commits_in_remote = RunGit(
1185 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1186
1187 common_commits = set(commits_in_diff) & set(commits_in_remote)
1188 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001189 print('ERROR: Your diff contains %d commits already in %s.\n'
1190 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1191 'the diff. If you are using a custom git flow, you can override'
1192 ' the reference used for this check with "git config '
1193 'gitcl.remotebranch <git-ref>".' % (
1194 len(common_commits), remote_branch, upstream_git_obj),
1195 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001196 return False
1197 return True
1198
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001199 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001200 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001201
1202 Returns None if it is not set.
1203 """
tandrii5d48c322016-08-18 16:19:37 -07001204 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001205
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001206 def GetRemoteUrl(self):
1207 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1208
1209 Returns None if there is no remote.
1210 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001211 is_cached, value = self._cached_remote_url
1212 if is_cached:
1213 return value
1214
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001215 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001216 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001217
Edward Lemur298f2cf2019-02-22 21:40:39 +00001218 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001219 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001220 if host:
1221 self._cached_remote_url = (True, url)
1222 return url
1223
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001224 # If it cannot be parsed as an url, assume it is a local directory,
1225 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001226 logging.warning('"%s" doesn\'t appear to point to a git host. '
1227 'Interpreting it as a local directory.', url)
1228 if not os.path.isdir(url):
1229 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001230 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1231 'but it doesn\'t exist.',
1232 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001233 return None
1234
1235 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001236 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001237
Edward Lemur79d4f992019-11-11 23:49:02 +00001238 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001239 if not host:
1240 logging.error(
1241 'Remote "%(remote)s" for branch "%(branch)s" points to '
1242 '"%(cache_path)s", but it is misconfigured.\n'
1243 '"%(cache_path)s" must be a git repo and must have a remote named '
1244 '"%(remote)s" pointing to the git host.', {
1245 'remote': remote,
1246 'cache_path': cache_path,
1247 'branch': self.GetBranch()})
1248 return None
1249
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001250 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001251 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001252
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001253 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001254 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001255 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001256 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1257 if self.issue is not None:
1258 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001259 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 return self.issue
1261
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001262 def GetIssueURL(self):
1263 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001264 issue = self.GetIssue()
1265 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001266 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001267 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001268
Edward Lemur7f6dec02020-02-06 20:23:58 +00001269 def GetLocalDescription(self, upstream_branch):
1270 """Return the log messages of all commits up to the branch point."""
Edward Lemur9aa1a962020-02-25 00:58:38 +00001271 if self.local_description is None:
1272 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1273 self.local_description = RunGitWithCode(args)[1].strip()
1274 return self.local_description
Edward Lemur7f6dec02020-02-06 20:23:58 +00001275
Edward Lemur6c6827c2020-02-06 21:15:18 +00001276 def FetchDescription(self, pretty=False):
1277 assert self.GetIssue(), 'issue is required to query Gerrit'
1278
Edward Lemur9aa1a962020-02-25 00:58:38 +00001279 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001280 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1281 current_rev = data['current_revision']
1282 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001283
1284 if not pretty:
1285 return self.description
1286
1287 # Set width to 72 columns + 2 space indent.
1288 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1289 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1290 lines = self.description.splitlines()
1291 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292
1293 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001294 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001295 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001296 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1297 if self.patchset is not None:
1298 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001299 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300 return self.patchset
1301
Edward Lemur9aa1a962020-02-25 00:58:38 +00001302 def GetAuthor(self):
1303 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1304
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001305 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001306 """Set this branch's patchset. If patchset=0, clears the patchset."""
1307 assert self.GetBranch()
1308 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001309 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001310 else:
1311 self.patchset = int(patchset)
1312 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001313 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001314
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001315 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001316 """Set this branch's issue. If issue isn't given, clears the issue."""
1317 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001318 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001319 issue = int(issue)
1320 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001321 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001322 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001323 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001324 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001325 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001326 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001327 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001328 else:
tandrii5d48c322016-08-18 16:19:37 -07001329 # Reset all of these just to be clean.
1330 reset_suffixes = [
1331 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001332 self.IssueConfigKey(),
1333 self.PatchsetConfigKey(),
1334 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001335 ] + self._PostUnsetIssueProperties()
1336 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001337 try:
1338 self._GitSetBranchConfigValue(prop, None)
1339 except subprocess2.CalledProcessError:
1340 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001341 msg = RunGit(['log', '-1', '--format=%B']).strip()
1342 if msg and git_footers.get_footer_change_id(msg):
1343 print('WARNING: The change patched into this branch has a Change-Id. '
1344 'Removing it.')
1345 RunGit(['commit', '--amend', '-m',
1346 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001347 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001348 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001349 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001350
Edward Lemur7f6dec02020-02-06 20:23:58 +00001351 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001352 if not self.GitSanityChecks(upstream_branch):
1353 DieWithError('\nGit sanity check failure')
1354
Edward Lemur7f6dec02020-02-06 20:23:58 +00001355 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001356 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001357 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001358 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001359 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001360 except subprocess2.CalledProcessError:
1361 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001362 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001363 'This branch probably doesn\'t exist anymore. To reset the\n'
1364 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001365 ' git branch --set-upstream-to origin/master %s\n'
1366 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001367 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001368
maruel@chromium.org52424302012-08-29 15:14:30 +00001369 issue = self.GetIssue()
1370 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001371 if issue:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001372 description = self.FetchDescription()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001373 else:
1374 # If the change was never uploaded, use the log messages of all commits
1375 # up to the branch point, as git cl upload will prefill the description
1376 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001377 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001378
Edward Lemur9aa1a962020-02-25 00:58:38 +00001379 author = self.GetAuthor()
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001380 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001381 name,
1382 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001383 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001384 files,
1385 issue,
1386 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001387 author,
1388 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001389
dsansomee2d6fd92016-09-08 00:10:47 -07001390 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001391 assert self.GetIssue(), 'issue is required to update description'
1392
1393 if gerrit_util.HasPendingChangeEdit(
1394 self._GetGerritHost(), self._GerritChangeIdentifier()):
1395 if not force:
1396 confirm_or_exit(
1397 'The description cannot be modified while the issue has a pending '
1398 'unpublished edit. Either publish the edit in the Gerrit web UI '
1399 'or delete it.\n\n', action='delete the unpublished edit')
1400
1401 gerrit_util.DeletePendingChangeEdit(
1402 self._GetGerritHost(), self._GerritChangeIdentifier())
1403 gerrit_util.SetCommitMessage(
1404 self._GetGerritHost(), self._GerritChangeIdentifier(),
1405 description, notify='NONE')
1406
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001407 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001408
Edward Lemur75526302020-02-27 22:31:05 +00001409 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001410 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001411 '--root', settings.GetRoot(),
1412 '--upstream', upstream,
1413 ]
1414
1415 args.extend(['--verbose'] * verbose)
1416
Edward Lemur99df04e2020-03-05 19:39:43 +00001417 author = self.GetAuthor()
1418 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001419 issue = self.GetIssue()
1420 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001421 if author:
1422 args.extend(['--author', author])
1423 if gerrit_url:
1424 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001425 if issue:
1426 args.extend(['--issue', str(issue)])
1427 if patchset:
1428 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001429
Edward Lemur75526302020-02-27 22:31:05 +00001430 return args
1431
1432 def RunHook(
1433 self, committing, may_prompt, verbose, parallel, upstream, description,
1434 all_files):
1435 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1436 args = self._GetCommonPresubmitArgs(verbose, upstream)
1437 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001438 if may_prompt:
1439 args.append('--may_prompt')
1440 if parallel:
1441 args.append('--parallel')
1442 if all_files:
1443 args.append('--all_files')
1444
1445 with gclient_utils.temporary_file() as description_file:
1446 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001447
1448 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001449 args.extend(['--json_output', json_output])
1450 args.extend(['--description_file', description_file])
1451
1452 start = time_time()
1453 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1454 exit_code = p.wait()
1455 metrics.collector.add_repeated('sub_commands', {
1456 'command': 'presubmit',
1457 'execution_time': time_time() - start,
1458 'exit_code': exit_code,
1459 })
1460
1461 if exit_code:
1462 sys.exit(exit_code)
1463
1464 json_results = gclient_utils.FileRead(json_output)
1465 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001466
Edward Lemur75526302020-02-27 22:31:05 +00001467 def RunPostUploadHook(self, verbose, upstream, description):
1468 args = self._GetCommonPresubmitArgs(verbose, upstream)
1469 args.append('--post_upload')
1470
1471 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001472 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001473 args.extend(['--description_file', description_file])
1474 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1475 p.wait()
1476
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001477 def CMDUpload(self, options, git_diff_args, orig_args):
1478 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001479 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001480 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001481 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001482 else:
1483 if self.GetBranch() is None:
1484 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1485
1486 # Default to diffing against common ancestor of upstream branch
1487 base_branch = self.GetCommonAncestorWithUpstream()
1488 git_diff_args = [base_branch, 'HEAD']
1489
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001490 # Fast best-effort checks to abort before running potentially expensive
1491 # hooks if uploading is likely to fail anyway. Passing these checks does
1492 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001493 self.EnsureAuthenticated(force=options.force)
1494 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001495
1496 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001497 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001498 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1499 files = [f.LocalPath() for f in change.AffectedFiles()]
1500 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001501 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001502
Edward Lemur1a83da12020-03-04 21:18:36 +00001503 if self.GetIssue():
1504 description = self.FetchDescription()
1505 else:
1506 description = self.GetLocalDescription(base_branch)
Edward Lemur75526302020-02-27 22:31:05 +00001507 if options.reviewers or options.tbrs or options.add_owners_to:
1508 # Set the reviewer list now so that presubmit checks can access it.
1509 change_description = ChangeDescription(description)
1510 change_description.update_reviewers(options.reviewers,
1511 options.tbrs,
1512 options.add_owners_to,
1513 change)
1514 description = change_description.description
1515
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001516 if not options.bypass_hooks:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001517 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001518 may_prompt=not options.force,
1519 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001520 parallel=options.parallel,
1521 upstream=base_branch,
1522 description=description,
1523 all_files=False)
1524 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001525
Aaron Gable13101a62018-02-09 13:20:41 -08001526 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001527 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001528 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001529 self._GitSetBranchConfigValue(
1530 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001531 # Run post upload hooks, if specified.
1532 if settings.GetRunPostUploadHook():
Edward Lemur75526302020-02-27 22:31:05 +00001533 self.RunPostUploadHook(options.verbose, base_branch, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001534
1535 # Upload all dependencies if specified.
1536 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001537 print()
1538 print('--dependencies has been specified.')
1539 print('All dependent local branches will be re-uploaded.')
1540 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001541 # Remove the dependencies flag from args so that we do not end up in a
1542 # loop.
1543 orig_args.remove('--dependencies')
1544 ret = upload_branch_deps(self, orig_args)
1545 return ret
1546
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001547 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001548 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001549
1550 Issue must have been already uploaded and known.
1551 """
1552 assert new_state in _CQState.ALL_STATES
1553 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001554 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001555 vote_map = {
1556 _CQState.NONE: 0,
1557 _CQState.DRY_RUN: 1,
1558 _CQState.COMMIT: 2,
1559 }
1560 labels = {'Commit-Queue': vote_map[new_state]}
1561 notify = False if new_state == _CQState.DRY_RUN else None
1562 gerrit_util.SetReview(
1563 self._GetGerritHost(), self._GerritChangeIdentifier(),
1564 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001565 return 0
1566 except KeyboardInterrupt:
1567 raise
1568 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001569 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001570 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001571 ' * Your project has no CQ,\n'
1572 ' * You don\'t have permission to change the CQ state,\n'
1573 ' * There\'s a bug in this code (see stack trace below).\n'
1574 'Consider specifying which bots to trigger manually or asking your '
1575 'project owners for permissions or contacting Chrome Infra at:\n'
1576 'https://www.chromium.org/infra\n\n' %
1577 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001578 # Still raise exception so that stack trace is printed.
1579 raise
1580
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001581 def _GetGerritHost(self):
1582 # Lazy load of configs.
1583 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001584 if self._gerrit_host and '.' not in self._gerrit_host:
1585 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1586 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001587 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001588 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001589 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001590 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001591 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1592 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001593 return self._gerrit_host
1594
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001595 def _GetGitHost(self):
1596 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001597 remote_url = self.GetRemoteUrl()
1598 if not remote_url:
1599 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001600 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001601
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001602 def GetCodereviewServer(self):
1603 if not self._gerrit_server:
1604 # If we're on a branch then get the server potentially associated
1605 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001606 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001607 self._gerrit_server = self._GitGetBranchConfigValue(
1608 self.CodereviewServerConfigKey())
1609 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001610 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001611 if not self._gerrit_server:
1612 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1613 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001614 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001615 parts[0] = parts[0] + '-review'
1616 self._gerrit_host = '.'.join(parts)
1617 self._gerrit_server = 'https://%s' % self._gerrit_host
1618 return self._gerrit_server
1619
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001620 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001621 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001622 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001623 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001624 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001625 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001626 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001627 if project.endswith('.git'):
1628 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001629 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1630 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1631 # gitiles/git-over-https protocol. E.g.,
1632 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1633 # as
1634 # https://chromium.googlesource.com/v8/v8
1635 if project.startswith('a/'):
1636 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001637 return project
1638
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001639 def _GerritChangeIdentifier(self):
1640 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1641
1642 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001643 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001644 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001645 project = self._GetGerritProject()
1646 if project:
1647 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1648 # Fall back on still unique, but less efficient change number.
1649 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001650
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001651 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001652 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001653 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001654
tandrii5d48c322016-08-18 16:19:37 -07001655 @classmethod
1656 def PatchsetConfigKey(cls):
1657 return 'gerritpatchset'
1658
1659 @classmethod
1660 def CodereviewServerConfigKey(cls):
1661 return 'gerritserver'
1662
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001663 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001664 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001665 if settings.GetGerritSkipEnsureAuthenticated():
1666 # For projects with unusual authentication schemes.
1667 # See http://crbug.com/603378.
1668 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001669
1670 # Check presence of cookies only if using cookies-based auth method.
1671 cookie_auth = gerrit_util.Authenticator.get()
1672 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001673 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001674
Florian Mayerae510e82020-01-30 21:04:48 +00001675 remote_url = self.GetRemoteUrl()
1676 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001677 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001678 return
1679 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001680 logging.warning('Ignoring branch %(branch)s with non-https remote '
1681 '%(remote)s', {
1682 'branch': self.branch,
1683 'remote': self.GetRemoteUrl()
1684 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001685 return
1686
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001687 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001688 self.GetCodereviewServer()
1689 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001690 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001691
1692 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1693 git_auth = cookie_auth.get_auth_header(git_host)
1694 if gerrit_auth and git_auth:
1695 if gerrit_auth == git_auth:
1696 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001697 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001698 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001699 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001700 ' %s\n'
1701 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001702 ' Consider running the following command:\n'
1703 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001704 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001705 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001706 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001707 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001708 cookie_auth.get_new_password_message(git_host)))
1709 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001710 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001711 return
1712 else:
1713 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001714 ([] if gerrit_auth else [self._gerrit_host]) +
1715 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001716 DieWithError('Credentials for the following hosts are required:\n'
1717 ' %s\n'
1718 'These are read from %s (or legacy %s)\n'
1719 '%s' % (
1720 '\n '.join(missing),
1721 cookie_auth.get_gitcookies_path(),
1722 cookie_auth.get_netrc_path(),
1723 cookie_auth.get_new_password_message(git_host)))
1724
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001725 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001726 if not self.GetIssue():
1727 return
1728
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001729 status = self._GetChangeDetail()['status']
1730 if status in ('MERGED', 'ABANDONED'):
1731 DieWithError('Change %s has been %s, new uploads are not allowed' %
1732 (self.GetIssueURL(),
1733 'submitted' if status == 'MERGED' else 'abandoned'))
1734
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001735 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1736 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1737 # Apparently this check is not very important? Otherwise get_auth_email
1738 # could have been added to other implementations of Authenticator.
1739 cookies_auth = gerrit_util.Authenticator.get()
1740 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001741 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001742
1743 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001744 if self.GetIssueOwner() == cookies_user:
1745 return
1746 logging.debug('change %s owner is %s, cookies user is %s',
1747 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001748 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001749 # so ask what Gerrit thinks of this user.
1750 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1751 if details['email'] == self.GetIssueOwner():
1752 return
1753 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001754 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001755 'as %s.\n'
1756 'Uploading may fail due to lack of permissions.' %
1757 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1758 confirm_or_exit(action='upload')
1759
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001760 def _PostUnsetIssueProperties(self):
1761 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001762 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001763
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001764 def GetGerritObjForPresubmit(self):
1765 return presubmit_support.GerritAccessor(self._GetGerritHost())
1766
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001767 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001768 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001769 or CQ status, assuming adherence to a common workflow.
1770
1771 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001772 * 'error' - error from review tool (including deleted issues)
1773 * 'unsent' - no reviewers added
1774 * 'waiting' - waiting for review
1775 * 'reply' - waiting for uploader to reply to review
1776 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001777 * 'dry-run' - dry-running in the CQ
1778 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001779 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001780 """
1781 if not self.GetIssue():
1782 return None
1783
1784 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001785 data = self._GetChangeDetail([
1786 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001787 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001788 return 'error'
1789
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001790 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001791 return 'closed'
1792
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001793 cq_label = data['labels'].get('Commit-Queue', {})
1794 max_cq_vote = 0
1795 for vote in cq_label.get('all', []):
1796 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1797 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001798 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001799 if max_cq_vote == 1:
1800 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001801
Aaron Gable9ab38c62017-04-06 14:36:33 -07001802 if data['labels'].get('Code-Review', {}).get('approved'):
1803 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001804
1805 if not data.get('reviewers', {}).get('REVIEWER', []):
1806 return 'unsent'
1807
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001808 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001809 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001810 last_message_author = messages.pop().get('author', {})
1811 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001812 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1813 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001814 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001815 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001816 if last_message_author.get('_account_id') == owner:
1817 # Most recent message was by owner.
1818 return 'waiting'
1819 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001820 # Some reply from non-owner.
1821 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001822
1823 # Somehow there are no messages even though there are reviewers.
1824 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001825
1826 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001827 if not self.GetIssue():
1828 return None
1829
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001830 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001831 patchset = data['revisions'][data['current_revision']]['_number']
1832 self.SetPatchset(patchset)
1833 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001834
Aaron Gable636b13f2017-07-14 10:42:48 -07001835 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001836 gerrit_util.SetReview(
1837 self._GetGerritHost(), self._GerritChangeIdentifier(),
1838 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001839
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001840 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001841 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001842 # CURRENT_REVISION is included to get the latest patchset so that
1843 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001844 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001845 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1846 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001847 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001848 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001849 robot_file_comments = gerrit_util.GetChangeRobotComments(
1850 self._GetGerritHost(), self._GerritChangeIdentifier())
1851
1852 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001853 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001854 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001855 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001856 line_comments = file_comments.setdefault(path, [])
1857 line_comments.extend(
1858 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001859
1860 # Build dictionary of file comments for easy access and sorting later.
1861 # {author+date: {path: {patchset: {line: url+message}}}}
1862 comments = collections.defaultdict(
1863 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001864 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001865 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001866 tag = comment.get('tag', '')
1867 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001868 continue
1869 key = (comment['author']['email'], comment['updated'])
1870 if comment.get('side', 'REVISION') == 'PARENT':
1871 patchset = 'Base'
1872 else:
1873 patchset = 'PS%d' % comment['patch_set']
1874 line = comment.get('line', 0)
1875 url = ('https://%s/c/%s/%s/%s#%s%s' %
1876 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1877 'b' if comment.get('side') == 'PARENT' else '',
1878 str(line) if line else ''))
1879 comments[key][path][patchset][line] = (url, comment['message'])
1880
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001881 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001882 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001883 summary = self._BuildCommentSummary(msg, comments, readable)
1884 if summary:
1885 summaries.append(summary)
1886 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001887
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001888 @staticmethod
1889 def _BuildCommentSummary(msg, comments, readable):
1890 key = (msg['author']['email'], msg['date'])
1891 # Don't bother showing autogenerated messages that don't have associated
1892 # file or line comments. this will filter out most autogenerated
1893 # messages, but will keep robot comments like those from Tricium.
1894 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1895 if is_autogenerated and not comments.get(key):
1896 return None
1897 message = msg['message']
1898 # Gerrit spits out nanoseconds.
1899 assert len(msg['date'].split('.')[-1]) == 9
1900 date = datetime.datetime.strptime(msg['date'][:-3],
1901 '%Y-%m-%d %H:%M:%S.%f')
1902 if key in comments:
1903 message += '\n'
1904 for path, patchsets in sorted(comments.get(key, {}).items()):
1905 if readable:
1906 message += '\n%s' % path
1907 for patchset, lines in sorted(patchsets.items()):
1908 for line, (url, content) in sorted(lines.items()):
1909 if line:
1910 line_str = 'Line %d' % line
1911 path_str = '%s:%d:' % (path, line)
1912 else:
1913 line_str = 'File comment'
1914 path_str = '%s:0:' % path
1915 if readable:
1916 message += '\n %s, %s: %s' % (patchset, line_str, url)
1917 message += '\n %s\n' % content
1918 else:
1919 message += '\n%s ' % path_str
1920 message += '\n%s\n' % content
1921
1922 return _CommentSummary(
1923 date=date,
1924 message=message,
1925 sender=msg['author']['email'],
1926 autogenerated=is_autogenerated,
1927 # These could be inferred from the text messages and correlated with
1928 # Code-Review label maximum, however this is not reliable.
1929 # Leaving as is until the need arises.
1930 approval=False,
1931 disapproval=False,
1932 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001933
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001934 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001935 gerrit_util.AbandonChange(
1936 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001937
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001938 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001939 gerrit_util.SubmitChange(
1940 self._GetGerritHost(), self._GerritChangeIdentifier(),
1941 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001942
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001943 def _GetChangeDetail(self, options=None):
1944 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001945 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001946 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001947
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001948 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001949 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001950 options.append('CURRENT_COMMIT')
1951
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001952 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001953 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001954 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001955
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001956 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1957 # Assumption: data fetched before with extra options is suitable
1958 # for return for a smaller set of options.
1959 # For example, if we cached data for
1960 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1961 # and request is for options=[CURRENT_REVISION],
1962 # THEN we can return prior cached data.
1963 if options_set.issubset(cached_options_set):
1964 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001965
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001966 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001967 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001968 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001969 except gerrit_util.GerritError as e:
1970 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001971 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001972 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001973
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001974 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001975 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001976
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001977 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001978 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001979 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001980 data = gerrit_util.GetChangeCommit(
1981 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001982 except gerrit_util.GerritError as e:
1983 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001984 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001985 raise
agable32978d92016-11-01 12:55:02 -07001986 return data
1987
Karen Qian40c19422019-03-13 21:28:29 +00001988 def _IsCqConfigured(self):
1989 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001990 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001991
Olivier Robin75ee7252018-04-13 10:02:56 +02001992 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001993 if git_common.is_dirty_git_tree('land'):
1994 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001995
tandriid60367b2016-06-22 05:25:12 -07001996 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001997 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001998 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001999 'which can test and land changes for you. '
2000 'Are you sure you wish to bypass it?\n',
2001 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002002 differs = True
tandriic4344b52016-08-29 06:04:54 -07002003 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002004 # Note: git diff outputs nothing if there is no diff.
2005 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002006 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002007 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002008 if detail['current_revision'] == last_upload:
2009 differs = False
2010 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002011 print('WARNING: Local branch contents differ from latest uploaded '
2012 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002013 if differs:
2014 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002015 confirm_or_exit(
2016 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2017 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002018 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002019 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002020 upstream = self.GetCommonAncestorWithUpstream()
2021 if self.GetIssue():
2022 description = self.FetchDescription()
2023 else:
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00002024 description = self.GetLocalDescription(upstream)
Edward Lemur227d5102020-02-25 23:45:35 +00002025 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002026 committing=True,
2027 may_prompt=not force,
2028 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002029 parallel=parallel,
2030 upstream=upstream,
2031 description=description,
2032 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002033
2034 self.SubmitIssue(wait_for_merge=True)
2035 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002036 links = self._GetChangeCommit().get('web_links', [])
2037 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002038 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002039 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002040 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002041 return 0
2042
Edward Lemurf38bc172019-09-03 21:02:13 +00002043 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002044 assert parsed_issue_arg.valid
2045
Edward Lemur125d60a2019-09-13 18:25:41 +00002046 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002047
2048 if parsed_issue_arg.hostname:
2049 self._gerrit_host = parsed_issue_arg.hostname
2050 self._gerrit_server = 'https://%s' % self._gerrit_host
2051
tandriic2405f52016-10-10 08:13:15 -07002052 try:
2053 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002054 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002055 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002056
2057 if not parsed_issue_arg.patchset:
2058 # Use current revision by default.
2059 revision_info = detail['revisions'][detail['current_revision']]
2060 patchset = int(revision_info['_number'])
2061 else:
2062 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002063 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002064 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2065 break
2066 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002067 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002068 (parsed_issue_arg.patchset, self.GetIssue()))
2069
Edward Lemur125d60a2019-09-13 18:25:41 +00002070 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002071 if remote_url.endswith('.git'):
2072 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002073 remote_url = remote_url.rstrip('/')
2074
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002075 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002076 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002077
2078 if remote_url != fetch_info['url']:
2079 DieWithError('Trying to patch a change from %s but this repo appears '
2080 'to be %s.' % (fetch_info['url'], remote_url))
2081
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002082 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002083
Aaron Gable62619a32017-06-16 08:22:09 -07002084 if force:
2085 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2086 print('Checked out commit for change %i patchset %i locally' %
2087 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002088 elif nocommit:
2089 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2090 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002091 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002092 RunGit(['cherry-pick', 'FETCH_HEAD'])
2093 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002094 (parsed_issue_arg.issue, patchset))
2095 print('Note: this created a local commit which does not have '
2096 'the same hash as the one uploaded for review. This will make '
2097 'uploading changes based on top of this branch difficult.\n'
2098 'If you want to do that, use "git cl patch --force" instead.')
2099
Stefan Zagerd08043c2017-10-12 12:07:02 -07002100 if self.GetBranch():
2101 self.SetIssue(parsed_issue_arg.issue)
2102 self.SetPatchset(patchset)
2103 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2104 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2105 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2106 else:
2107 print('WARNING: You are in detached HEAD state.\n'
2108 'The patch has been applied to your checkout, but you will not be '
2109 'able to upload a new patch set to the gerrit issue.\n'
2110 'Try using the \'-b\' option if you would like to work on a '
2111 'branch and/or upload a new patch set.')
2112
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002113 return 0
2114
tandrii16e0b4e2016-06-07 10:34:28 -07002115 def _GerritCommitMsgHookCheck(self, offer_removal):
2116 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2117 if not os.path.exists(hook):
2118 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002119 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2120 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002121 data = gclient_utils.FileRead(hook)
2122 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2123 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002124 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002125 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002126 'and may interfere with it in subtle ways.\n'
2127 'We recommend you remove the commit-msg hook.')
2128 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002129 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002130 gclient_utils.rm_file_or_tree(hook)
2131 print('Gerrit commit-msg hook removed.')
2132 else:
2133 print('OK, will keep Gerrit commit-msg hook in place.')
2134
Edward Lemur1b52d872019-05-09 21:12:12 +00002135 def _CleanUpOldTraces(self):
2136 """Keep only the last |MAX_TRACES| traces."""
2137 try:
2138 traces = sorted([
2139 os.path.join(TRACES_DIR, f)
2140 for f in os.listdir(TRACES_DIR)
2141 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2142 and not f.startswith('tmp'))
2143 ])
2144 traces_to_delete = traces[:-MAX_TRACES]
2145 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002146 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002147 except OSError:
2148 print('WARNING: Failed to remove old git traces from\n'
2149 ' %s'
2150 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002151
Edward Lemur5737f022019-05-17 01:24:00 +00002152 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002153 """Zip and write the git push traces stored in traces_dir."""
2154 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002155 traces_zip = trace_name + '-traces'
2156 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002157 # Create a temporary dir to store git config and gitcookies in. It will be
2158 # compressed and stored next to the traces.
2159 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002160 git_info_zip = trace_name + '-git-info'
2161
Edward Lemur5737f022019-05-17 01:24:00 +00002162 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002163 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002164 git_push_metadata['now'] = git_push_metadata['now'].decode(
2165 sys.stdin.encoding)
2166
Edward Lemur1b52d872019-05-09 21:12:12 +00002167 git_push_metadata['trace_name'] = trace_name
2168 gclient_utils.FileWrite(
2169 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2170
2171 # Keep only the first 6 characters of the git hashes on the packet
2172 # trace. This greatly decreases size after compression.
2173 packet_traces = os.path.join(traces_dir, 'trace-packet')
2174 if os.path.isfile(packet_traces):
2175 contents = gclient_utils.FileRead(packet_traces)
2176 gclient_utils.FileWrite(
2177 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2178 shutil.make_archive(traces_zip, 'zip', traces_dir)
2179
2180 # Collect and compress the git config and gitcookies.
2181 git_config = RunGit(['config', '-l'])
2182 gclient_utils.FileWrite(
2183 os.path.join(git_info_dir, 'git-config'),
2184 git_config)
2185
2186 cookie_auth = gerrit_util.Authenticator.get()
2187 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2188 gitcookies_path = cookie_auth.get_gitcookies_path()
2189 if os.path.isfile(gitcookies_path):
2190 gitcookies = gclient_utils.FileRead(gitcookies_path)
2191 gclient_utils.FileWrite(
2192 os.path.join(git_info_dir, 'gitcookies'),
2193 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2194 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2195
Edward Lemur1b52d872019-05-09 21:12:12 +00002196 gclient_utils.rmtree(git_info_dir)
2197
2198 def _RunGitPushWithTraces(
2199 self, change_desc, refspec, refspec_opts, git_push_metadata):
2200 """Run git push and collect the traces resulting from the execution."""
2201 # Create a temporary directory to store traces in. Traces will be compressed
2202 # and stored in a 'traces' dir inside depot_tools.
2203 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002204 trace_name = os.path.join(
2205 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002206
2207 env = os.environ.copy()
2208 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2209 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002210 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002211 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2212 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2213 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2214
2215 try:
2216 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002217 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002218 before_push = time_time()
2219 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002220 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002221 env=env,
2222 print_stdout=True,
2223 # Flush after every line: useful for seeing progress when running as
2224 # recipe.
2225 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002226 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002227 except subprocess2.CalledProcessError as e:
2228 push_returncode = e.returncode
2229 DieWithError('Failed to create a change. Please examine output above '
2230 'for the reason of the failure.\n'
2231 'Hint: run command below to diagnose common Git/Gerrit '
2232 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002233 ' git cl creds-check\n'
2234 '\n'
2235 'If git-cl is not working correctly, file a bug under the '
2236 'Infra>SDK component including the files below.\n'
2237 'Review the files before upload, since they might contain '
2238 'sensitive information.\n'
2239 'Set the Restrict-View-Google label so that they are not '
2240 'publicly accessible.\n'
2241 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002242 change_desc)
2243 finally:
2244 execution_time = time_time() - before_push
2245 metrics.collector.add_repeated('sub_commands', {
2246 'command': 'git push',
2247 'execution_time': execution_time,
2248 'exit_code': push_returncode,
2249 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2250 })
2251
Edward Lemur1b52d872019-05-09 21:12:12 +00002252 git_push_metadata['execution_time'] = execution_time
2253 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002254 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002255
Edward Lemur1b52d872019-05-09 21:12:12 +00002256 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002257 gclient_utils.rmtree(traces_dir)
2258
2259 return push_stdout
2260
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002261 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002262 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002263 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002264 # Load default for user, repo, squash=true, in this order.
2265 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002266
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002267 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002268 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002269 # This may be None; default fallback value is determined in logic below.
2270 title = options.title
2271
Dominic Battre7d1c4842017-10-27 09:17:28 +02002272 # Extract bug number from branch name.
2273 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002274 fixed = options.fixed
2275 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2276 self.GetBranch())
2277 if not bug and not fixed and match:
2278 if match.group('type') == 'bug':
2279 bug = match.group('bugnum')
2280 else:
2281 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002282
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002283 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002284 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 if self.GetIssue():
2286 # Try to get the message from a previous upload.
Edward Lemur6c6827c2020-02-06 21:15:18 +00002287 message = self.FetchDescription()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002288 if not message:
2289 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002290 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002291 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002292 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002293 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002294 # When uploading a subsequent patchset, -m|--message is taken
2295 # as the patchset title if --title was not provided.
2296 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002297 else:
2298 default_title = RunGit(
2299 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002300 if options.force:
2301 title = default_title
2302 else:
2303 title = ask_for_data(
2304 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002305
2306 # User requested to change description
2307 if options.edit_description:
2308 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2309 change_desc.prompt()
2310 message = change_desc.description
2311
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 change_id = self._GetChangeDetail()['change_id']
2313 while True:
2314 footer_change_ids = git_footers.get_footer_change_id(message)
2315 if footer_change_ids == [change_id]:
2316 break
2317 if not footer_change_ids:
2318 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002319 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002320 continue
2321 # There is already a valid footer but with different or several ids.
2322 # Doing this automatically is non-trivial as we don't want to lose
2323 # existing other footers, yet we want to append just 1 desired
2324 # Change-Id. Thus, just create a new footer, but let user verify the
2325 # new description.
2326 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002327 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002328 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002329 print(
2330 'WARNING: change %s has Change-Id footer(s):\n'
2331 ' %s\n'
2332 'but change has Change-Id %s, according to Gerrit.\n'
2333 'Please, check the proposed correction to the description, '
2334 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2335 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2336 change_id))
2337 confirm_or_exit(action='edit')
2338 change_desc.prompt()
2339
2340 message = change_desc.description
2341 if not message:
2342 DieWithError("Description is empty. Aborting...")
2343
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002344 # Continue the while loop.
2345 # Sanity check of this code - we should end up with proper message
2346 # footer.
2347 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002348 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002349 else: # if not self.GetIssue()
2350 if options.message:
2351 message = options.message
2352 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002353 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002354 if options.title:
2355 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002356 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002357 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002358 change_desc.prompt()
2359
Aaron Gableb56ad332017-01-06 15:24:31 -08002360 # On first upload, patchset title is always this string, while
2361 # --title flag gets converted to first line of message.
2362 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002363 if not change_desc.description:
2364 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002365 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002366 if len(change_ids) > 1:
2367 DieWithError('too many Change-Id footers, at most 1 allowed.')
2368 if not change_ids:
2369 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002370 change_desc.set_description(git_footers.add_footer_change_id(
2371 change_desc.description,
2372 GenerateGerritChangeId(change_desc.description)))
2373 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002374 assert len(change_ids) == 1
2375 change_id = change_ids[0]
2376
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002377 if options.reviewers or options.tbrs or options.add_owners_to:
2378 change_desc.update_reviewers(options.reviewers, options.tbrs,
2379 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002380 if options.preserve_tryjobs:
2381 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002382
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002383 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002384 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2385 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002386 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002387 with gclient_utils.temporary_file() as desc_tempfile:
2388 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2389 ref_to_push = RunGit(
2390 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002391 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002392 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002393 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002394 if not change_desc.description:
2395 DieWithError("Description is empty. Aborting...")
2396
2397 if not git_footers.get_footer_change_id(change_desc.description):
2398 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002399 change_desc.set_description(
2400 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002401 if options.reviewers or options.tbrs or options.add_owners_to:
2402 change_desc.update_reviewers(options.reviewers, options.tbrs,
2403 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002404 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002405 # For no-squash mode, we assume the remote called "origin" is the one we
2406 # want. It is not worthwhile to support different workflows for
2407 # no-squash mode.
2408 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2410
2411 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002412 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002413 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2414 ref_to_push)]).splitlines()
2415 if len(commits) > 1:
2416 print('WARNING: This will upload %d commits. Run the following command '
2417 'to see which commits will be uploaded: ' % len(commits))
2418 print('git log %s..%s' % (parent, ref_to_push))
2419 print('You can also use `git squash-branch` to squash these into a '
2420 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002421 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002422
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002423 if options.reviewers or options.tbrs or options.add_owners_to:
2424 change_desc.update_reviewers(options.reviewers, options.tbrs,
2425 options.add_owners_to, change)
2426
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002427 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002428 cc = []
2429 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2430 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2431 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002432 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002433 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002434 if options.cc:
2435 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002436 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002437 if change_desc.get_cced():
2438 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002439 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2440 valid_accounts = set(reviewers + cc)
2441 # TODO(crbug/877717): relax this for all hosts.
2442 else:
2443 valid_accounts = gerrit_util.ValidAccounts(
2444 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002445 logging.info('accounts %s are recognized, %s invalid',
2446 sorted(valid_accounts),
2447 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002448
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002449 # Extra options that can be specified at push time. Doc:
2450 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002451 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002452
Aaron Gable844cf292017-06-28 11:32:59 -07002453 # By default, new changes are started in WIP mode, and subsequent patchsets
2454 # don't send email. At any time, passing --send-mail will mark the change
2455 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002456 if options.send_mail:
2457 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002458 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002459 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002460 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002461 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002462 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002463
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002464 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002465 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002466
Aaron Gable9b713dd2016-12-14 16:04:21 -08002467 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002468 # Punctuation and whitespace in |title| must be percent-encoded.
2469 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002470
agablec6787972016-09-09 16:13:34 -07002471 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002472 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002473
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002474 for r in sorted(reviewers):
2475 if r in valid_accounts:
2476 refspec_opts.append('r=%s' % r)
2477 reviewers.remove(r)
2478 else:
2479 # TODO(tandrii): this should probably be a hard failure.
2480 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2481 % r)
2482 for c in sorted(cc):
2483 # refspec option will be rejected if cc doesn't correspond to an
2484 # account, even though REST call to add such arbitrary cc may succeed.
2485 if c in valid_accounts:
2486 refspec_opts.append('cc=%s' % c)
2487 cc.remove(c)
2488
rmistry9eadede2016-09-19 11:22:43 -07002489 if options.topic:
2490 # Documentation on Gerrit topics is here:
2491 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002492 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002493
Edward Lemur687ca902018-12-05 02:30:30 +00002494 if options.enable_auto_submit:
2495 refspec_opts.append('l=Auto-Submit+1')
2496 if options.use_commit_queue:
2497 refspec_opts.append('l=Commit-Queue+2')
2498 elif options.cq_dry_run:
2499 refspec_opts.append('l=Commit-Queue+1')
2500
2501 if change_desc.get_reviewers(tbr_only=True):
2502 score = gerrit_util.GetCodeReviewTbrScore(
2503 self._GetGerritHost(),
2504 self._GetGerritProject())
2505 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002506
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002507 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002508 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002509 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002510 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002511 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2512
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002513 refspec_suffix = ''
2514 if refspec_opts:
2515 refspec_suffix = '%' + ','.join(refspec_opts)
2516 assert ' ' not in refspec_suffix, (
2517 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2518 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2519
Edward Lemur1b52d872019-05-09 21:12:12 +00002520 git_push_metadata = {
2521 'gerrit_host': self._GetGerritHost(),
2522 'title': title or '<untitled>',
2523 'change_id': change_id,
2524 'description': change_desc.description,
2525 }
2526 push_stdout = self._RunGitPushWithTraces(
2527 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002528
2529 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002530 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002531 change_numbers = [m.group(1)
2532 for m in map(regex.match, push_stdout.splitlines())
2533 if m]
2534 if len(change_numbers) != 1:
2535 DieWithError(
2536 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002537 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002538 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002539 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002540
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002541 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002542 # GetIssue() is not set in case of non-squash uploads according to tests.
2543 # TODO(agable): non-squash uploads in git cl should be removed.
2544 gerrit_util.AddReviewers(
2545 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002546 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002547 reviewers, cc,
2548 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002549
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002550 return 0
2551
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002552 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2553 change_desc):
2554 """Computes parent of the generated commit to be uploaded to Gerrit.
2555
2556 Returns revision or a ref name.
2557 """
2558 if custom_cl_base:
2559 # Try to avoid creating additional unintended CLs when uploading, unless
2560 # user wants to take this risk.
2561 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2562 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2563 local_ref_of_target_remote])
2564 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002565 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002566 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2567 'If you proceed with upload, more than 1 CL may be created by '
2568 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2569 'If you are certain that specified base `%s` has already been '
2570 'uploaded to Gerrit as another CL, you may proceed.\n' %
2571 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2572 if not force:
2573 confirm_or_exit(
2574 'Do you take responsibility for cleaning up potential mess '
2575 'resulting from proceeding with upload?',
2576 action='upload')
2577 return custom_cl_base
2578
Aaron Gablef97e33d2017-03-30 15:44:27 -07002579 if remote != '.':
2580 return self.GetCommonAncestorWithUpstream()
2581
2582 # If our upstream branch is local, we base our squashed commit on its
2583 # squashed version.
2584 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2585
Aaron Gablef97e33d2017-03-30 15:44:27 -07002586 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002587 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002588
2589 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002590 # TODO(tandrii): consider checking parent change in Gerrit and using its
2591 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2592 # the tree hash of the parent branch. The upside is less likely bogus
2593 # requests to reupload parent change just because it's uploadhash is
2594 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002595 parent = RunGit(['config',
2596 'branch.%s.gerritsquashhash' % upstream_branch_name],
2597 error_ok=True).strip()
2598 # Verify that the upstream branch has been uploaded too, otherwise
2599 # Gerrit will create additional CLs when uploading.
2600 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2601 RunGitSilent(['rev-parse', parent + ':'])):
2602 DieWithError(
2603 '\nUpload upstream branch %s first.\n'
2604 'It is likely that this branch has been rebased since its last '
2605 'upload, so you just need to upload it again.\n'
2606 '(If you uploaded it with --no-squash, then branch dependencies '
2607 'are not supported, and you should reupload with --squash.)'
2608 % upstream_branch_name,
2609 change_desc)
2610 return parent
2611
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002612 def _AddChangeIdToCommitMessage(self, options, args):
2613 """Re-commits using the current message, assumes the commit hook is in
2614 place.
2615 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002616 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002617 git_command = ['commit', '--amend', '-m', log_desc]
2618 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002619 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002620 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002621 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002622 return new_log_desc
2623 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002624 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002625
tandriie113dfd2016-10-11 10:20:12 -07002626 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002627 try:
2628 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002629 except GerritChangeNotExists:
2630 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002631
2632 if data['status'] in ('ABANDONED', 'MERGED'):
2633 return 'CL %s is closed' % self.GetIssue()
2634
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002635 def GetGerritChange(self, patchset=None):
2636 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002637 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002638 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002639 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002640 data = self._GetChangeDetail(['ALL_REVISIONS'])
2641
2642 assert host and issue and patchset, 'CL must be uploaded first'
2643
2644 has_patchset = any(
2645 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002646 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002647 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002648 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002649 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002650
tandrii8c5a3532016-11-04 07:52:02 -07002651 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002652 'host': host,
2653 'change': issue,
2654 'project': data['project'],
2655 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002656 }
tandriie113dfd2016-10-11 10:20:12 -07002657
tandriide281ae2016-10-12 06:02:30 -07002658 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002659 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002660
Edward Lemur707d70b2018-02-07 00:50:14 +01002661 def GetReviewers(self):
2662 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002663 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002664
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002665
tandriif9aefb72016-07-01 09:06:51 -07002666def _get_bug_line_values(default_project, bugs):
2667 """Given default_project and comma separated list of bugs, yields bug line
2668 values.
2669
2670 Each bug can be either:
2671 * a number, which is combined with default_project
2672 * string, which is left as is.
2673
2674 This function may produce more than one line, because bugdroid expects one
2675 project per line.
2676
2677 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2678 ['v8:123', 'chromium:789']
2679 """
2680 default_bugs = []
2681 others = []
2682 for bug in bugs.split(','):
2683 bug = bug.strip()
2684 if bug:
2685 try:
2686 default_bugs.append(int(bug))
2687 except ValueError:
2688 others.append(bug)
2689
2690 if default_bugs:
2691 default_bugs = ','.join(map(str, default_bugs))
2692 if default_project:
2693 yield '%s:%s' % (default_project, default_bugs)
2694 else:
2695 yield default_bugs
2696 for other in sorted(others):
2697 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2698 yield other
2699
2700
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002701class ChangeDescription(object):
2702 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002703 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002704 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002705 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002706 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002707 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002708 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2709 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002710 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002711 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002712
Dan Beamd8b04ca2019-10-10 21:23:26 +00002713 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002714 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002715 if bug:
2716 regexp = re.compile(self.BUG_LINE)
2717 prefix = settings.GetBugPrefix()
2718 if not any((regexp.match(line) for line in self._description_lines)):
2719 values = list(_get_bug_line_values(prefix, bug))
2720 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002721 if fixed:
2722 regexp = re.compile(self.FIXED_LINE)
2723 prefix = settings.GetBugPrefix()
2724 if not any((regexp.match(line) for line in self._description_lines)):
2725 values = list(_get_bug_line_values(prefix, fixed))
2726 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002727
agable@chromium.org42c20792013-09-12 17:34:49 +00002728 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002729 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002730 return '\n'.join(self._description_lines)
2731
2732 def set_description(self, desc):
2733 if isinstance(desc, basestring):
2734 lines = desc.splitlines()
2735 else:
2736 lines = [line.rstrip() for line in desc]
2737 while lines and not lines[0]:
2738 lines.pop(0)
2739 while lines and not lines[-1]:
2740 lines.pop(-1)
2741 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002742
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002743 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2744 """Rewrites the R=/TBR= line(s) as a single line each.
2745
2746 Args:
2747 reviewers (list(str)) - list of additional emails to use for reviewers.
2748 tbrs (list(str)) - list of additional emails to use for TBRs.
2749 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2750 the change that are missing OWNER coverage. If this is not None, you
2751 must also pass a value for `change`.
2752 change (Change) - The Change that should be used for OWNERS lookups.
2753 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002754 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002755 assert isinstance(tbrs, list), tbrs
2756
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002757 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002758 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002759
2760 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002761 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002762
2763 reviewers = set(reviewers)
2764 tbrs = set(tbrs)
2765 LOOKUP = {
2766 'TBR': tbrs,
2767 'R': reviewers,
2768 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002769
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002770 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002771 regexp = re.compile(self.R_LINE)
2772 matches = [regexp.match(line) for line in self._description_lines]
2773 new_desc = [l for i, l in enumerate(self._description_lines)
2774 if not matches[i]]
2775 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002776
agable@chromium.org42c20792013-09-12 17:34:49 +00002777 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002778
2779 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002780 for match in matches:
2781 if not match:
2782 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002783 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2784
2785 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002786 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002787 owners_db = owners.Database(change.RepositoryRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002788 fopen=open, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002789 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002790 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002791 LOOKUP[add_owners_to].update(
2792 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002793
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002794 # If any folks ended up in both groups, remove them from tbrs.
2795 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002796
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002797 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2798 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002799
2800 # Put the new lines in the description where the old first R= line was.
2801 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2802 if 0 <= line_loc < len(self._description_lines):
2803 if new_tbr_line:
2804 self._description_lines.insert(line_loc, new_tbr_line)
2805 if new_r_line:
2806 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002807 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002808 if new_r_line:
2809 self.append_footer(new_r_line)
2810 if new_tbr_line:
2811 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002812
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002813 def set_preserve_tryjobs(self):
2814 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2815 footers = git_footers.parse_footers(self.description)
2816 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2817 if v.lower() == 'true':
2818 return
2819 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2820
Anthony Polito8b955342019-09-24 19:01:36 +00002821 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002822 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002823 self.set_description([
2824 '# Enter a description of the change.',
2825 '# This will be displayed on the codereview site.',
2826 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002827 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002828 '--------------------',
2829 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002830 bug_regexp = re.compile(self.BUG_LINE)
2831 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002832 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002833 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2834 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002835 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002836
agable@chromium.org42c20792013-09-12 17:34:49 +00002837 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002838 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002839 if not content:
2840 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002841 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002842
Bruce Dawson2377b012018-01-11 16:46:49 -08002843 # Strip off comments and default inserted "Bug:" line.
2844 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002845 (line.startswith('#') or
2846 line.rstrip() == "Bug:" or
2847 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002848 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002849 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002850 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002851
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002852 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002853 """Adds a footer line to the description.
2854
2855 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2856 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2857 that Gerrit footers are always at the end.
2858 """
2859 parsed_footer_line = git_footers.parse_footer(line)
2860 if parsed_footer_line:
2861 # Line is a gerrit footer in the form: Footer-Key: any value.
2862 # Thus, must be appended observing Gerrit footer rules.
2863 self.set_description(
2864 git_footers.add_footer(self.description,
2865 key=parsed_footer_line[0],
2866 value=parsed_footer_line[1]))
2867 return
2868
2869 if not self._description_lines:
2870 self._description_lines.append(line)
2871 return
2872
2873 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2874 if gerrit_footers:
2875 # git_footers.split_footers ensures that there is an empty line before
2876 # actual (gerrit) footers, if any. We have to keep it that way.
2877 assert top_lines and top_lines[-1] == ''
2878 top_lines, separator = top_lines[:-1], top_lines[-1:]
2879 else:
2880 separator = [] # No need for separator if there are no gerrit_footers.
2881
2882 prev_line = top_lines[-1] if top_lines else ''
2883 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2884 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2885 top_lines.append('')
2886 top_lines.append(line)
2887 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002888
tandrii99a72f22016-08-17 14:33:24 -07002889 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002890 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002891 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002892 reviewers = [match.group(2).strip()
2893 for match in matches
2894 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002895 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002896
bradnelsond975b302016-10-23 12:20:23 -07002897 def get_cced(self):
2898 """Retrieves the list of reviewers."""
2899 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2900 cced = [match.group(2).strip() for match in matches if match]
2901 return cleanup_list(cced)
2902
Nodir Turakulov23b82142017-11-16 11:04:25 -08002903 def get_hash_tags(self):
2904 """Extracts and sanitizes a list of Gerrit hashtags."""
2905 subject = (self._description_lines or ('',))[0]
2906 subject = re.sub(
2907 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2908
2909 tags = []
2910 start = 0
2911 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2912 while True:
2913 m = bracket_exp.match(subject, start)
2914 if not m:
2915 break
2916 tags.append(self.sanitize_hash_tag(m.group(1)))
2917 start = m.end()
2918
2919 if not tags:
2920 # Try "Tag: " prefix.
2921 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2922 if m:
2923 tags.append(self.sanitize_hash_tag(m.group(1)))
2924 return tags
2925
2926 @classmethod
2927 def sanitize_hash_tag(cls, tag):
2928 """Returns a sanitized Gerrit hash tag.
2929
2930 A sanitized hashtag can be used as a git push refspec parameter value.
2931 """
2932 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2933
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002934 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2935 """Updates this commit description given the parent.
2936
2937 This is essentially what Gnumbd used to do.
2938 Consult https://goo.gl/WMmpDe for more details.
2939 """
2940 assert parent_msg # No, orphan branch creation isn't supported.
2941 assert parent_hash
2942 assert dest_ref
2943 parent_footer_map = git_footers.parse_footers(parent_msg)
2944 # This will also happily parse svn-position, which GnumbD is no longer
2945 # supporting. While we'd generate correct footers, the verifier plugin
2946 # installed in Gerrit will block such commit (ie git push below will fail).
2947 parent_position = git_footers.get_position(parent_footer_map)
2948
2949 # Cherry-picks may have last line obscuring their prior footers,
2950 # from git_footers perspective. This is also what Gnumbd did.
2951 cp_line = None
2952 if (self._description_lines and
2953 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2954 cp_line = self._description_lines.pop()
2955
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002956 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002957
2958 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2959 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002960 for i, line in enumerate(footer_lines):
2961 k, v = git_footers.parse_footer(line) or (None, None)
2962 if k and k.startswith('Cr-'):
2963 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002964
2965 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002966 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002967 if parent_position[0] == dest_ref:
2968 # Same branch as parent.
2969 number = int(parent_position[1]) + 1
2970 else:
2971 number = 1 # New branch, and extra lineage.
2972 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2973 int(parent_position[1])))
2974
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002975 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2976 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002977
2978 self._description_lines = top_lines
2979 if cp_line:
2980 self._description_lines.append(cp_line)
2981 if self._description_lines[-1] != '':
2982 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002983 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002984
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002985
Aaron Gablea1bab272017-04-11 16:38:18 -07002986def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002987 """Retrieves the reviewers that approved a CL from the issue properties with
2988 messages.
2989
2990 Note that the list may contain reviewers that are not committer, thus are not
2991 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002992
2993 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002994 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002995 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002996 return sorted(
2997 set(
2998 message['sender']
2999 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003000 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003001 )
3002 )
3003
3004
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003005def FindCodereviewSettingsFile(filename='codereview.settings'):
3006 """Finds the given file starting in the cwd and going up.
3007
3008 Only looks up to the top of the repository unless an
3009 'inherit-review-settings-ok' file exists in the root of the repository.
3010 """
3011 inherit_ok_file = 'inherit-review-settings-ok'
3012 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003013 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003014 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3015 root = '/'
3016 while True:
3017 if filename in os.listdir(cwd):
3018 if os.path.isfile(os.path.join(cwd, filename)):
3019 return open(os.path.join(cwd, filename))
3020 if cwd == root:
3021 break
3022 cwd = os.path.dirname(cwd)
3023
3024
3025def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003026 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003027 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003028
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003029 def SetProperty(name, setting, unset_error_ok=False):
3030 fullname = 'rietveld.' + name
3031 if setting in keyvals:
3032 RunGit(['config', fullname, keyvals[setting]])
3033 else:
3034 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3035
tandrii48df5812016-10-17 03:55:37 -07003036 if not keyvals.get('GERRIT_HOST', False):
3037 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003038 # Only server setting is required. Other settings can be absent.
3039 # In that case, we ignore errors raised during option deletion attempt.
3040 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3041 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3042 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003043 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003044 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3045 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003046 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3047 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003048 SetProperty(
3049 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003050
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003051 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003052 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003053
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003054 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003055 RunGit(['config', 'gerrit.squash-uploads',
3056 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003057
tandrii@chromium.org28253532016-04-14 13:46:56 +00003058 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003059 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003060 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3061
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003062 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003063 # should be of the form
3064 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3065 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003066 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3067 keyvals['ORIGIN_URL_CONFIG']])
3068
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003069
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003070def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003071 """Downloads a network object to a local file, like urllib.urlretrieve.
3072
3073 This is necessary because urllib is broken for SSL connections via a proxy.
3074 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003075 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003076 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003077
3078
ukai@chromium.org712d6102013-11-27 00:52:58 +00003079def hasSheBang(fname):
3080 """Checks fname is a #! script."""
3081 with open(fname) as f:
3082 return f.read(2).startswith('#!')
3083
3084
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003085# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3086def DownloadHooks(*args, **kwargs):
3087 pass
3088
3089
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003090def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003091 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003092
3093 Args:
3094 force: True to update hooks. False to install hooks if not present.
3095 """
3096 if not settings.GetIsGerrit():
3097 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003098 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003099 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3100 if not os.access(dst, os.X_OK):
3101 if os.path.exists(dst):
3102 if not force:
3103 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003104 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003105 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003106 if not hasSheBang(dst):
3107 DieWithError('Not a script: %s\n'
3108 'You need to download from\n%s\n'
3109 'into .git/hooks/commit-msg and '
3110 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003111 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3112 except Exception:
3113 if os.path.exists(dst):
3114 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003115 DieWithError('\nFailed to download hooks.\n'
3116 'You need to download from\n%s\n'
3117 'into .git/hooks/commit-msg and '
3118 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003119
3120
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003121class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003122 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003123
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003124 _GOOGLESOURCE = 'googlesource.com'
3125
3126 def __init__(self):
3127 # Cached list of [host, identity, source], where source is either
3128 # .gitcookies or .netrc.
3129 self._all_hosts = None
3130
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003131 def ensure_configured_gitcookies(self):
3132 """Runs checks and suggests fixes to make git use .gitcookies from default
3133 path."""
3134 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3135 configured_path = RunGitSilent(
3136 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003137 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003138 if configured_path:
3139 self._ensure_default_gitcookies_path(configured_path, default)
3140 else:
3141 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003142
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003143 @staticmethod
3144 def _ensure_default_gitcookies_path(configured_path, default_path):
3145 assert configured_path
3146 if configured_path == default_path:
3147 print('git is already configured to use your .gitcookies from %s' %
3148 configured_path)
3149 return
3150
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003151 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003152 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3153 (configured_path, default_path))
3154
3155 if not os.path.exists(configured_path):
3156 print('However, your configured .gitcookies file is missing.')
3157 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3158 action='reconfigure')
3159 RunGit(['config', '--global', 'http.cookiefile', default_path])
3160 return
3161
3162 if os.path.exists(default_path):
3163 print('WARNING: default .gitcookies file already exists %s' %
3164 default_path)
3165 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3166 default_path)
3167
3168 confirm_or_exit('Move existing .gitcookies to default location?',
3169 action='move')
3170 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003171 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003172 print('Moved and reconfigured git to use .gitcookies from %s' %
3173 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003174
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003175 @staticmethod
3176 def _configure_gitcookies_path(default_path):
3177 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3178 if os.path.exists(netrc_path):
3179 print('You seem to be using outdated .netrc for git credentials: %s' %
3180 netrc_path)
3181 print('This tool will guide you through setting up recommended '
3182 '.gitcookies store for git credentials.\n'
3183 '\n'
3184 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3185 ' git config --global --unset http.cookiefile\n'
3186 ' mv %s %s.backup\n\n' % (default_path, default_path))
3187 confirm_or_exit(action='setup .gitcookies')
3188 RunGit(['config', '--global', 'http.cookiefile', default_path])
3189 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003190
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003191 def get_hosts_with_creds(self, include_netrc=False):
3192 if self._all_hosts is None:
3193 a = gerrit_util.CookiesAuthenticator()
3194 self._all_hosts = [
3195 (h, u, s)
3196 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003197 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3198 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003199 )
3200 if h.endswith(self._GOOGLESOURCE)
3201 ]
3202
3203 if include_netrc:
3204 return self._all_hosts
3205 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3206
3207 def print_current_creds(self, include_netrc=False):
3208 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3209 if not hosts:
3210 print('No Git/Gerrit credentials found')
3211 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003212 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003213 header = [('Host', 'User', 'Which file'),
3214 ['=' * l for l in lengths]]
3215 for row in (header + hosts):
3216 print('\t'.join((('%%+%ds' % l) % s)
3217 for l, s in zip(lengths, row)))
3218
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003219 @staticmethod
3220 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003221 """Parses identity "git-<username>.domain" into <username> and domain."""
3222 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003223 # distinguishable from sub-domains. But we do know typical domains:
3224 if identity.endswith('.chromium.org'):
3225 domain = 'chromium.org'
3226 username = identity[:-len('.chromium.org')]
3227 else:
3228 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003229 if username.startswith('git-'):
3230 username = username[len('git-'):]
3231 return username, domain
3232
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003233 def _canonical_git_googlesource_host(self, host):
3234 """Normalizes Gerrit hosts (with '-review') to Git host."""
3235 assert host.endswith(self._GOOGLESOURCE)
3236 # Prefix doesn't include '.' at the end.
3237 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3238 if prefix.endswith('-review'):
3239 prefix = prefix[:-len('-review')]
3240 return prefix + '.' + self._GOOGLESOURCE
3241
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003242 def _canonical_gerrit_googlesource_host(self, host):
3243 git_host = self._canonical_git_googlesource_host(host)
3244 prefix = git_host.split('.', 1)[0]
3245 return prefix + '-review.' + self._GOOGLESOURCE
3246
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003247 def _get_counterpart_host(self, host):
3248 assert host.endswith(self._GOOGLESOURCE)
3249 git = self._canonical_git_googlesource_host(host)
3250 gerrit = self._canonical_gerrit_googlesource_host(git)
3251 return git if gerrit == host else gerrit
3252
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003253 def has_generic_host(self):
3254 """Returns whether generic .googlesource.com has been configured.
3255
3256 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3257 """
3258 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3259 if host == '.' + self._GOOGLESOURCE:
3260 return True
3261 return False
3262
3263 def _get_git_gerrit_identity_pairs(self):
3264 """Returns map from canonic host to pair of identities (Git, Gerrit).
3265
3266 One of identities might be None, meaning not configured.
3267 """
3268 host_to_identity_pairs = {}
3269 for host, identity, _ in self.get_hosts_with_creds():
3270 canonical = self._canonical_git_googlesource_host(host)
3271 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3272 idx = 0 if canonical == host else 1
3273 pair[idx] = identity
3274 return host_to_identity_pairs
3275
3276 def get_partially_configured_hosts(self):
3277 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003278 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003279 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003280 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003281
3282 def get_conflicting_hosts(self):
3283 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003284 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003285 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003286 if None not in (i1, i2) and i1 != i2)
3287
3288 def get_duplicated_hosts(self):
3289 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003290 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003291
3292 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3293 'chromium.googlesource.com': 'chromium.org',
3294 'chrome-internal.googlesource.com': 'google.com',
3295 }
3296
3297 def get_hosts_with_wrong_identities(self):
3298 """Finds hosts which **likely** reference wrong identities.
3299
3300 Note: skips hosts which have conflicting identities for Git and Gerrit.
3301 """
3302 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003303 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003304 pair = self._get_git_gerrit_identity_pairs().get(host)
3305 if pair and pair[0] == pair[1]:
3306 _, domain = self._parse_identity(pair[0])
3307 if domain != expected:
3308 hosts.add(host)
3309 return hosts
3310
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003311 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003312 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003313 hosts = sorted(hosts)
3314 assert hosts
3315 if extra_column_func is None:
3316 extras = [''] * len(hosts)
3317 else:
3318 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003319 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3320 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003321 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003322 lines.append(tmpl % he)
3323 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003324
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003325 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003326 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003327 yield ('.googlesource.com wildcard record detected',
3328 ['Chrome Infrastructure team recommends to list full host names '
3329 'explicitly.'],
3330 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003331
3332 dups = self.get_duplicated_hosts()
3333 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003334 yield ('The following hosts were defined twice',
3335 self._format_hosts(dups),
3336 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003337
3338 partial = self.get_partially_configured_hosts()
3339 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003340 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3341 'These hosts are missing',
3342 self._format_hosts(partial, lambda host: 'but %s defined' %
3343 self._get_counterpart_host(host)),
3344 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003345
3346 conflicting = self.get_conflicting_hosts()
3347 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003348 yield ('The following Git hosts have differing credentials from their '
3349 'Gerrit counterparts',
3350 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3351 tuple(self._get_git_gerrit_identity_pairs()[host])),
3352 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003353
3354 wrong = self.get_hosts_with_wrong_identities()
3355 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003356 yield ('These hosts likely use wrong identity',
3357 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3358 (self._get_git_gerrit_identity_pairs()[host][0],
3359 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3360 wrong)
3361
3362 def find_and_report_problems(self):
3363 """Returns True if there was at least one problem, else False."""
3364 found = False
3365 bad_hosts = set()
3366 for title, sublines, hosts in self._find_problems():
3367 if not found:
3368 found = True
3369 print('\n\n.gitcookies problem report:\n')
3370 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003371 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003372 if sublines:
3373 print()
3374 print(' %s' % '\n '.join(sublines))
3375 print()
3376
3377 if bad_hosts:
3378 assert found
3379 print(' You can manually remove corresponding lines in your %s file and '
3380 'visit the following URLs with correct account to generate '
3381 'correct credential lines:\n' %
3382 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3383 print(' %s' % '\n '.join(sorted(set(
3384 gerrit_util.CookiesAuthenticator().get_new_password_url(
3385 self._canonical_git_googlesource_host(host))
3386 for host in bad_hosts
3387 ))))
3388 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003389
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003390
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003391@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003392def CMDcreds_check(parser, args):
3393 """Checks credentials and suggests changes."""
3394 _, _ = parser.parse_args(args)
3395
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003396 # Code below checks .gitcookies. Abort if using something else.
3397 authn = gerrit_util.Authenticator.get()
3398 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003399 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003400 'This command is not designed for bot environment. It checks '
3401 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003402 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3403 if isinstance(authn, gerrit_util.GceAuthenticator):
3404 message += (
3405 '\n'
3406 'If you need to run this on GCE or a cloudtop instance, '
3407 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3408 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003409
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003410 checker = _GitCookiesChecker()
3411 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003412
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003413 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003414 checker.print_current_creds(include_netrc=True)
3415
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003416 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003417 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003418 return 0
3419 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003420
3421
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003422@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003423def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003424 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003425 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003426 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003427 _, args = parser.parse_args(args)
3428 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003429 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003430 return RunGit(['config', 'branch.%s.base-url' % branch],
3431 error_ok=False).strip()
3432 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003433 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003434 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3435 error_ok=False).strip()
3436
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003437
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003438def color_for_status(status):
3439 """Maps a Changelist status to color, for CMDstatus and other tools."""
3440 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003441 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003442 'waiting': Fore.BLUE,
3443 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003444 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003445 'lgtm': Fore.GREEN,
3446 'commit': Fore.MAGENTA,
3447 'closed': Fore.CYAN,
3448 'error': Fore.WHITE,
3449 }.get(status, Fore.WHITE)
3450
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003451
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003452def get_cl_statuses(changes, fine_grained, max_processes=None):
3453 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003454
3455 If fine_grained is true, this will fetch CL statuses from the server.
3456 Otherwise, simply indicate if there's a matching url for the given branches.
3457
3458 If max_processes is specified, it is used as the maximum number of processes
3459 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3460 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003461
3462 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003463 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003464 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003465 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003466
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003467 if not fine_grained:
3468 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003469 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003470 for cl in changes:
3471 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003472 return
3473
3474 # First, sort out authentication issues.
3475 logging.debug('ensuring credentials exist')
3476 for cl in changes:
3477 cl.EnsureAuthenticated(force=False, refresh=True)
3478
3479 def fetch(cl):
3480 try:
3481 return (cl, cl.GetStatus())
3482 except:
3483 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003484 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003485 raise
3486
3487 threads_count = len(changes)
3488 if max_processes:
3489 threads_count = max(1, min(threads_count, max_processes))
3490 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3491
Edward Lemur61bf4172020-02-24 23:22:37 +00003492 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003493 fetched_cls = set()
3494 try:
3495 it = pool.imap_unordered(fetch, changes).__iter__()
3496 while True:
3497 try:
3498 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003499 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003500 break
3501 fetched_cls.add(cl)
3502 yield cl, status
3503 finally:
3504 pool.close()
3505
3506 # Add any branches that failed to fetch.
3507 for cl in set(changes) - fetched_cls:
3508 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003509
rmistry@google.com2dd99862015-06-22 12:22:18 +00003510
3511def upload_branch_deps(cl, args):
3512 """Uploads CLs of local branches that are dependents of the current branch.
3513
3514 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003515
3516 test1 -> test2.1 -> test3.1
3517 -> test3.2
3518 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003519
3520 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3521 run on the dependent branches in this order:
3522 test2.1, test3.1, test3.2, test2.2, test3.3
3523
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003524 Note: This function does not rebase your local dependent branches. Use it
3525 when you make a change to the parent branch that will not conflict
3526 with its dependent branches, and you would like their dependencies
3527 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003528 """
3529 if git_common.is_dirty_git_tree('upload-branch-deps'):
3530 return 1
3531
3532 root_branch = cl.GetBranch()
3533 if root_branch is None:
3534 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3535 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003536 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003537 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3538 'patchset dependencies without an uploaded CL.')
3539
3540 branches = RunGit(['for-each-ref',
3541 '--format=%(refname:short) %(upstream:short)',
3542 'refs/heads'])
3543 if not branches:
3544 print('No local branches found.')
3545 return 0
3546
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003547 # Create a dictionary of all local branches to the branches that are
3548 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003549 tracked_to_dependents = collections.defaultdict(list)
3550 for b in branches.splitlines():
3551 tokens = b.split()
3552 if len(tokens) == 2:
3553 branch_name, tracked = tokens
3554 tracked_to_dependents[tracked].append(branch_name)
3555
vapiera7fbd5a2016-06-16 09:17:49 -07003556 print()
3557 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003558 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003559
rmistry@google.com2dd99862015-06-22 12:22:18 +00003560 def traverse_dependents_preorder(branch, padding=''):
3561 dependents_to_process = tracked_to_dependents.get(branch, [])
3562 padding += ' '
3563 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003564 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003565 dependents.append(dependent)
3566 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003567
rmistry@google.com2dd99862015-06-22 12:22:18 +00003568 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003569 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003570
3571 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003572 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003573 return 0
3574
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003575 confirm_or_exit('This command will checkout all dependent branches and run '
3576 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003577
rmistry@google.com2dd99862015-06-22 12:22:18 +00003578 # Record all dependents that failed to upload.
3579 failures = {}
3580 # Go through all dependents, checkout the branch and upload.
3581 try:
3582 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003583 print()
3584 print('--------------------------------------')
3585 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003586 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003587 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003588 try:
3589 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003590 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003591 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003592 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003593 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003594 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003595 finally:
3596 # Swap back to the original root branch.
3597 RunGit(['checkout', '-q', root_branch])
3598
vapiera7fbd5a2016-06-16 09:17:49 -07003599 print()
3600 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003601 for dependent_branch in dependents:
3602 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003603 print(' %s : %s' % (dependent_branch, upload_status))
3604 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003605
3606 return 0
3607
3608
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003609def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3610 """Given a proposed tag name, returns a tag name that is guaranteed to be
3611 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3612 or 'foo-3', and so on."""
3613
3614 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3615 for suffix_num in itertools.count(1):
3616 if suffix_num == 1:
3617 to_check = proposed_tag
3618 else:
3619 to_check = '%s-%d' % (proposed_tag, suffix_num)
3620
3621 if to_check not in existing_tags:
3622 return to_check
3623
3624
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003625@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003626def CMDarchive(parser, args):
3627 """Archives and deletes branches associated with closed changelists."""
3628 parser.add_option(
3629 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003630 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003631 parser.add_option(
3632 '-f', '--force', action='store_true',
3633 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003634 parser.add_option(
3635 '-d', '--dry-run', action='store_true',
3636 help='Skip the branch tagging and removal steps.')
3637 parser.add_option(
3638 '-t', '--notags', action='store_true',
3639 help='Do not tag archived branches. '
3640 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003641
kmarshall3bff56b2016-06-06 18:31:47 -07003642 options, args = parser.parse_args(args)
3643 if args:
3644 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003645
3646 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3647 if not branches:
3648 return 0
3649
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003650 tags = RunGit(['for-each-ref', '--format=%(refname)',
3651 'refs/tags']).splitlines() or []
3652 tags = [t.split('/')[-1] for t in tags]
3653
vapiera7fbd5a2016-06-16 09:17:49 -07003654 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003655 changes = [Changelist(branchref=b)
3656 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003657 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3658 statuses = get_cl_statuses(changes,
3659 fine_grained=True,
3660 max_processes=options.maxjobs)
3661 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003662 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3663 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003664 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003665 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003666 proposal.sort()
3667
3668 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003669 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003670 return 0
3671
Edward Lemur85153282020-02-14 22:06:29 +00003672 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003673
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003675 if options.notags:
3676 for next_item in proposal:
3677 print(' ' + next_item[0])
3678 else:
3679 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3680 for next_item in proposal:
3681 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003682
kmarshall9249e012016-08-23 12:02:16 -07003683 # Quit now on precondition failure or if instructed by the user, either
3684 # via an interactive prompt or by command line flags.
3685 if options.dry_run:
3686 print('\nNo changes were made (dry run).\n')
3687 return 0
3688 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003689 print('You are currently on a branch \'%s\' which is associated with a '
3690 'closed codereview issue, so archive cannot proceed. Please '
3691 'checkout another branch and run this command again.' %
3692 current_branch)
3693 return 1
kmarshall9249e012016-08-23 12:02:16 -07003694 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003695 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3696 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003697 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003698 return 1
3699
3700 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003701 if not options.notags:
3702 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003703
3704 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3705 # Clean up the tag if we failed to delete the branch.
3706 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003707
vapiera7fbd5a2016-06-16 09:17:49 -07003708 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003709
3710 return 0
3711
3712
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003713@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003714def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003715 """Show status of changelists.
3716
3717 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003718 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003719 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003720 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003721 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003722 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003723 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003724 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003725
3726 Also see 'git cl comments'.
3727 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003728 parser.add_option(
3729 '--no-branch-color',
3730 action='store_true',
3731 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003732 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003733 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003734 parser.add_option('-f', '--fast', action='store_true',
3735 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003736 parser.add_option(
3737 '-j', '--maxjobs', action='store', type=int,
3738 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003739 parser.add_option(
3740 '-i', '--issue', type=int,
3741 help='Operate on this issue instead of the current branch\'s implicit '
3742 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003743 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003744 if args:
3745 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003746
iannuccie53c9352016-08-17 14:40:40 -07003747 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003748 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003749
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003750 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003751 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003752 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003753 if cl.GetIssue():
3754 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003755 elif options.field == 'id':
3756 issueid = cl.GetIssue()
3757 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003758 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003759 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003760 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003761 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003762 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003763 elif options.field == 'status':
3764 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003765 elif options.field == 'url':
3766 url = cl.GetIssueURL()
3767 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003768 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003769 return 0
3770
3771 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3772 if not branches:
3773 print('No local branch found.')
3774 return 0
3775
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003776 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003777 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003778 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003779 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003780 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003781 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003782 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003783
Edward Lemur85153282020-02-14 22:06:29 +00003784 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003785
3786 def FormatBranchName(branch, colorize=False):
3787 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3788 an asterisk when it is the current branch."""
3789
3790 asterisk = ""
3791 color = Fore.RESET
3792 if branch == current_branch:
3793 asterisk = "* "
3794 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003795 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003796
3797 if colorize:
3798 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003799 return asterisk + branch_name
3800
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003801 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003802
3803 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003804 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3805 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003806 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003807 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003808 branch_statuses[c.GetBranch()] = status
3809 status = branch_statuses.pop(branch)
3810 url = cl.GetIssueURL()
3811 if url and (not status or status == 'error'):
3812 # The issue probably doesn't exist anymore.
3813 url += ' (broken)'
3814
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003815 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003816 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003817 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003818 color = ''
3819 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003820 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003821
Alan Cuttera3be9a52019-03-04 18:50:33 +00003822 branch_display = FormatBranchName(branch)
3823 padding = ' ' * (alignment - len(branch_display))
3824 if not options.no_branch_color:
3825 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003826
Alan Cuttera3be9a52019-03-04 18:50:33 +00003827 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3828 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003829
vapiera7fbd5a2016-06-16 09:17:49 -07003830 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003831 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003832 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003833 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003834 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003835 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003836 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003837 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003838 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003839 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003840 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003841 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003842 return 0
3843
3844
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003845def colorize_CMDstatus_doc():
3846 """To be called once in main() to add colors to git cl status help."""
3847 colors = [i for i in dir(Fore) if i[0].isupper()]
3848
3849 def colorize_line(line):
3850 for color in colors:
3851 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003852 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003853 indent = len(line) - len(line.lstrip(' ')) + 1
3854 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3855 return line
3856
3857 lines = CMDstatus.__doc__.splitlines()
3858 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3859
3860
phajdan.jre328cf92016-08-22 04:12:17 -07003861def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003862 if path == '-':
3863 json.dump(contents, sys.stdout)
3864 else:
3865 with open(path, 'w') as f:
3866 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003867
3868
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003869@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003870@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003871def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003872 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003873
3874 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003875 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003876 parser.add_option('-r', '--reverse', action='store_true',
3877 help='Lookup the branch(es) for the specified issues. If '
3878 'no issues are specified, all branches with mapped '
3879 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003880 parser.add_option('--json',
3881 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003882 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003883
dnj@chromium.org406c4402015-03-03 17:22:28 +00003884 if options.reverse:
3885 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003886 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003887 # Reverse issue lookup.
3888 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003889
3890 git_config = {}
3891 for config in RunGit(['config', '--get-regexp',
3892 r'branch\..*issue']).splitlines():
3893 name, _space, val = config.partition(' ')
3894 git_config[name] = val
3895
dnj@chromium.org406c4402015-03-03 17:22:28 +00003896 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003897 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003898 Changelist.IssueConfigKey())
3899 issue = git_config.get(config_key)
3900 if issue:
3901 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003902 if not args:
3903 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003904 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003905 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003906 try:
3907 issue_num = int(issue)
3908 except ValueError:
3909 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003910 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003911 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003912 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003913 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003914 if options.json:
3915 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003916 return 0
3917
3918 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003919 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003920 if not issue.valid:
3921 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3922 'or no argument to list it.\n'
3923 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003924 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003925 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003926 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003927 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003928 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3929 if options.json:
3930 write_json(options.json, {
3931 'issue': cl.GetIssue(),
3932 'issue_url': cl.GetIssueURL(),
3933 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003934 return 0
3935
3936
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003937@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003938def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003939 """Shows or posts review comments for any changelist."""
3940 parser.add_option('-a', '--add-comment', dest='comment',
3941 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003942 parser.add_option('-p', '--publish', action='store_true',
3943 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003944 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003945 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003946 parser.add_option('-m', '--machine-readable', dest='readable',
3947 action='store_false', default=True,
3948 help='output comments in a format compatible with '
3949 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003950 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003951 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003952 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003953
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003954 issue = None
3955 if options.issue:
3956 try:
3957 issue = int(options.issue)
3958 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003959 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003960
Edward Lemur934836a2019-09-09 20:16:54 +00003961 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003962
3963 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003964 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003965 return 0
3966
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003967 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3968 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003969 for comment in summary:
3970 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003971 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003972 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003973 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003974 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003975 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003976 elif comment.autogenerated:
3977 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003978 else:
3979 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003980 print('\n%s%s %s%s\n%s' % (
3981 color,
3982 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3983 comment.sender,
3984 Fore.RESET,
3985 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3986
smut@google.comc85ac942015-09-15 16:34:43 +00003987 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003988 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003989 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003990 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3991 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003992 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003993 return 0
3994
3995
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003996@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003997@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003998def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003999 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004000 parser.add_option('-d', '--display', action='store_true',
4001 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004002 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004003 help='New description to set for this issue (- for stdin, '
4004 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004005 parser.add_option('-f', '--force', action='store_true',
4006 help='Delete any unpublished Gerrit edits for this issue '
4007 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004008
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004009 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004010
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004011 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004012 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004013 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004014 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004015 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004016
Edward Lemur934836a2019-09-09 20:16:54 +00004017 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004018 if target_issue_arg:
4019 kwargs['issue'] = target_issue_arg.issue
4020 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004021
4022 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004023 if not cl.GetIssue():
4024 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004025
Edward Lemur678a6842019-10-03 22:25:05 +00004026 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004027 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004028
Edward Lemur6c6827c2020-02-06 21:15:18 +00004029 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004030
smut@google.com34fb6b12015-07-13 20:03:26 +00004031 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004032 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004033 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004034
4035 if options.new_description:
4036 text = options.new_description
4037 if text == '-':
4038 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004039 elif text == '+':
4040 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004041 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004042
4043 description.set_description(text)
4044 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004045 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004046 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004047 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004048 return 0
4049
4050
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004051@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004052def CMDlint(parser, args):
4053 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004054 parser.add_option('--filter', action='append', metavar='-x,+y',
4055 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004056 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004057
4058 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004059 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004060 try:
4061 import cpplint
4062 import cpplint_chromium
4063 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004064 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004065 return 1
4066
4067 # Change the current working directory before calling lint so that it
4068 # shows the correct base.
4069 previous_cwd = os.getcwd()
4070 os.chdir(settings.GetRoot())
4071 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004072 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004073 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004074 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004075 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004076 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004077 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004078
4079 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004080 command = args + files
4081 if options.filter:
4082 command = ['--filter=' + ','.join(options.filter)] + command
4083 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004084
4085 white_regex = re.compile(settings.GetLintRegex())
4086 black_regex = re.compile(settings.GetLintIgnoreRegex())
4087 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4088 for filename in filenames:
4089 if white_regex.match(filename):
4090 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004091 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004092 else:
4093 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4094 extra_check_functions)
4095 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004096 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004097 finally:
4098 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004099 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004100 if cpplint._cpplint_state.error_count != 0:
4101 return 1
4102 return 0
4103
4104
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004105@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004106def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004107 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004108 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004109 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004110 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004111 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004112 parser.add_option('--all', action='store_true',
4113 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004114 parser.add_option('--parallel', action='store_true',
4115 help='Run all tests specified by input_api.RunTests in all '
4116 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004117 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004118
sbc@chromium.org71437c02015-04-09 19:29:40 +00004119 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004120 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004121 return 1
4122
Edward Lemur934836a2019-09-09 20:16:54 +00004123 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004124 if args:
4125 base_branch = args[0]
4126 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004127 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004128 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004129
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004130 if cl.GetIssue():
4131 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004132 else:
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004133 description = cl.GetLocalDescription(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004134
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004135 cl.RunHook(
4136 committing=not options.upload,
4137 may_prompt=False,
4138 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004139 parallel=options.parallel,
4140 upstream=base_branch,
4141 description=description,
4142 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004143 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004144
4145
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004146def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004147 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004148
4149 Works the same way as
4150 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4151 but can be called on demand on all platforms.
4152
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004153 The basic idea is to generate git hash of a state of the tree, original
4154 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004155 """
4156 lines = []
4157 tree_hash = RunGitSilent(['write-tree'])
4158 lines.append('tree %s' % tree_hash.strip())
4159 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4160 if code == 0:
4161 lines.append('parent %s' % parent.strip())
4162 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4163 lines.append('author %s' % author.strip())
4164 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4165 lines.append('committer %s' % committer.strip())
4166 lines.append('')
4167 # Note: Gerrit's commit-hook actually cleans message of some lines and
4168 # whitespace. This code is not doing this, but it clearly won't decrease
4169 # entropy.
4170 lines.append(message)
4171 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004172 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004173 return 'I%s' % change_hash.strip()
4174
4175
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004176def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004177 """Computes the remote branch ref to use for the CL.
4178
4179 Args:
4180 remote (str): The git remote for the CL.
4181 remote_branch (str): The git remote branch for the CL.
4182 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004183 """
4184 if not (remote and remote_branch):
4185 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004186
wittman@chromium.org455dc922015-01-26 20:15:50 +00004187 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004188 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004189 # refs, which are then translated into the remote full symbolic refs
4190 # below.
4191 if '/' not in target_branch:
4192 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4193 else:
4194 prefix_replacements = (
4195 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4196 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4197 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4198 )
4199 match = None
4200 for regex, replacement in prefix_replacements:
4201 match = re.search(regex, target_branch)
4202 if match:
4203 remote_branch = target_branch.replace(match.group(0), replacement)
4204 break
4205 if not match:
4206 # This is a branch path but not one we recognize; use as-is.
4207 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004208 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4209 # Handle the refs that need to land in different refs.
4210 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004211
wittman@chromium.org455dc922015-01-26 20:15:50 +00004212 # Create the true path to the remote branch.
4213 # Does the following translation:
4214 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4215 # * refs/remotes/origin/master -> refs/heads/master
4216 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4217 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4218 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4219 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4220 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4221 'refs/heads/')
4222 elif remote_branch.startswith('refs/remotes/branch-heads'):
4223 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004224
wittman@chromium.org455dc922015-01-26 20:15:50 +00004225 return remote_branch
4226
4227
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004228def cleanup_list(l):
4229 """Fixes a list so that comma separated items are put as individual items.
4230
4231 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4232 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4233 """
4234 items = sum((i.split(',') for i in l), [])
4235 stripped_items = (i.strip() for i in items)
4236 return sorted(filter(None, stripped_items))
4237
4238
Aaron Gable4db38df2017-11-03 14:59:07 -07004239@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004240@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004241def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004242 """Uploads the current changelist to codereview.
4243
4244 Can skip dependency patchset uploads for a branch by running:
4245 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004246 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004247 git config --unset branch.branch_name.skip-deps-uploads
4248 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004249
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004250 If the name of the checked out branch starts with "bug-" or "fix-" followed
4251 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004252 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004253
4254 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004255 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004256 [git-cl] add support for hashtags
4257 Foo bar: implement foo
4258 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004259 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004260 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4261 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004262 parser.add_option('--bypass-watchlists', action='store_true',
4263 dest='bypass_watchlists',
4264 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004265 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004266 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004267 parser.add_option('--message', '-m', dest='message',
4268 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004269 parser.add_option('-b', '--bug',
4270 help='pre-populate the bug number(s) for this issue. '
4271 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004272 parser.add_option('--message-file', dest='message_file',
4273 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004274 parser.add_option('--title', '-t', dest='title',
4275 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004276 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004277 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004278 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004279 parser.add_option('--tbrs',
4280 action='append', default=[],
4281 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004282 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004283 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004284 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004285 parser.add_option('--hashtag', dest='hashtags',
4286 action='append', default=[],
4287 help=('Gerrit hashtag for new CL; '
4288 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004289 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004290 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004291 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004292 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004293 metavar='TARGET',
4294 help='Apply CL to remote ref TARGET. ' +
4295 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004296 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004297 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004298 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004299 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004300 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004301 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004302 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4303 const='TBR', help='add a set of OWNERS to TBR')
4304 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4305 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004306 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004307 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004308 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004309 'implies --send-mail')
4310 parser.add_option('-d', '--cq-dry-run',
4311 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004312 help='Send the patchset to do a CQ dry run right after '
4313 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004314 parser.add_option('--preserve-tryjobs', action='store_true',
4315 help='instruct the CQ to let tryjobs running even after '
4316 'new patchsets are uploaded instead of canceling '
4317 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004318 parser.add_option('--dependencies', action='store_true',
4319 help='Uploads CLs of all the local branches that depend on '
4320 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004321 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4322 help='Sends your change to the CQ after an approval. Only '
4323 'works on repos that have the Auto-Submit label '
4324 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004325 parser.add_option('--parallel', action='store_true',
4326 help='Run all tests specified by input_api.RunTests in all '
4327 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004328 parser.add_option('--no-autocc', action='store_true',
4329 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004330 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004331 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004332 parser.add_option('-R', '--retry-failed', action='store_true',
4333 help='Retry failed tryjobs from old patchset immediately '
4334 'after uploading new patchset. Cannot be used with '
4335 '--use-commit-queue or --cq-dry-run.')
4336 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4337 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004338 parser.add_option('--fixed', '-x',
4339 help='List of bugs that will be commented on and marked '
4340 'fixed (pre-populates "Fixed:" tag). Same format as '
4341 '-b option / "Bug:" tag. If fixing several issues, '
4342 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004343 parser.add_option('--edit-description', action='store_true', default=False,
4344 help='Modify description before upload. Cannot be used '
4345 'with --force. It is a noop when --no-squash is set '
4346 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004347
rmistry@google.com2dd99862015-06-22 12:22:18 +00004348 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004349 (options, args) = parser.parse_args(args)
4350
sbc@chromium.org71437c02015-04-09 19:29:40 +00004351 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004352 return 1
4353
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004354 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004355 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004356 options.cc = cleanup_list(options.cc)
4357
Josipe827b0f2020-01-30 00:07:20 +00004358 if options.edit_description and options.force:
4359 parser.error('Only one of --force and --edit-description allowed')
4360
tandriib80458a2016-06-23 12:20:07 -07004361 if options.message_file:
4362 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004363 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004364 options.message = gclient_utils.FileRead(options.message_file)
4365 options.message_file = None
4366
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004367 if ([options.cq_dry_run,
4368 options.use_commit_queue,
4369 options.retry_failed].count(True) > 1):
4370 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4371 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004372
Aaron Gableedbc4132017-09-11 13:22:28 -07004373 if options.use_commit_queue:
4374 options.send_mail = True
4375
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004376 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4377 settings.GetIsGerrit()
4378
Edward Lemur934836a2019-09-09 20:16:54 +00004379 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004380 # Warm change details cache now to avoid RPCs later, reducing latency for
4381 # developers.
4382 if cl.GetIssue():
4383 cl._GetChangeDetail(
4384 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4385
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004386 if options.retry_failed and not cl.GetIssue():
4387 print('No previous patchsets, so --retry-failed has no effect.')
4388 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004389
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004390 # cl.GetMostRecentPatchset uses cached information, and can return the last
4391 # patchset before upload. Calling it here makes it clear that it's the
4392 # last patchset before upload. Note that GetMostRecentPatchset will fail
4393 # if no CL has been uploaded yet.
4394 if options.retry_failed:
4395 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004396
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004397 ret = cl.CMDUpload(options, args, orig_args)
4398
4399 if options.retry_failed:
4400 if ret != 0:
4401 print('Upload failed, so --retry-failed has no effect.')
4402 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004403 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004404 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004405 jobs = _filter_failed_for_retry(builds)
4406 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004407 print('No failed tryjobs, so --retry-failed has no effect.')
4408 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004409 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004410
4411 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004412
4413
Francois Dorayd42c6812017-05-30 15:10:20 -04004414@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004415@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004416def CMDsplit(parser, args):
4417 """Splits a branch into smaller branches and uploads CLs.
4418
4419 Creates a branch and uploads a CL for each group of files modified in the
4420 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004421 comment, the string '$directory', is replaced with the directory containing
4422 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004423 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004424 parser.add_option('-d', '--description', dest='description_file',
4425 help='A text file containing a CL description in which '
4426 '$directory will be replaced by each CL\'s directory.')
4427 parser.add_option('-c', '--comment', dest='comment_file',
4428 help='A text file containing a CL comment.')
4429 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004430 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004431 help='List the files and reviewers for each CL that would '
4432 'be created, but don\'t create branches or CLs.')
4433 parser.add_option('--cq-dry-run', action='store_true',
4434 help='If set, will do a cq dry run for each uploaded CL. '
4435 'Please be careful when doing this; more than ~10 CLs '
4436 'has the potential to overload our build '
4437 'infrastructure. Try to upload these not during high '
4438 'load times (usually 11-3 Mountain View time). Email '
4439 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004440 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4441 default=True,
4442 help='Sends your change to the CQ after an approval. Only '
4443 'works on repos that have the Auto-Submit label '
4444 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004445 options, _ = parser.parse_args(args)
4446
4447 if not options.description_file:
4448 parser.error('No --description flag specified.')
4449
4450 def WrappedCMDupload(args):
4451 return CMDupload(OptionParser(), args)
4452
4453 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004454 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004455 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004456
4457
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004458@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004459@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004460def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004461 """DEPRECATED: Used to commit the current changelist via git-svn."""
4462 message = ('git-cl no longer supports committing to SVN repositories via '
4463 'git-svn. You probably want to use `git cl land` instead.')
4464 print(message)
4465 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004466
4467
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004468@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004469@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004470def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004471 """Commits the current changelist via git.
4472
4473 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4474 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004475 """
4476 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4477 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004478 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004479 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004480 parser.add_option('--parallel', action='store_true',
4481 help='Run all tests specified by input_api.RunTests in all '
4482 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004483 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004484
Edward Lemur934836a2019-09-09 20:16:54 +00004485 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004486
Robert Iannucci2e73d432018-03-14 01:10:47 -07004487 if not cl.GetIssue():
4488 DieWithError('You must upload the change first to Gerrit.\n'
4489 ' If you would rather have `git cl land` upload '
4490 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004491 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004492 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004493
4494
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004495@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004496@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004497def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004498 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004499 parser.add_option('-b', dest='newbranch',
4500 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004501 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004502 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004503 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004504 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004505
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004506 group = optparse.OptionGroup(
4507 parser,
4508 'Options for continuing work on the current issue uploaded from a '
4509 'different clone (e.g. different machine). Must be used independently '
4510 'from the other options. No issue number should be specified, and the '
4511 'branch must have an issue number associated with it')
4512 group.add_option('--reapply', action='store_true', dest='reapply',
4513 help='Reset the branch and reapply the issue.\n'
4514 'CAUTION: This will undo any local changes in this '
4515 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004516
4517 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004518 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004519 parser.add_option_group(group)
4520
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004521 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004522
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004523 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004524 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004525 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004526 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004527 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004528
Edward Lemur934836a2019-09-09 20:16:54 +00004529 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004530 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004531 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004532
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004533 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004534 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004535 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004536
4537 RunGit(['reset', '--hard', upstream])
4538 if options.pull:
4539 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004540
Edward Lemur678a6842019-10-03 22:25:05 +00004541 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4542 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004543
4544 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004545 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004546
Edward Lemurf38bc172019-09-03 21:02:13 +00004547 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004548 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004549 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004550
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004551 # We don't want uncommitted changes mixed up with the patch.
4552 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004553 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004554
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004555 if options.newbranch:
4556 if options.force:
4557 RunGit(['branch', '-D', options.newbranch],
4558 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004559 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004560
Edward Lemur678a6842019-10-03 22:25:05 +00004561 cl = Changelist(
4562 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004563
Edward Lemur678a6842019-10-03 22:25:05 +00004564 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004565 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004566
Edward Lemurf38bc172019-09-03 21:02:13 +00004567 return cl.CMDPatchWithParsedIssue(
4568 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004569
4570
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004571def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004572 """Fetches the tree status and returns either 'open', 'closed',
4573 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004574 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004575 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004576 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004577 if status.find('closed') != -1 or status == '0':
4578 return 'closed'
4579 elif status.find('open') != -1 or status == '1':
4580 return 'open'
4581 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004582 return 'unset'
4583
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004584
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004585def GetTreeStatusReason():
4586 """Fetches the tree status from a json url and returns the message
4587 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004588 url = settings.GetTreeStatusUrl()
4589 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004590 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004591 status = json.loads(connection.read())
4592 connection.close()
4593 return status['message']
4594
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004595
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004596@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004597def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004598 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004599 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004600 status = GetTreeStatus()
4601 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004602 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004603 return 2
4604
vapiera7fbd5a2016-06-16 09:17:49 -07004605 print('The tree is %s' % status)
4606 print()
4607 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608 if status != 'open':
4609 return 1
4610 return 0
4611
4612
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004613@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004614def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004615 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4616 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004617 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004618 '-b', '--bot', action='append',
4619 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4620 'times to specify multiple builders. ex: '
4621 '"-b win_rel -b win_layout". See '
4622 'the try server waterfall for the builders name and the tests '
4623 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004624 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004625 '-B', '--bucket', default='',
4626 help=('Buildbucket bucket to send the try requests.'))
4627 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004628 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004629 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004630 'be determined by the try recipe that builder runs, which usually '
4631 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004632 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004633 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004634 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004635 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004636 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004637 '--category', default='git_cl_try', help='Specify custom build category.')
4638 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004639 '--project',
4640 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004641 'in recipe to determine to which repository or directory to '
4642 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004643 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004644 '-p', '--property', dest='properties', action='append', default=[],
4645 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004646 'key2=value2 etc. The value will be treated as '
4647 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004648 'NOTE: using this may make your tryjob not usable for CQ, '
4649 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004650 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004651 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4652 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004653 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004654 parser.add_option(
4655 '-R', '--retry-failed', action='store_true', default=False,
4656 help='Retry failed jobs from the latest set of tryjobs. '
4657 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004658 parser.add_option(
4659 '-i', '--issue', type=int,
4660 help='Operate on this issue instead of the current branch\'s implicit '
4661 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004662 options, args = parser.parse_args(args)
4663
machenbach@chromium.org45453142015-09-15 08:45:22 +00004664 # Make sure that all properties are prop=value pairs.
4665 bad_params = [x for x in options.properties if '=' not in x]
4666 if bad_params:
4667 parser.error('Got properties with missing "=": %s' % bad_params)
4668
maruel@chromium.org15192402012-09-06 12:38:29 +00004669 if args:
4670 parser.error('Unknown arguments: %s' % args)
4671
Edward Lemur934836a2019-09-09 20:16:54 +00004672 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004673 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004674 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004675
Edward Lemurf38bc172019-09-03 21:02:13 +00004676 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004677 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004678
tandriie113dfd2016-10-11 10:20:12 -07004679 error_message = cl.CannotTriggerTryJobReason()
4680 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004681 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004682
Edward Lemur45768512020-03-02 19:03:14 +00004683 if options.bot:
4684 if options.retry_failed:
4685 parser.error('--bot is not compatible with --retry-failed.')
4686 if not options.bucket:
4687 parser.error('A bucket (e.g. "chromium/try") is required.')
4688
4689 triggered = [b for b in options.bot if 'triggered' in b]
4690 if triggered:
4691 parser.error(
4692 'Cannot schedule builds on triggered bots: %s.\n'
4693 'This type of bot requires an initial job from a parent (usually a '
4694 'builder). Schedule a job on the parent instead.\n' % triggered)
4695
4696 if options.bucket.startswith('.master'):
4697 parser.error('Buildbot masters are not supported.')
4698
4699 project, bucket = _parse_bucket(options.bucket)
4700 if project is None or bucket is None:
4701 parser.error('Invalid bucket: %s.' % options.bucket)
4702 jobs = sorted((project, bucket, bot) for bot in options.bot)
4703 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004704 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004705 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004706 if options.verbose:
4707 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004708 jobs = _filter_failed_for_retry(builds)
4709 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004710 print('There are no failed jobs in the latest set of jobs '
4711 '(patchset #%d), doing nothing.' % patchset)
4712 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004713 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004714 if num_builders > 10:
4715 confirm_or_exit('There are %d builders with failed builds.'
4716 % num_builders, action='continue')
4717 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004718 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004719 print('git cl try with no bots now defaults to CQ dry run.')
4720 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4721 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004722
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004723 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004724 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004725 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004726 except BuildbucketResponseException as ex:
4727 print('ERROR: %s' % ex)
4728 return 1
4729 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004730
4731
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004732@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004733def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004734 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004735 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004736 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004737 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004738 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004739 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004740 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004741 '--color', action='store_true', default=setup_color.IS_TTY,
4742 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004743 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004744 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4745 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004746 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004747 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004748 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004749 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004750 parser.add_option(
4751 '-i', '--issue', type=int,
4752 help='Operate on this issue instead of the current branch\'s implicit '
4753 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004754 options, args = parser.parse_args(args)
4755 if args:
4756 parser.error('Unrecognized args: %s' % ' '.join(args))
4757
Edward Lemur934836a2019-09-09 20:16:54 +00004758 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004759 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004760 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004761
tandrii221ab252016-10-06 08:12:04 -07004762 patchset = options.patchset
4763 if not patchset:
4764 patchset = cl.GetMostRecentPatchset()
4765 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004766 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004767 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004768 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004769 cl.GetIssue())
4770
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004771 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004772 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004773 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004774 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004775 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004776 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004777 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004778 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004779 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004780 return 0
4781
4782
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004783@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004784@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004785def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004786 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004787 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004788 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004789 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004790
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004791 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004792 if args:
4793 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004794 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004795 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004796 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004797 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004798
4799 # Clear configured merge-base, if there is one.
4800 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004801 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004802 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004803 return 0
4804
4805
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004806@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004807def CMDweb(parser, args):
4808 """Opens the current CL in the web browser."""
4809 _, args = parser.parse_args(args)
4810 if args:
4811 parser.error('Unrecognized args: %s' % ' '.join(args))
4812
4813 issue_url = Changelist().GetIssueURL()
4814 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004815 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004816 return 1
4817
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004818 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004819 # allows us to hide the "Created new window in existing browser session."
4820 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004821 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004822 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004823 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004824 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004825 os.open(os.devnull, os.O_RDWR)
4826 try:
4827 webbrowser.open(issue_url)
4828 finally:
4829 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004830 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004831 return 0
4832
4833
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004834@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004835def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004836 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004837 parser.add_option('-d', '--dry-run', action='store_true',
4838 help='trigger in dry run mode')
4839 parser.add_option('-c', '--clear', action='store_true',
4840 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004841 parser.add_option(
4842 '-i', '--issue', type=int,
4843 help='Operate on this issue instead of the current branch\'s implicit '
4844 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004845 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004846 if args:
4847 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004848 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004849 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004850
Edward Lemur934836a2019-09-09 20:16:54 +00004851 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004852 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004853 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004854 elif options.dry_run:
4855 state = _CQState.DRY_RUN
4856 else:
4857 state = _CQState.COMMIT
4858 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004859 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004860 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004861 return 0
4862
4863
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004864@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004865def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004866 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004867 parser.add_option(
4868 '-i', '--issue', type=int,
4869 help='Operate on this issue instead of the current branch\'s implicit '
4870 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004871 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004872 if args:
4873 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004874 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004875 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004876 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004877 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004878 cl.CloseIssue()
4879 return 0
4880
4881
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004882@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004883def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004884 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004885 parser.add_option(
4886 '--stat',
4887 action='store_true',
4888 dest='stat',
4889 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004890 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004891 if args:
4892 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004893
Edward Lemur934836a2019-09-09 20:16:54 +00004894 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004895 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004896 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004897 if not issue:
4898 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004899
Aaron Gablea718c3e2017-08-28 17:47:28 -07004900 base = cl._GitGetBranchConfigValue('last-upload-hash')
4901 if not base:
4902 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4903 if not base:
4904 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4905 revision_info = detail['revisions'][detail['current_revision']]
4906 fetch_info = revision_info['fetch']['http']
4907 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4908 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004909
Aaron Gablea718c3e2017-08-28 17:47:28 -07004910 cmd = ['git', 'diff']
4911 if options.stat:
4912 cmd.append('--stat')
4913 cmd.append(base)
4914 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004915
4916 return 0
4917
4918
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004919@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004920def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004921 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004922 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004923 '--ignore-current',
4924 action='store_true',
4925 help='Ignore the CL\'s current reviewers and start from scratch.')
4926 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004927 '--ignore-self',
4928 action='store_true',
4929 help='Do not consider CL\'s author as an owners.')
4930 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004931 '--no-color',
4932 action='store_true',
4933 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004934 parser.add_option(
4935 '--batch',
4936 action='store_true',
4937 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004938 # TODO: Consider moving this to another command, since other
4939 # git-cl owners commands deal with owners for a given CL.
4940 parser.add_option(
4941 '--show-all',
4942 action='store_true',
4943 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004944 options, args = parser.parse_args(args)
4945
4946 author = RunGit(['config', 'user.email']).strip() or None
4947
Edward Lemur934836a2019-09-09 20:16:54 +00004948 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004949
Yang Guo6e269a02019-06-26 11:17:02 +00004950 if options.show_all:
4951 for arg in args:
4952 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004953 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004954 database.load_data_needed_for([arg])
4955 print('Owners for %s:' % arg)
4956 for owner in sorted(database.all_possible_owners([arg], None)):
4957 print(' - %s' % owner)
4958 return 0
4959
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004960 if args:
4961 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004962 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004963 base_branch = args[0]
4964 else:
4965 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004966 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004967
Edward Lemur7f6dec02020-02-06 20:23:58 +00004968 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004969 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4970
4971 if options.batch:
Edward Lemurb7f759f2020-03-04 21:20:56 +00004972 db = owners.Database(change.RepositoryRoot(), open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004973 print('\n'.join(db.reviewers_for(affected_files, author)))
4974 return 0
4975
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004976 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004977 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004978 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004979 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004980 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00004981 fopen=open, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004982 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004983 override_files=change.OriginalOwnersFiles(),
4984 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004985
4986
Aiden Bennerc08566e2018-10-03 17:52:42 +00004987def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004988 """Generates a diff command."""
4989 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004990 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4991
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004992 if allow_prefix:
4993 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4994 # case that diff.noprefix is set in the user's git config.
4995 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4996 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004997 diff_cmd += ['--no-prefix']
4998
4999 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005000
5001 if args:
5002 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005003 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005004 diff_cmd.append(arg)
5005 else:
5006 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005007
5008 return diff_cmd
5009
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005010
Jamie Madill5e96ad12020-01-13 16:08:35 +00005011def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5012 """Runs clang-format-diff and sets a return value if necessary."""
5013
5014 if not clang_diff_files:
5015 return 0
5016
5017 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5018 # formatted. This is used to block during the presubmit.
5019 return_value = 0
5020
5021 # Locate the clang-format binary in the checkout
5022 try:
5023 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5024 except clang_format.NotFoundError as e:
5025 DieWithError(e)
5026
5027 if opts.full or settings.GetFormatFullByDefault():
5028 cmd = [clang_format_tool]
5029 if not opts.dry_run and not opts.diff:
5030 cmd.append('-i')
5031 if opts.dry_run:
5032 for diff_file in clang_diff_files:
5033 with open(diff_file, 'r') as myfile:
5034 code = myfile.read().replace('\r\n', '\n')
5035 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5036 stdout = stdout.replace('\r\n', '\n')
5037 if opts.diff:
5038 sys.stdout.write(stdout)
5039 if code != stdout:
5040 return_value = 2
5041 else:
5042 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5043 if opts.diff:
5044 sys.stdout.write(stdout)
5045 else:
5046 env = os.environ.copy()
5047 env['PATH'] = str(os.path.dirname(clang_format_tool))
5048 try:
5049 script = clang_format.FindClangFormatScriptInChromiumTree(
5050 'clang-format-diff.py')
5051 except clang_format.NotFoundError as e:
5052 DieWithError(e)
5053
5054 cmd = [sys.executable, script, '-p0']
5055 if not opts.dry_run and not opts.diff:
5056 cmd.append('-i')
5057
5058 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005059 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005060
5061 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5062 if opts.diff:
5063 sys.stdout.write(stdout)
5064 if opts.dry_run and len(stdout) > 0:
5065 return_value = 2
5066
5067 return return_value
5068
5069
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005070def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005071 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005072 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005073
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005074
enne@chromium.org555cfe42014-01-29 18:21:39 +00005075@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005076@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005077def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005078 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005079 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005080 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005081 parser.add_option('--full', action='store_true',
5082 help='Reformat the full content of all touched files')
5083 parser.add_option('--dry-run', action='store_true',
5084 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005085 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005086 '--no-clang-format',
5087 dest='clang_format',
5088 action='store_false',
5089 default=True,
5090 help='Disables formatting of various file types using clang-format.')
5091 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005092 '--python',
5093 action='store_true',
5094 default=None,
5095 help='Enables python formatting on all python files.')
5096 parser.add_option(
5097 '--no-python',
5098 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005099 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005100 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005101 'If neither --python or --no-python are set, python files that have a '
5102 '.style.yapf file in an ancestor directory will be formatted. '
5103 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005104 parser.add_option(
5105 '--js',
5106 action='store_true',
5107 help='Format javascript code with clang-format. '
5108 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005109 parser.add_option('--diff', action='store_true',
5110 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005111 parser.add_option('--presubmit', action='store_true',
5112 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005113 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005114
Garrett Beaty91a6f332020-01-06 16:57:24 +00005115 if opts.python is not None and opts.no_python:
5116 raise parser.error('Cannot set both --python and --no-python')
5117 if opts.no_python:
5118 opts.python = False
5119
Daniel Chengc55eecf2016-12-30 03:11:02 -08005120 # Normalize any remaining args against the current path, so paths relative to
5121 # the current directory are still resolved as expected.
5122 args = [os.path.join(os.getcwd(), arg) for arg in args]
5123
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005124 # git diff generates paths against the root of the repository. Change
5125 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005126 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005127 if rel_base_path:
5128 os.chdir(rel_base_path)
5129
digit@chromium.org29e47272013-05-17 17:01:46 +00005130 # Grab the merge-base commit, i.e. the upstream commit of the current
5131 # branch when it was created or the last time it was rebased. This is
5132 # to cover the case where the user may have called "git fetch origin",
5133 # moving the origin branch to a newer commit, but hasn't rebased yet.
5134 upstream_commit = None
5135 cl = Changelist()
5136 upstream_branch = cl.GetUpstreamBranch()
5137 if upstream_branch:
5138 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5139 upstream_commit = upstream_commit.strip()
5140
5141 if not upstream_commit:
5142 DieWithError('Could not find base commit for this branch. '
5143 'Are you in detached state?')
5144
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005145 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5146 diff_output = RunGit(changed_files_cmd)
5147 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005148 # Filter out files deleted by this CL
5149 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005150
Andreas Haas417d89c2020-02-06 10:24:27 +00005151 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005152 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005153
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005154 clang_diff_files = []
5155 if opts.clang_format:
5156 clang_diff_files = [
5157 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5158 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005159 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5160 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005161 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005162
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005163 top_dir = os.path.normpath(
5164 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5165
Jamie Madill5e96ad12020-01-13 16:08:35 +00005166 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5167 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005168
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005169 # Similar code to above, but using yapf on .py files rather than clang-format
5170 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005171 py_explicitly_disabled = opts.python is not None and not opts.python
5172 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005173 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5174 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5175 if sys.platform.startswith('win'):
5176 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005177
Aiden Bennerc08566e2018-10-03 17:52:42 +00005178 # Used for caching.
5179 yapf_configs = {}
5180 for f in python_diff_files:
5181 # Find the yapf style config for the current file, defaults to depot
5182 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005183 _FindYapfConfigFile(f, yapf_configs, top_dir)
5184
5185 # Turn on python formatting by default if a yapf config is specified.
5186 # This breaks in the case of this repo though since the specified
5187 # style file is also the global default.
5188 if opts.python is None:
5189 filtered_py_files = []
5190 for f in python_diff_files:
5191 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5192 filtered_py_files.append(f)
5193 else:
5194 filtered_py_files = python_diff_files
5195
5196 # Note: yapf still seems to fix indentation of the entire file
5197 # even if line ranges are specified.
5198 # See https://github.com/google/yapf/issues/499
5199 if not opts.full and filtered_py_files:
5200 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5201
Brian Sheedyb4307d52019-12-02 19:18:17 +00005202 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5203 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5204 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005205
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005206 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005207 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5208 # Default to pep8 if not .style.yapf is found.
5209 if not yapf_style:
5210 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005211
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005212 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005213
5214 has_formattable_lines = False
5215 if not opts.full:
5216 # Only run yapf over changed line ranges.
5217 for diff_start, diff_len in py_line_diffs[f]:
5218 diff_end = diff_start + diff_len - 1
5219 # Yapf errors out if diff_end < diff_start but this
5220 # is a valid line range diff for a removal.
5221 if diff_end >= diff_start:
5222 has_formattable_lines = True
5223 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5224 # If all line diffs were removals we have nothing to format.
5225 if not has_formattable_lines:
5226 continue
5227
5228 if opts.diff or opts.dry_run:
5229 cmd += ['--diff']
5230 # Will return non-zero exit code if non-empty diff.
5231 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5232 if opts.diff:
5233 sys.stdout.write(stdout)
5234 elif len(stdout) > 0:
5235 return_value = 2
5236 else:
5237 cmd += ['-i']
5238 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005239
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005240 # Dart's formatter does not have the nice property of only operating on
5241 # modified chunks, so hard code full.
5242 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005243 try:
5244 command = [dart_format.FindDartFmtToolInChromiumTree()]
5245 if not opts.dry_run and not opts.diff:
5246 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005247 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005248
ppi@chromium.org6593d932016-03-03 15:41:15 +00005249 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005250 if opts.dry_run and stdout:
5251 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005252 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005253 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5254 'found in this checkout. Files in other languages are still '
5255 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005256
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005257 # Format GN build files. Always run on full build files for canonical form.
5258 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005259 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005260 if opts.dry_run or opts.diff:
5261 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005262 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005263 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5264 shell=sys.platform == 'win32',
5265 cwd=top_dir)
5266 if opts.dry_run and gn_ret == 2:
5267 return_value = 2 # Not formatted.
5268 elif opts.diff and gn_ret == 2:
5269 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005270 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005271 elif gn_ret != 0:
5272 # For non-dry run cases (and non-2 return values for dry-run), a
5273 # nonzero error code indicates a failure, probably because the file
5274 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005275 DieWithError('gn format failed on ' + gn_diff_file +
5276 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005277
Ilya Shermane081cbe2017-08-15 17:51:04 -07005278 # Skip the metrics formatting from the global presubmit hook. These files have
5279 # a separate presubmit hook that issues an error if the files need formatting,
5280 # whereas the top-level presubmit script merely issues a warning. Formatting
5281 # these files is somewhat slow, so it's important not to duplicate the work.
5282 if not opts.presubmit:
5283 for xml_dir in GetDirtyMetricsDirs(diff_files):
5284 tool_dir = os.path.join(top_dir, xml_dir)
5285 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5286 if opts.dry_run or opts.diff:
5287 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005288 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005289 if opts.diff:
5290 sys.stdout.write(stdout)
5291 if opts.dry_run and stdout:
5292 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005293
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005294 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005295
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005296
Steven Holte2e664bf2017-04-21 13:10:47 -07005297def GetDirtyMetricsDirs(diff_files):
5298 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5299 metrics_xml_dirs = [
5300 os.path.join('tools', 'metrics', 'actions'),
5301 os.path.join('tools', 'metrics', 'histograms'),
5302 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005303 os.path.join('tools', 'metrics', 'ukm'),
5304 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005305 for xml_dir in metrics_xml_dirs:
5306 if any(file.startswith(xml_dir) for file in xml_diff_files):
5307 yield xml_dir
5308
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005309
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005310@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005311@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005312def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005313 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005314 _, args = parser.parse_args(args)
5315
5316 if len(args) != 1:
5317 parser.print_help()
5318 return 1
5319
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005320 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005321 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005322 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005323
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005324 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005325
Edward Lemur52969c92020-02-06 18:15:28 +00005326 issueprefix = Changelist.IssueConfigKey()
5327 output = RunGit(['config', '--local', '--get-regexp',
5328 r'branch\..*\.%s' % issueprefix],
5329 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005330
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005331 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005332 for key, issue in [x.split() for x in output.splitlines()]:
5333 if issue == target_issue:
5334 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5335
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005336 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005337 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005338 return 1
5339 if len(branches) == 1:
5340 RunGit(['checkout', branches[0]])
5341 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005342 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005343 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005344 print('%d: %s' % (i, branches[i]))
Edward Lemur1a83da12020-03-04 21:18:36 +00005345 which = ask_for_data('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005346 try:
5347 RunGit(['checkout', branches[int(which)]])
5348 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005349 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005350 return 1
5351
5352 return 0
5353
5354
maruel@chromium.org29404b52014-09-08 22:58:00 +00005355def CMDlol(parser, args):
5356 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005357 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005358 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5359 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5360 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005361 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005362 return 0
5363
5364
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005365class OptionParser(optparse.OptionParser):
5366 """Creates the option parse and add --verbose support."""
5367 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005368 optparse.OptionParser.__init__(
5369 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005370 self.add_option(
5371 '-v', '--verbose', action='count', default=0,
5372 help='Use 2 times for more debugging info')
5373
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005374 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005375 try:
5376 return self._parse_args(args)
5377 finally:
5378 # Regardless of success or failure of args parsing, we want to report
5379 # metrics, but only after logging has been initialized (if parsing
5380 # succeeded).
5381 global settings
5382 settings = Settings()
5383
5384 if not metrics.DISABLE_METRICS_COLLECTION:
5385 # GetViewVCUrl ultimately calls logging method.
5386 project_url = settings.GetViewVCUrl().strip('/+')
5387 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5388 metrics.collector.add('project_urls', [project_url])
5389
5390 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005391 # Create an optparse.Values object that will store only the actual passed
5392 # options, without the defaults.
5393 actual_options = optparse.Values()
5394 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5395 # Create an optparse.Values object with the default options.
5396 options = optparse.Values(self.get_default_values().__dict__)
5397 # Update it with the options passed by the user.
5398 options._update_careful(actual_options.__dict__)
5399 # Store the options passed by the user in an _actual_options attribute.
5400 # We store only the keys, and not the values, since the values can contain
5401 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005402 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005403
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005404 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005405 logging.basicConfig(
5406 level=levels[min(options.verbose, len(levels) - 1)],
5407 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5408 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005409
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005410 return options, args
5411
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005412
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005413def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005414 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005415 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005416 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005417 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005418
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005419 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005420 dispatcher = subcommand.CommandDispatcher(__name__)
5421 try:
5422 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005423 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005424 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005425 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005426 if e.code != 500:
5427 raise
5428 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005429 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005430 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005431 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005432
5433
5434if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005435 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5436 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005437 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005438 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005439 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005440 sys.exit(main(sys.argv[1:]))