blob: 72cd32d294342ab9b2b628e0c6d4d17170558835 [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 Sokcevic8c5cdf12020-02-27 20:19:04 +0000136 print('\n ** Content of CL description **\n' +
137 '='*72 + '\n' +
138 change_desc + '\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
maruel@chromium.org90541732011-04-01 17:54:18 +0000231def ask_for_data(prompt):
232 try:
233 return raw_input(prompt)
234 except KeyboardInterrupt:
235 # Hide the exception.
236 sys.exit(1)
237
238
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100239def confirm_or_exit(prefix='', action='confirm'):
240 """Asks user to press enter to continue or press Ctrl+C to abort."""
241 if not prefix or prefix.endswith('\n'):
242 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100243 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 mid = ' Press'
245 elif prefix.endswith(' '):
246 mid = 'press'
247 else:
248 mid = ' press'
249 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
250
251
252def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000253 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100254 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
255 while True:
256 if 'yes'.startswith(result):
257 return True
258 if 'no'.startswith(result):
259 return False
260 result = ask_for_data('Please, type yes or no: ').lower()
261
262
tandrii5d48c322016-08-18 16:19:37 -0700263def _git_branch_config_key(branch, key):
264 """Helper method to return Git config key for a branch."""
265 assert branch, 'branch name is required to set git config for it'
266 return 'branch.%s.%s' % (branch, key)
267
268
machenbach@chromium.org45453142015-09-15 08:45:22 +0000269def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000270 prop_list = getattr(options, 'properties', [])
271 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000272 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000273 try:
274 properties[key] = json.loads(val)
275 except ValueError:
276 pass # If a value couldn't be evaluated, treat it as a string.
277 return properties
278
279
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000280# TODO(crbug.com/976104): Remove this function once git-cl try-results has
281# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000282def _buildbucket_retry(operation_name, http, *args, **kwargs):
283 """Retries requests to buildbucket service and returns parsed json content."""
284 try_count = 0
285 while True:
286 response, content = http.request(*args, **kwargs)
287 try:
288 content_json = json.loads(content)
289 except ValueError:
290 content_json = None
291
292 # Buildbucket could return an error even if status==200.
293 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000294 error = content_json.get('error')
295 if error.get('code') == 403:
296 raise BuildbucketResponseException(
297 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000298 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000299 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000300 raise BuildbucketResponseException(msg)
301
302 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700303 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000304 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000305 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700306 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000307 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000308 content)
309 return content_json
310 if response.status < 500 or try_count >= 2:
311 raise httplib2.HttpLib2Error(content)
312
313 # status >= 500 means transient failures.
314 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000315 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000316 try_count += 1
317 assert False, 'unreachable'
318
319
Edward Lemur4c707a22019-09-24 21:13:43 +0000320def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000321 """Calls a buildbucket v2 method and returns the parsed json response."""
322 headers = {
323 'Accept': 'application/json',
324 'Content-Type': 'application/json',
325 }
326 request = json.dumps(request)
327 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
328
329 logging.info('POST %s with %s' % (url, request))
330
331 attempts = 1
332 time_to_sleep = 1
333 while True:
334 response, content = http.request(url, 'POST', body=request, headers=headers)
335 if response.status == 200:
336 return json.loads(content[4:])
337 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
338 msg = '%s error when calling POST %s with %s: %s' % (
339 response.status, url, request, content)
340 raise BuildbucketResponseException(msg)
341 logging.debug(
342 '%s error when calling POST %s with %s. '
343 'Sleeping for %d seconds and retrying...' % (
344 response.status, url, request, time_to_sleep))
345 time.sleep(time_to_sleep)
346 time_to_sleep *= 2
347 attempts += 1
348
349 assert False, 'unreachable'
350
351
qyearsley1fdfcb62016-10-24 13:22:03 -0700352def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700353 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000354 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700355 """
qyearsleydd49f942016-10-28 11:57:22 -0700356 # If no bots are listed, we try to get a set of builders and tests based
357 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700358 if not options.bot:
Edward Lemur3b8094a2020-02-07 22:34:43 +0000359 change = changelist.GetChange(changelist.GetCommonAncestorWithUpstream())
qyearsley136b49f2016-10-31 09:02:26 -0700360 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700361 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700362 change=change,
363 changed_files=change.LocalPaths(),
364 repository_root=settings.GetRoot(),
365 default_presubmit=None,
366 project=None,
367 verbose=options.verbose,
368 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700369 if masters is None:
370 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000371 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700372
qyearsley1fdfcb62016-10-24 13:22:03 -0700373 if options.bucket:
374 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000375 option_parser.error(
Edward Lemur5ef16a32019-11-11 21:13:25 +0000376 'Please specify the bucket, e.g. "-B chromium/try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700377
378
Edward Lemur6215c792019-10-03 21:59:05 +0000379def _parse_bucket(raw_bucket):
380 legacy = True
381 project = bucket = None
382 if '/' in raw_bucket:
383 legacy = False
384 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000385 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000386 elif raw_bucket.startswith('luci.'):
387 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000388 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000389 elif '.' in raw_bucket:
390 project = raw_bucket.split('.')[0]
391 bucket = raw_bucket
392 # Legacy buckets.
393 if legacy:
394 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
395 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000396
397
Edward Lemur5b929a42019-10-21 17:57:39 +0000398def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000399 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700400
401 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000402 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700403 buckets: A nested dict mapping bucket names to builders to tests.
404 options: Command-line options.
405 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000406 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000407 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000408 print('Bucket:', bucket)
409 print('\n'.join(
410 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000411 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000412 print('To see results here, run: git cl try-results')
413 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700414
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000415 requests = _make_try_job_schedule_requests(
416 changelist, buckets, options, patchset)
417 if not requests:
418 return
419
Edward Lemur5b929a42019-10-21 17:57:39 +0000420 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000421 http.force_exception_to_status_code = True
422
423 batch_request = {'requests': requests}
424 batch_response = _call_buildbucket(
425 http, options.buildbucket_host, 'Batch', batch_request)
426
427 errors = [
428 ' ' + response['error']['message']
429 for response in batch_response.get('responses', [])
430 if 'error' in response
431 ]
432 if errors:
433 raise BuildbucketResponseException(
434 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
435
436
437def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000438 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000439 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000440 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000441 shared_properties['clobber'] = True
442 shared_properties.update(_get_properties_from_options(options) or {})
443
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000444 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
445 if options.retry_failed:
446 shared_tags.append({'key': 'retry_failed',
447 'value': '1'})
448
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000449 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000450 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000451 project, bucket = _parse_bucket(raw_bucket)
452 if not project or not bucket:
453 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
454 continue
455
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000456 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000457 properties = shared_properties.copy()
458 if 'presubmit' in builder.lower():
459 properties['dry_run'] = 'true'
460 if tests:
461 properties['testfilter'] = tests
462
463 requests.append({
464 'scheduleBuild': {
465 'requestId': str(uuid.uuid4()),
466 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000467 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000468 'bucket': bucket,
469 'builder': builder,
470 },
471 'gerritChanges': gerrit_changes,
472 'properties': properties,
473 'tags': [
474 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000475 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000476 }
477 })
Anthony Polito1a5fe232020-01-24 23:17:52 +0000478
479 if options.revision:
480 requests[-1]['scheduleBuild']['gitilesCommit'] = {
481 'host': gerrit_changes[0]['host'],
482 'project': gerrit_changes[0]['project'],
483 'id': options.revision
484 }
485
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000486 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000487
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000488
Edward Lemur5b929a42019-10-21 17:57:39 +0000489def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000490 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000491
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000492 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000493 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000494 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000495 request = {
496 'predicate': {
497 'gerritChanges': [changelist.GetGerritChange(patchset)],
498 },
499 'fields': ','.join('builds.*.' + field for field in fields),
500 }
tandrii221ab252016-10-06 08:12:04 -0700501
Edward Lemur5b929a42019-10-21 17:57:39 +0000502 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000503 if authenticator.has_cached_credentials():
504 http = authenticator.authorize(httplib2.Http())
505 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700506 print('Warning: Some results might be missing because %s' %
507 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000508 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000509 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000510 http.force_exception_to_status_code = True
511
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000512 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
513 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000514
Edward Lemur5b929a42019-10-21 17:57:39 +0000515def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000516 """Fetches builds from the latest patchset that has builds (within
517 the last few patchsets).
518
519 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000520 changelist (Changelist): The CL to fetch builds for
521 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000522 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
523 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000524 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000525 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
526 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000527 """
528 assert buildbucket_host
529 assert changelist.GetIssue(), 'CL must be uploaded first'
530 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000531 if latest_patchset is None:
532 assert changelist.GetMostRecentPatchset()
533 ps = changelist.GetMostRecentPatchset()
534 else:
535 assert latest_patchset > 0, latest_patchset
536 ps = latest_patchset
537
Quinten Yearsley983111f2019-09-26 17:18:48 +0000538 min_ps = max(1, ps - 5)
539 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000540 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000541 if len(builds):
542 return builds, ps
543 ps -= 1
544 return [], 0
545
546
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000547def _filter_failed_for_retry(all_builds):
548 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000549
550 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000551 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000552 i.e. a list of buildbucket.v2.Builds which includes status and builder
553 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000554
555 Returns:
556 A dict of bucket to builder to tests (empty list). This is the same format
557 accepted by _trigger_try_jobs and returned by _get_bucket_map.
558 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000559
560 def _builder_of(build):
561 builder = build['builder']
562 return (builder['project'], builder['bucket'], builder['builder'])
563
564 res = collections.defaultdict(dict)
565 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
566 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
567 # If builder had several builds, retry only if the last one failed.
568 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
569 # build, but in case of retrying failed jobs retrying a flaky one makes
570 # sense.
571 builds = list(builds)
572 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
573 continue
574 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
575 for t in builds[-1]['tags']):
576 # Don't retry experimental build previously triggered by CQ.
577 continue
578 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
579 # Don't retry if any are running.
580 continue
581 res[proj + '/' + buck][bldr] = []
582 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000583
584
qyearsleyeab3c042016-08-24 09:18:28 -0700585def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000586 """Prints nicely result of fetch_try_jobs."""
587 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000588 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000589 return
590
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000591 longest_builder = max(len(b['builder']['builder']) for b in builds)
592 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000593 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000594 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
595 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000596
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000597 builds_by_status = {}
598 for b in builds:
599 builds_by_status.setdefault(b['status'], []).append({
600 'id': b['id'],
601 'name': name_fmt.format(
602 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
603 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000604
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000605 sort_key = lambda b: (b['name'], b['id'])
606
607 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000608 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000609 if not builds:
610 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000611
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000612 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000613 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000614 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 else:
616 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
617
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000618 print(colorize(title))
619 for b in sorted(builds, key=sort_key):
620 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000621
622 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000623 print_builds(
624 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
625 print_builds(
626 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
627 color=Fore.MAGENTA)
628 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
629 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
630 color=Fore.MAGENTA)
631 print_builds('Started:', builds_by_status.pop('STARTED', []))
632 print_builds(
633 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000634 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000635 print_builds(
636 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000637 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000638
639
Aiden Bennerc08566e2018-10-03 17:52:42 +0000640def _ComputeDiffLineRanges(files, upstream_commit):
641 """Gets the changed line ranges for each file since upstream_commit.
642
643 Parses a git diff on provided files and returns a dict that maps a file name
644 to an ordered list of range tuples in the form (start_line, count).
645 Ranges are in the same format as a git diff.
646 """
647 # If files is empty then diff_output will be a full diff.
648 if len(files) == 0:
649 return {}
650
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000651 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000652 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000653 diff_output = RunGit(diff_cmd)
654
655 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
656 # 2 capture groups
657 # 0 == fname of diff file
658 # 1 == 'diff_start,diff_count' or 'diff_start'
659 # will match each of
660 # diff --git a/foo.foo b/foo.py
661 # @@ -12,2 +14,3 @@
662 # @@ -12,2 +17 @@
663 # running re.findall on the above string with pattern will give
664 # [('foo.py', ''), ('', '14,3'), ('', '17')]
665
666 curr_file = None
667 line_diffs = {}
668 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
669 if match[0] != '':
670 # Will match the second filename in diff --git a/a.py b/b.py.
671 curr_file = match[0]
672 line_diffs[curr_file] = []
673 else:
674 # Matches +14,3
675 if ',' in match[1]:
676 diff_start, diff_count = match[1].split(',')
677 else:
678 # Single line changes are of the form +12 instead of +12,1.
679 diff_start = match[1]
680 diff_count = 1
681
682 diff_start = int(diff_start)
683 diff_count = int(diff_count)
684
685 # If diff_count == 0 this is a removal we can ignore.
686 line_diffs[curr_file].append((diff_start, diff_count))
687
688 return line_diffs
689
690
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000691def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000692 """Checks if a yapf file is in any parent directory of fpath until top_dir.
693
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000694 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000695 is found returns None. Uses yapf_config_cache as a cache for previously found
696 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000697 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000698 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000699 # Return result if we've already computed it.
700 if fpath in yapf_config_cache:
701 return yapf_config_cache[fpath]
702
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000703 parent_dir = os.path.dirname(fpath)
704 if os.path.isfile(fpath):
705 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000706 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000707 # Otherwise fpath is a directory
708 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
709 if os.path.isfile(yapf_file):
710 ret = yapf_file
711 elif fpath == top_dir or parent_dir == fpath:
712 # If we're at the top level directory, or if we're at root
713 # there is no provided style.
714 ret = None
715 else:
716 # Otherwise recurse on the current directory.
717 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000718 yapf_config_cache[fpath] = ret
719 return ret
720
721
Brian Sheedyb4307d52019-12-02 19:18:17 +0000722def _GetYapfIgnorePatterns(top_dir):
723 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000724
725 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
726 but this functionality appears to break when explicitly passing files to
727 yapf for formatting. According to
728 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
729 the .yapfignore file should be in the directory that yapf is invoked from,
730 which we assume to be the top level directory in this case.
731
732 Args:
733 top_dir: The top level directory for the repository being formatted.
734
735 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000736 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000737 """
738 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000739 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000740 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000741 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000742
Brian Sheedyb4307d52019-12-02 19:18:17 +0000743 with open(yapfignore_file) as f:
744 for line in f.readlines():
745 stripped_line = line.strip()
746 # Comments and blank lines should be ignored.
747 if stripped_line.startswith('#') or stripped_line == '':
748 continue
749 ignore_patterns.add(stripped_line)
750 return ignore_patterns
751
752
753def _FilterYapfIgnoredFiles(filepaths, patterns):
754 """Filters out any filepaths that match any of the given patterns.
755
756 Args:
757 filepaths: An iterable of strings containing filepaths to filter.
758 patterns: An iterable of strings containing fnmatch patterns to filter on.
759
760 Returns:
761 A list of strings containing all the elements of |filepaths| that did not
762 match any of the patterns in |patterns|.
763 """
764 # Not inlined so that tests can use the same implementation.
765 return [f for f in filepaths
766 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000767
768
Aaron Gable13101a62018-02-09 13:20:41 -0800769def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000770 """Prints statistics about the change to the user."""
771 # --no-ext-diff is broken in some versions of Git, so try to work around
772 # this by overriding the environment (but there is still a problem if the
773 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000774 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000775 if 'GIT_EXTERNAL_DIFF' in env:
776 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000777
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000778 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800779 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000780 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000781
782
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000783class BuildbucketResponseException(Exception):
784 pass
785
786
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787class Settings(object):
788 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000789 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000790 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000791 self.tree_status_url = None
792 self.viewvc_url = None
793 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000794 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000795 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000796 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000797 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000798 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000799
Edward Lemur26964072020-02-19 19:18:51 +0000800 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000801 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000802 if self.updated:
803 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000804
Edward Lemur26964072020-02-19 19:18:51 +0000805 # The only value that actually changes the behavior is
806 # autoupdate = "false". Everything else means "true".
807 autoupdate = (
808 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
809
810 cr_settings_file = FindCodereviewSettingsFile()
811 if autoupdate != 'false' and cr_settings_file:
812 LoadCodereviewSettingsFromFile(cr_settings_file)
813 cr_settings_file.close()
814
815 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000816
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000817 @staticmethod
818 def GetRelativeRoot():
819 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000820
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000821 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000822 if self.root is None:
823 self.root = os.path.abspath(self.GetRelativeRoot())
824 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000825
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000826 def GetTreeStatusUrl(self, error_ok=False):
827 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000828 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
829 if self.tree_status_url is None and not error_ok:
830 DieWithError(
831 'You must configure your tree status URL by running '
832 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833 return self.tree_status_url
834
835 def GetViewVCUrl(self):
836 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000837 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000838 return self.viewvc_url
839
rmistry@google.com90752582014-01-14 21:04:50 +0000840 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000841 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000842
rmistry@google.com5626a922015-02-26 14:03:30 +0000843 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000844 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000845 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000846 return run_post_upload_hook == "True"
847
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000848 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000849 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000850
ukai@chromium.orge8077812012-02-03 03:41:46 +0000851 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000852 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000853 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000854 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000855 return self.is_gerrit
856
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000857 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000858 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000859 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700860 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000861 if self.squash_gerrit_uploads is None:
862 # Default is squash now (http://crbug.com/611892#c23).
863 self.squash_gerrit_uploads = self._GetConfig(
864 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000865 return self.squash_gerrit_uploads
866
tandriia60502f2016-06-20 02:01:53 -0700867 def GetSquashGerritUploadsOverride(self):
868 """Return True or False if codereview.settings should be overridden.
869
870 Returns None if no override has been defined.
871 """
872 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000873 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700874 if result == 'true':
875 return True
876 if result == 'false':
877 return False
878 return None
879
tandrii@chromium.org28253532016-04-14 13:46:56 +0000880 def GetGerritSkipEnsureAuthenticated(self):
881 """Return True if EnsureAuthenticated should not be done for Gerrit
882 uploads."""
883 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000884 self.gerrit_skip_ensure_authenticated = self._GetConfig(
885 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000886 return self.gerrit_skip_ensure_authenticated
887
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000888 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000889 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000890 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000891 # Git requires single quotes for paths with spaces. We need to replace
892 # them with double quotes for Windows to treat such paths as a single
893 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000894 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000895 return self.git_editor or None
896
thestig@chromium.org44202a22014-03-11 19:22:18 +0000897 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000898 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000899
900 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000901 return self._GetConfig(
902 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000903
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000904 def GetFormatFullByDefault(self):
905 if self.format_full_by_default is None:
906 result = (
907 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
908 error_ok=True).strip())
909 self.format_full_by_default = (result == 'true')
910 return self.format_full_by_default
911
Edward Lemur26964072020-02-19 19:18:51 +0000912 def _GetConfig(self, key, default=''):
913 self._LazyUpdateIfNeeded()
914 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000915
916
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000917class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000918 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000919 NONE = 'none'
920 DRY_RUN = 'dry_run'
921 COMMIT = 'commit'
922
923 ALL_STATES = [NONE, DRY_RUN, COMMIT]
924
925
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000926class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000927 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000928 self.issue = issue
929 self.patchset = patchset
930 self.hostname = hostname
931
932 @property
933 def valid(self):
934 return self.issue is not None
935
936
Edward Lemurf38bc172019-09-03 21:02:13 +0000937def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000938 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
939 fail_result = _ParsedIssueNumberArgument()
940
Edward Lemur678a6842019-10-03 22:25:05 +0000941 if isinstance(arg, int):
942 return _ParsedIssueNumberArgument(issue=arg)
943 if not isinstance(arg, basestring):
944 return fail_result
945
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000946 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000947 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000948 if not arg.startswith('http'):
949 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700950
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000951 url = gclient_utils.UpgradeToHttps(arg)
952 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000953 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000954 except ValueError:
955 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200956
Edward Lemur678a6842019-10-03 22:25:05 +0000957 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
958 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
959 # Short urls like https://domain/<issue_number> can be used, but don't allow
960 # specifying the patchset (you'd 404), but we allow that here.
961 if parsed_url.path == '/':
962 part = parsed_url.fragment
963 else:
964 part = parsed_url.path
965
966 match = re.match(
967 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
968 if not match:
969 return fail_result
970
971 issue = int(match.group('issue'))
972 patchset = match.group('patchset')
973 return _ParsedIssueNumberArgument(
974 issue=issue,
975 patchset=int(patchset) if patchset else None,
976 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000977
978
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000979def _create_description_from_log(args):
980 """Pulls out the commit log to use as a base for the CL description."""
981 log_args = []
982 if len(args) == 1 and not args[0].endswith('.'):
983 log_args = [args[0] + '..']
984 elif len(args) == 1 and args[0].endswith('...'):
985 log_args = [args[0][:-1]]
986 elif len(args) == 2:
987 log_args = [args[0] + '..' + args[1]]
988 else:
989 log_args = args[:] # Hope for the best!
990 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
991
992
Aaron Gablea45ee112016-11-22 15:14:38 -0800993class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700994 def __init__(self, issue, url):
995 self.issue = issue
996 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800997 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700998
999 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001000 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001001 self.issue, self.url)
1002
1003
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001004_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001005 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001006 # TODO(tandrii): these two aren't known in Gerrit.
1007 'approval', 'disapproval'])
1008
1009
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001010class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001011 """Changelist works with one changelist in local branch.
1012
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001013 Notes:
1014 * Not safe for concurrent multi-{thread,process} use.
1015 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001016 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001017 """
1018
Edward Lemur125d60a2019-09-13 18:25:41 +00001019 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001020 """Create a new ChangeList instance.
1021
Edward Lemurf38bc172019-09-03 21:02:13 +00001022 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001023 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001024 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001025 global settings
1026 if not settings:
1027 # Happens when git_cl.py is used as a utility library.
1028 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001029
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 self.branchref = branchref
1031 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001032 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001033 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 else:
1035 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001037 self.lookedup_issue = False
1038 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001039 self.description = None
Edward Lemur9aa1a962020-02-25 00:58:38 +00001040 self.local_description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001041 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001042 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001043 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001044 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001045 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001046 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001047
Edward Lemur125d60a2019-09-13 18:25:41 +00001048 # Lazily cached values.
1049 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1050 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1051 # Map from change number (issue) to its detail cache.
1052 self._detail_cache = {}
1053
1054 if codereview_host is not None:
1055 assert not codereview_host.startswith('https://'), codereview_host
1056 self._gerrit_host = codereview_host
1057 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001058
1059 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001060 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001061
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001062 The return value is a string suitable for passing to git cl with the --cc
1063 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001064 """
1065 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001066 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001067 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001068 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1069 return self.cc
1070
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001071 def GetCCListWithoutDefault(self):
1072 """Return the users cc'd on this CL excluding default ones."""
1073 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001074 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001075 return self.cc
1076
Daniel Cheng7227d212017-11-17 08:12:37 -08001077 def ExtendCC(self, more_cc):
1078 """Extends the list of users to cc on this CL based on the changed files."""
1079 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001080
1081 def GetBranch(self):
1082 """Returns the short branch name, e.g. 'master'."""
1083 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001084 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001085 if not branchref:
1086 return None
1087 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001088 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001089 return self.branch
1090
1091 def GetBranchRef(self):
1092 """Returns the full branch name, e.g. 'refs/heads/master'."""
1093 self.GetBranch() # Poke the lazy loader.
1094 return self.branchref
1095
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001096 def ClearBranch(self):
1097 """Clears cached branch data of this object."""
1098 self.branch = self.branchref = None
1099
Edward Lemur85153282020-02-14 22:06:29 +00001100 def _GitGetBranchConfigValue(self, key, default=None):
1101 return scm.GIT.GetBranchConfig(
1102 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001103
Edward Lemur85153282020-02-14 22:06:29 +00001104 def _GitSetBranchConfigValue(self, key, value):
1105 action = 'set %s to %r' % (key, value)
1106 if not value:
1107 action = 'unset %s' % key
1108 assert self.GetBranch(), 'a branch is needed to ' + action
1109 return scm.GIT.SetBranchConfig(
1110 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001111
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001112 @staticmethod
1113 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001114 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001115 e.g. 'origin', 'refs/heads/master'
1116 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001117 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1118 settings.GetRoot(), branch)
1119 if not remote or not upstream_branch:
1120 DieWithError(
1121 'Unable to determine default branch to diff against.\n'
1122 'Either pass complete "git diff"-style arguments, like\n'
1123 ' git cl upload origin/master\n'
1124 'or verify this branch is set up to track another \n'
1125 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001126
1127 return remote, upstream_branch
1128
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001129 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001130 upstream_branch = self.GetUpstreamBranch()
1131 if not BranchExists(upstream_branch):
1132 DieWithError('The upstream for the current branch (%s) does not exist '
1133 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001134 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001135 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001136
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001137 def GetUpstreamBranch(self):
1138 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001139 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001140 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001141 upstream_branch = upstream_branch.replace('refs/heads/',
1142 'refs/remotes/%s/' % remote)
1143 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1144 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145 self.upstream_branch = upstream_branch
1146 return self.upstream_branch
1147
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001148 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001149 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001150 remote, branch = None, self.GetBranch()
1151 seen_branches = set()
1152 while branch not in seen_branches:
1153 seen_branches.add(branch)
1154 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001155 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001156 if remote != '.' or branch.startswith('refs/remotes'):
1157 break
1158 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001159 remotes = RunGit(['remote'], error_ok=True).split()
1160 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001161 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001162 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001163 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001164 logging.warn('Could not determine which remote this change is '
1165 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001166 else:
1167 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001168 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 branch = 'HEAD'
1170 if branch.startswith('refs/remotes'):
1171 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001172 elif branch.startswith('refs/branch-heads/'):
1173 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 else:
1175 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001176 return self._remote
1177
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 def GitSanityChecks(self, upstream_git_obj):
1179 """Checks git repo status and ensures diff is from local commits."""
1180
sbc@chromium.org79706062015-01-14 21:18:12 +00001181 if upstream_git_obj is None:
1182 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001183 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001184 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001185 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001186 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001187 return False
1188
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001189 # Verify the commit we're diffing against is in our current branch.
1190 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1191 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1192 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001193 print('ERROR: %s is not in the current branch. You may need to rebase '
1194 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001195 return False
1196
1197 # List the commits inside the diff, and verify they are all local.
1198 commits_in_diff = RunGit(
1199 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1200 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1201 remote_branch = remote_branch.strip()
1202 if code != 0:
1203 _, remote_branch = self.GetRemoteBranch()
1204
1205 commits_in_remote = RunGit(
1206 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1207
1208 common_commits = set(commits_in_diff) & set(commits_in_remote)
1209 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001210 print('ERROR: Your diff contains %d commits already in %s.\n'
1211 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1212 'the diff. If you are using a custom git flow, you can override'
1213 ' the reference used for this check with "git config '
1214 'gitcl.remotebranch <git-ref>".' % (
1215 len(common_commits), remote_branch, upstream_git_obj),
1216 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001217 return False
1218 return True
1219
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001220 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001221 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001222
1223 Returns None if it is not set.
1224 """
tandrii5d48c322016-08-18 16:19:37 -07001225 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001226
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001227 def GetRemoteUrl(self):
1228 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1229
1230 Returns None if there is no remote.
1231 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001232 is_cached, value = self._cached_remote_url
1233 if is_cached:
1234 return value
1235
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001236 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001237 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001238
Edward Lemur298f2cf2019-02-22 21:40:39 +00001239 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001240 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001241 if host:
1242 self._cached_remote_url = (True, url)
1243 return url
1244
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001245 # If it cannot be parsed as an url, assume it is a local directory,
1246 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001247 logging.warning('"%s" doesn\'t appear to point to a git host. '
1248 'Interpreting it as a local directory.', url)
1249 if not os.path.isdir(url):
1250 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001251 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1252 'but it doesn\'t exist.',
1253 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001254 return None
1255
1256 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001257 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001258
Edward Lemur79d4f992019-11-11 23:49:02 +00001259 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001260 if not host:
1261 logging.error(
1262 'Remote "%(remote)s" for branch "%(branch)s" points to '
1263 '"%(cache_path)s", but it is misconfigured.\n'
1264 '"%(cache_path)s" must be a git repo and must have a remote named '
1265 '"%(remote)s" pointing to the git host.', {
1266 'remote': remote,
1267 'cache_path': cache_path,
1268 'branch': self.GetBranch()})
1269 return None
1270
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001271 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001272 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001273
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001274 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001275 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001276 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001277 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1278 if self.issue is not None:
1279 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001280 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001281 return self.issue
1282
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283 def GetIssueURL(self):
1284 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001285 issue = self.GetIssue()
1286 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001287 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001288 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001289
Edward Lemur7f6dec02020-02-06 20:23:58 +00001290 def GetLocalDescription(self, upstream_branch):
1291 """Return the log messages of all commits up to the branch point."""
Edward Lemur9aa1a962020-02-25 00:58:38 +00001292 if self.local_description is None:
1293 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1294 self.local_description = RunGitWithCode(args)[1].strip()
1295 return self.local_description
Edward Lemur7f6dec02020-02-06 20:23:58 +00001296
Edward Lemur6c6827c2020-02-06 21:15:18 +00001297 def FetchDescription(self, pretty=False):
1298 assert self.GetIssue(), 'issue is required to query Gerrit'
1299
Edward Lemur9aa1a962020-02-25 00:58:38 +00001300 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001301 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1302 current_rev = data['current_revision']
1303 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001304
1305 if not pretty:
1306 return self.description
1307
1308 # Set width to 72 columns + 2 space indent.
1309 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1310 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1311 lines = self.description.splitlines()
1312 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001313
1314 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001315 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001316 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001317 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1318 if self.patchset is not None:
1319 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001320 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001321 return self.patchset
1322
Edward Lemur9aa1a962020-02-25 00:58:38 +00001323 def GetAuthor(self):
1324 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1325
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001326 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001327 """Set this branch's patchset. If patchset=0, clears the patchset."""
1328 assert self.GetBranch()
1329 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001330 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001331 else:
1332 self.patchset = int(patchset)
1333 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001334 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001335
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001336 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001337 """Set this branch's issue. If issue isn't given, clears the issue."""
1338 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001339 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001340 issue = int(issue)
1341 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001342 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001343 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001344 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001345 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001346 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001347 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001348 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001349 else:
tandrii5d48c322016-08-18 16:19:37 -07001350 # Reset all of these just to be clean.
1351 reset_suffixes = [
1352 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001353 self.IssueConfigKey(),
1354 self.PatchsetConfigKey(),
1355 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001356 ] + self._PostUnsetIssueProperties()
1357 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001358 try:
1359 self._GitSetBranchConfigValue(prop, None)
1360 except subprocess2.CalledProcessError:
1361 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001362 msg = RunGit(['log', '-1', '--format=%B']).strip()
1363 if msg and git_footers.get_footer_change_id(msg):
1364 print('WARNING: The change patched into this branch has a Change-Id. '
1365 'Removing it.')
1366 RunGit(['commit', '--amend', '-m',
1367 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001368 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001369 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001370 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001371
Edward Lemur7f6dec02020-02-06 20:23:58 +00001372 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001373 if not self.GitSanityChecks(upstream_branch):
1374 DieWithError('\nGit sanity check failure')
1375
Edward Lemur7f6dec02020-02-06 20:23:58 +00001376 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001377 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001378 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001379 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001380 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001381 except subprocess2.CalledProcessError:
1382 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001383 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001384 'This branch probably doesn\'t exist anymore. To reset the\n'
1385 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001386 ' git branch --set-upstream-to origin/master %s\n'
1387 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001388 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001389
maruel@chromium.org52424302012-08-29 15:14:30 +00001390 issue = self.GetIssue()
1391 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001392 if issue:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001393 description = self.FetchDescription()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001394 else:
1395 # If the change was never uploaded, use the log messages of all commits
1396 # up to the branch point, as git cl upload will prefill the description
1397 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001398 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001399
Edward Lemur9aa1a962020-02-25 00:58:38 +00001400 author = self.GetAuthor()
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001401 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001402 name,
1403 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001404 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001405 files,
1406 issue,
1407 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001408 author,
1409 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001410
dsansomee2d6fd92016-09-08 00:10:47 -07001411 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001412 assert self.GetIssue(), 'issue is required to update description'
1413
1414 if gerrit_util.HasPendingChangeEdit(
1415 self._GetGerritHost(), self._GerritChangeIdentifier()):
1416 if not force:
1417 confirm_or_exit(
1418 'The description cannot be modified while the issue has a pending '
1419 'unpublished edit. Either publish the edit in the Gerrit web UI '
1420 'or delete it.\n\n', action='delete the unpublished edit')
1421
1422 gerrit_util.DeletePendingChangeEdit(
1423 self._GetGerritHost(), self._GerritChangeIdentifier())
1424 gerrit_util.SetCommitMessage(
1425 self._GetGerritHost(), self._GerritChangeIdentifier(),
1426 description, notify='NONE')
1427
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001428 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001429
Edward Lemur227d5102020-02-25 23:45:35 +00001430 def RunHook(
1431 self, committing, may_prompt, verbose, parallel, upstream, description,
1432 all_files):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001433 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
Edward Lemur227d5102020-02-25 23:45:35 +00001434 args = [
1435 '--commit' if committing else '--upload',
1436 '--author', self.GetAuthor(),
1437 '--root', settings.GetRoot(),
1438 '--upstream', upstream,
1439 ]
1440
1441 args.extend(['--verbose'] * verbose)
1442
1443 issue = self.GetIssue()
1444 patchset = self.GetPatchset()
1445 gerrit_url = self.GetCodereviewServer()
1446 if issue:
1447 args.extend(['--issue', str(issue)])
1448 if patchset:
1449 args.extend(['--patchset', str(patchset)])
1450 if gerrit_url:
1451 args.extend(['--gerrit_url', gerrit_url])
1452
1453 if may_prompt:
1454 args.append('--may_prompt')
1455 if parallel:
1456 args.append('--parallel')
1457 if all_files:
1458 args.append('--all_files')
1459
1460 with gclient_utils.temporary_file() as description_file:
1461 with gclient_utils.temporary_file() as json_output:
1462 gclient_utils.FileWrite(
1463 description_file, description.encode('utf-8'), mode='wb')
1464 args.extend(['--json_output', json_output])
1465 args.extend(['--description_file', description_file])
1466
1467 start = time_time()
1468 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1469 exit_code = p.wait()
1470 metrics.collector.add_repeated('sub_commands', {
1471 'command': 'presubmit',
1472 'execution_time': time_time() - start,
1473 'exit_code': exit_code,
1474 })
1475
1476 if exit_code:
1477 sys.exit(exit_code)
1478
1479 json_results = gclient_utils.FileRead(json_output)
1480 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001481
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001482 def CMDUpload(self, options, git_diff_args, orig_args):
1483 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001484 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001485 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001486 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001487 else:
1488 if self.GetBranch() is None:
1489 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1490
1491 # Default to diffing against common ancestor of upstream branch
1492 base_branch = self.GetCommonAncestorWithUpstream()
1493 git_diff_args = [base_branch, 'HEAD']
1494
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001495 # Fast best-effort checks to abort before running potentially expensive
1496 # hooks if uploading is likely to fail anyway. Passing these checks does
1497 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001498 self.EnsureAuthenticated(force=options.force)
1499 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001500
1501 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001502 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001503 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1504 files = [f.LocalPath() for f in change.AffectedFiles()]
1505 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001506 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001507
1508 if not options.bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001509 description = change.FullDescriptionText()
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001510 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001511 # Set the reviewer list now so that presubmit checks can access it.
Edward Lemur227d5102020-02-25 23:45:35 +00001512 change_description = ChangeDescription(description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001513 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001514 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001515 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001516 change)
Edward Lemur227d5102020-02-25 23:45:35 +00001517 description = change_description.description
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001518 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001519 may_prompt=not options.force,
1520 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001521 parallel=options.parallel,
1522 upstream=base_branch,
1523 description=description,
1524 all_files=False)
1525 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001526
Aaron Gable13101a62018-02-09 13:20:41 -08001527 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001528 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001529 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001530 self._GitSetBranchConfigValue(
1531 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001532 # Run post upload hooks, if specified.
1533 if settings.GetRunPostUploadHook():
1534 presubmit_support.DoPostUploadExecuter(
1535 change,
Edward Lemur016a0872020-02-04 22:13:28 +00001536 self.GetGerritObjForPresubmit(),
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001537 settings.GetRoot(),
1538 options.verbose,
1539 sys.stdout)
1540
1541 # Upload all dependencies if specified.
1542 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001543 print()
1544 print('--dependencies has been specified.')
1545 print('All dependent local branches will be re-uploaded.')
1546 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001547 # Remove the dependencies flag from args so that we do not end up in a
1548 # loop.
1549 orig_args.remove('--dependencies')
1550 ret = upload_branch_deps(self, orig_args)
1551 return ret
1552
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001553 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001554 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001555
1556 Issue must have been already uploaded and known.
1557 """
1558 assert new_state in _CQState.ALL_STATES
1559 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001560 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001561 vote_map = {
1562 _CQState.NONE: 0,
1563 _CQState.DRY_RUN: 1,
1564 _CQState.COMMIT: 2,
1565 }
1566 labels = {'Commit-Queue': vote_map[new_state]}
1567 notify = False if new_state == _CQState.DRY_RUN else None
1568 gerrit_util.SetReview(
1569 self._GetGerritHost(), self._GerritChangeIdentifier(),
1570 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001571 return 0
1572 except KeyboardInterrupt:
1573 raise
1574 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001575 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001576 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001577 ' * Your project has no CQ,\n'
1578 ' * You don\'t have permission to change the CQ state,\n'
1579 ' * There\'s a bug in this code (see stack trace below).\n'
1580 'Consider specifying which bots to trigger manually or asking your '
1581 'project owners for permissions or contacting Chrome Infra at:\n'
1582 'https://www.chromium.org/infra\n\n' %
1583 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001584 # Still raise exception so that stack trace is printed.
1585 raise
1586
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001587 def _GetGerritHost(self):
1588 # Lazy load of configs.
1589 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001590 if self._gerrit_host and '.' not in self._gerrit_host:
1591 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1592 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001593 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001594 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001595 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001596 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001597 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1598 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001599 return self._gerrit_host
1600
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001601 def _GetGitHost(self):
1602 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001603 remote_url = self.GetRemoteUrl()
1604 if not remote_url:
1605 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001606 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001607
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001608 def GetCodereviewServer(self):
1609 if not self._gerrit_server:
1610 # If we're on a branch then get the server potentially associated
1611 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001612 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001613 self._gerrit_server = self._GitGetBranchConfigValue(
1614 self.CodereviewServerConfigKey())
1615 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001616 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001617 if not self._gerrit_server:
1618 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1619 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001620 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001621 parts[0] = parts[0] + '-review'
1622 self._gerrit_host = '.'.join(parts)
1623 self._gerrit_server = 'https://%s' % self._gerrit_host
1624 return self._gerrit_server
1625
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001626 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001627 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001628 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001629 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001630 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001631 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001632 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001633 if project.endswith('.git'):
1634 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001635 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1636 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1637 # gitiles/git-over-https protocol. E.g.,
1638 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1639 # as
1640 # https://chromium.googlesource.com/v8/v8
1641 if project.startswith('a/'):
1642 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001643 return project
1644
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001645 def _GerritChangeIdentifier(self):
1646 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1647
1648 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001649 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001650 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001651 project = self._GetGerritProject()
1652 if project:
1653 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1654 # Fall back on still unique, but less efficient change number.
1655 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001656
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001657 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001658 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001659 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001660
tandrii5d48c322016-08-18 16:19:37 -07001661 @classmethod
1662 def PatchsetConfigKey(cls):
1663 return 'gerritpatchset'
1664
1665 @classmethod
1666 def CodereviewServerConfigKey(cls):
1667 return 'gerritserver'
1668
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001669 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001670 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001671 if settings.GetGerritSkipEnsureAuthenticated():
1672 # For projects with unusual authentication schemes.
1673 # See http://crbug.com/603378.
1674 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001675
1676 # Check presence of cookies only if using cookies-based auth method.
1677 cookie_auth = gerrit_util.Authenticator.get()
1678 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001679 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001680
Florian Mayerae510e82020-01-30 21:04:48 +00001681 remote_url = self.GetRemoteUrl()
1682 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001683 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001684 return
1685 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001686 logging.warning('Ignoring branch %(branch)s with non-https remote '
1687 '%(remote)s', {
1688 'branch': self.branch,
1689 'remote': self.GetRemoteUrl()
1690 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001691 return
1692
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001693 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001694 self.GetCodereviewServer()
1695 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001696 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001697
1698 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1699 git_auth = cookie_auth.get_auth_header(git_host)
1700 if gerrit_auth and git_auth:
1701 if gerrit_auth == git_auth:
1702 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001703 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001704 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001705 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001706 ' %s\n'
1707 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001708 ' Consider running the following command:\n'
1709 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001710 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001711 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001712 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001713 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001714 cookie_auth.get_new_password_message(git_host)))
1715 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001716 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001717 return
1718 else:
1719 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001720 ([] if gerrit_auth else [self._gerrit_host]) +
1721 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001722 DieWithError('Credentials for the following hosts are required:\n'
1723 ' %s\n'
1724 'These are read from %s (or legacy %s)\n'
1725 '%s' % (
1726 '\n '.join(missing),
1727 cookie_auth.get_gitcookies_path(),
1728 cookie_auth.get_netrc_path(),
1729 cookie_auth.get_new_password_message(git_host)))
1730
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001731 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001732 if not self.GetIssue():
1733 return
1734
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001735 status = self._GetChangeDetail()['status']
1736 if status in ('MERGED', 'ABANDONED'):
1737 DieWithError('Change %s has been %s, new uploads are not allowed' %
1738 (self.GetIssueURL(),
1739 'submitted' if status == 'MERGED' else 'abandoned'))
1740
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001741 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1742 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1743 # Apparently this check is not very important? Otherwise get_auth_email
1744 # could have been added to other implementations of Authenticator.
1745 cookies_auth = gerrit_util.Authenticator.get()
1746 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001747 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001748
1749 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001750 if self.GetIssueOwner() == cookies_user:
1751 return
1752 logging.debug('change %s owner is %s, cookies user is %s',
1753 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001754 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001755 # so ask what Gerrit thinks of this user.
1756 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1757 if details['email'] == self.GetIssueOwner():
1758 return
1759 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001760 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001761 'as %s.\n'
1762 'Uploading may fail due to lack of permissions.' %
1763 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1764 confirm_or_exit(action='upload')
1765
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001766 def _PostUnsetIssueProperties(self):
1767 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001768 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001769
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001770 def GetGerritObjForPresubmit(self):
1771 return presubmit_support.GerritAccessor(self._GetGerritHost())
1772
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001773 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001774 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001775 or CQ status, assuming adherence to a common workflow.
1776
1777 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001778 * 'error' - error from review tool (including deleted issues)
1779 * 'unsent' - no reviewers added
1780 * 'waiting' - waiting for review
1781 * 'reply' - waiting for uploader to reply to review
1782 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001783 * 'dry-run' - dry-running in the CQ
1784 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001785 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001786 """
1787 if not self.GetIssue():
1788 return None
1789
1790 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001791 data = self._GetChangeDetail([
1792 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001793 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001794 return 'error'
1795
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001796 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001797 return 'closed'
1798
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001799 cq_label = data['labels'].get('Commit-Queue', {})
1800 max_cq_vote = 0
1801 for vote in cq_label.get('all', []):
1802 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1803 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001804 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001805 if max_cq_vote == 1:
1806 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001807
Aaron Gable9ab38c62017-04-06 14:36:33 -07001808 if data['labels'].get('Code-Review', {}).get('approved'):
1809 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001810
1811 if not data.get('reviewers', {}).get('REVIEWER', []):
1812 return 'unsent'
1813
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001814 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001815 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001816 last_message_author = messages.pop().get('author', {})
1817 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001818 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1819 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001820 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001821 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001822 if last_message_author.get('_account_id') == owner:
1823 # Most recent message was by owner.
1824 return 'waiting'
1825 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001826 # Some reply from non-owner.
1827 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001828
1829 # Somehow there are no messages even though there are reviewers.
1830 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001831
1832 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001833 if not self.GetIssue():
1834 return None
1835
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001836 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001837 patchset = data['revisions'][data['current_revision']]['_number']
1838 self.SetPatchset(patchset)
1839 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001840
Aaron Gable636b13f2017-07-14 10:42:48 -07001841 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001842 gerrit_util.SetReview(
1843 self._GetGerritHost(), self._GerritChangeIdentifier(),
1844 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001845
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001846 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001847 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001848 # CURRENT_REVISION is included to get the latest patchset so that
1849 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001850 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001851 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1852 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001853 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001854 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001855 robot_file_comments = gerrit_util.GetChangeRobotComments(
1856 self._GetGerritHost(), self._GerritChangeIdentifier())
1857
1858 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001859 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001860 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001861 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001862 line_comments = file_comments.setdefault(path, [])
1863 line_comments.extend(
1864 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001865
1866 # Build dictionary of file comments for easy access and sorting later.
1867 # {author+date: {path: {patchset: {line: url+message}}}}
1868 comments = collections.defaultdict(
1869 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001870 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001871 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001872 tag = comment.get('tag', '')
1873 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001874 continue
1875 key = (comment['author']['email'], comment['updated'])
1876 if comment.get('side', 'REVISION') == 'PARENT':
1877 patchset = 'Base'
1878 else:
1879 patchset = 'PS%d' % comment['patch_set']
1880 line = comment.get('line', 0)
1881 url = ('https://%s/c/%s/%s/%s#%s%s' %
1882 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1883 'b' if comment.get('side') == 'PARENT' else '',
1884 str(line) if line else ''))
1885 comments[key][path][patchset][line] = (url, comment['message'])
1886
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001887 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001888 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001889 summary = self._BuildCommentSummary(msg, comments, readable)
1890 if summary:
1891 summaries.append(summary)
1892 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001893
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001894 @staticmethod
1895 def _BuildCommentSummary(msg, comments, readable):
1896 key = (msg['author']['email'], msg['date'])
1897 # Don't bother showing autogenerated messages that don't have associated
1898 # file or line comments. this will filter out most autogenerated
1899 # messages, but will keep robot comments like those from Tricium.
1900 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1901 if is_autogenerated and not comments.get(key):
1902 return None
1903 message = msg['message']
1904 # Gerrit spits out nanoseconds.
1905 assert len(msg['date'].split('.')[-1]) == 9
1906 date = datetime.datetime.strptime(msg['date'][:-3],
1907 '%Y-%m-%d %H:%M:%S.%f')
1908 if key in comments:
1909 message += '\n'
1910 for path, patchsets in sorted(comments.get(key, {}).items()):
1911 if readable:
1912 message += '\n%s' % path
1913 for patchset, lines in sorted(patchsets.items()):
1914 for line, (url, content) in sorted(lines.items()):
1915 if line:
1916 line_str = 'Line %d' % line
1917 path_str = '%s:%d:' % (path, line)
1918 else:
1919 line_str = 'File comment'
1920 path_str = '%s:0:' % path
1921 if readable:
1922 message += '\n %s, %s: %s' % (patchset, line_str, url)
1923 message += '\n %s\n' % content
1924 else:
1925 message += '\n%s ' % path_str
1926 message += '\n%s\n' % content
1927
1928 return _CommentSummary(
1929 date=date,
1930 message=message,
1931 sender=msg['author']['email'],
1932 autogenerated=is_autogenerated,
1933 # These could be inferred from the text messages and correlated with
1934 # Code-Review label maximum, however this is not reliable.
1935 # Leaving as is until the need arises.
1936 approval=False,
1937 disapproval=False,
1938 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001939
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001940 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001941 gerrit_util.AbandonChange(
1942 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001943
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001944 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001945 gerrit_util.SubmitChange(
1946 self._GetGerritHost(), self._GerritChangeIdentifier(),
1947 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001948
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001949 def _GetChangeDetail(self, options=None):
1950 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001951 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001952 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001953
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001954 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001955 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001956 options.append('CURRENT_COMMIT')
1957
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001958 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001959 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001960 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001961
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001962 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1963 # Assumption: data fetched before with extra options is suitable
1964 # for return for a smaller set of options.
1965 # For example, if we cached data for
1966 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1967 # and request is for options=[CURRENT_REVISION],
1968 # THEN we can return prior cached data.
1969 if options_set.issubset(cached_options_set):
1970 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001971
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001972 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001973 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001974 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001975 except gerrit_util.GerritError as e:
1976 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001977 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001978 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001979
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001980 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001981 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001982
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001983 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001984 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001985 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001986 data = gerrit_util.GetChangeCommit(
1987 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001988 except gerrit_util.GerritError as e:
1989 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001990 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001991 raise
agable32978d92016-11-01 12:55:02 -07001992 return data
1993
Karen Qian40c19422019-03-13 21:28:29 +00001994 def _IsCqConfigured(self):
1995 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001996 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001997
Olivier Robin75ee7252018-04-13 10:02:56 +02001998 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001999 if git_common.is_dirty_git_tree('land'):
2000 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002001
tandriid60367b2016-06-22 05:25:12 -07002002 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002003 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002004 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002005 'which can test and land changes for you. '
2006 'Are you sure you wish to bypass it?\n',
2007 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002008 differs = True
tandriic4344b52016-08-29 06:04:54 -07002009 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002010 # Note: git diff outputs nothing if there is no diff.
2011 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002012 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002013 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002014 if detail['current_revision'] == last_upload:
2015 differs = False
2016 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002017 print('WARNING: Local branch contents differ from latest uploaded '
2018 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002019 if differs:
2020 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002021 confirm_or_exit(
2022 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2023 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002024 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002025 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002026 upstream = self.GetCommonAncestorWithUpstream()
2027 if self.GetIssue():
2028 description = self.FetchDescription()
2029 else:
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00002030 description = self.GetLocalDescription(upstream)
Edward Lemur227d5102020-02-25 23:45:35 +00002031 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002032 committing=True,
2033 may_prompt=not force,
2034 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002035 parallel=parallel,
2036 upstream=upstream,
2037 description=description,
2038 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002039
2040 self.SubmitIssue(wait_for_merge=True)
2041 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002042 links = self._GetChangeCommit().get('web_links', [])
2043 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002044 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002045 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002046 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002047 return 0
2048
Edward Lemurf38bc172019-09-03 21:02:13 +00002049 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002050 assert parsed_issue_arg.valid
2051
Edward Lemur125d60a2019-09-13 18:25:41 +00002052 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002053
2054 if parsed_issue_arg.hostname:
2055 self._gerrit_host = parsed_issue_arg.hostname
2056 self._gerrit_server = 'https://%s' % self._gerrit_host
2057
tandriic2405f52016-10-10 08:13:15 -07002058 try:
2059 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002060 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002061 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002062
2063 if not parsed_issue_arg.patchset:
2064 # Use current revision by default.
2065 revision_info = detail['revisions'][detail['current_revision']]
2066 patchset = int(revision_info['_number'])
2067 else:
2068 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002069 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002070 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2071 break
2072 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002073 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002074 (parsed_issue_arg.patchset, self.GetIssue()))
2075
Edward Lemur125d60a2019-09-13 18:25:41 +00002076 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002077 if remote_url.endswith('.git'):
2078 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002079 remote_url = remote_url.rstrip('/')
2080
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002081 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002082 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002083
2084 if remote_url != fetch_info['url']:
2085 DieWithError('Trying to patch a change from %s but this repo appears '
2086 'to be %s.' % (fetch_info['url'], remote_url))
2087
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002088 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002089
Aaron Gable62619a32017-06-16 08:22:09 -07002090 if force:
2091 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2092 print('Checked out commit for change %i patchset %i locally' %
2093 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002094 elif nocommit:
2095 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2096 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002097 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002098 RunGit(['cherry-pick', 'FETCH_HEAD'])
2099 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002100 (parsed_issue_arg.issue, patchset))
2101 print('Note: this created a local commit which does not have '
2102 'the same hash as the one uploaded for review. This will make '
2103 'uploading changes based on top of this branch difficult.\n'
2104 'If you want to do that, use "git cl patch --force" instead.')
2105
Stefan Zagerd08043c2017-10-12 12:07:02 -07002106 if self.GetBranch():
2107 self.SetIssue(parsed_issue_arg.issue)
2108 self.SetPatchset(patchset)
2109 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2110 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2111 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2112 else:
2113 print('WARNING: You are in detached HEAD state.\n'
2114 'The patch has been applied to your checkout, but you will not be '
2115 'able to upload a new patch set to the gerrit issue.\n'
2116 'Try using the \'-b\' option if you would like to work on a '
2117 'branch and/or upload a new patch set.')
2118
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002119 return 0
2120
tandrii16e0b4e2016-06-07 10:34:28 -07002121 def _GerritCommitMsgHookCheck(self, offer_removal):
2122 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2123 if not os.path.exists(hook):
2124 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002125 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2126 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002127 data = gclient_utils.FileRead(hook)
2128 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2129 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002130 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002131 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002132 'and may interfere with it in subtle ways.\n'
2133 'We recommend you remove the commit-msg hook.')
2134 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002135 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002136 gclient_utils.rm_file_or_tree(hook)
2137 print('Gerrit commit-msg hook removed.')
2138 else:
2139 print('OK, will keep Gerrit commit-msg hook in place.')
2140
Edward Lemur1b52d872019-05-09 21:12:12 +00002141 def _CleanUpOldTraces(self):
2142 """Keep only the last |MAX_TRACES| traces."""
2143 try:
2144 traces = sorted([
2145 os.path.join(TRACES_DIR, f)
2146 for f in os.listdir(TRACES_DIR)
2147 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2148 and not f.startswith('tmp'))
2149 ])
2150 traces_to_delete = traces[:-MAX_TRACES]
2151 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002152 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002153 except OSError:
2154 print('WARNING: Failed to remove old git traces from\n'
2155 ' %s'
2156 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002157
Edward Lemur5737f022019-05-17 01:24:00 +00002158 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002159 """Zip and write the git push traces stored in traces_dir."""
2160 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002161 traces_zip = trace_name + '-traces'
2162 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002163 # Create a temporary dir to store git config and gitcookies in. It will be
2164 # compressed and stored next to the traces.
2165 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002166 git_info_zip = trace_name + '-git-info'
2167
Edward Lemur5737f022019-05-17 01:24:00 +00002168 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002169 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002170 git_push_metadata['now'] = git_push_metadata['now'].decode(
2171 sys.stdin.encoding)
2172
Edward Lemur1b52d872019-05-09 21:12:12 +00002173 git_push_metadata['trace_name'] = trace_name
2174 gclient_utils.FileWrite(
2175 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2176
2177 # Keep only the first 6 characters of the git hashes on the packet
2178 # trace. This greatly decreases size after compression.
2179 packet_traces = os.path.join(traces_dir, 'trace-packet')
2180 if os.path.isfile(packet_traces):
2181 contents = gclient_utils.FileRead(packet_traces)
2182 gclient_utils.FileWrite(
2183 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2184 shutil.make_archive(traces_zip, 'zip', traces_dir)
2185
2186 # Collect and compress the git config and gitcookies.
2187 git_config = RunGit(['config', '-l'])
2188 gclient_utils.FileWrite(
2189 os.path.join(git_info_dir, 'git-config'),
2190 git_config)
2191
2192 cookie_auth = gerrit_util.Authenticator.get()
2193 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2194 gitcookies_path = cookie_auth.get_gitcookies_path()
2195 if os.path.isfile(gitcookies_path):
2196 gitcookies = gclient_utils.FileRead(gitcookies_path)
2197 gclient_utils.FileWrite(
2198 os.path.join(git_info_dir, 'gitcookies'),
2199 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2200 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2201
Edward Lemur1b52d872019-05-09 21:12:12 +00002202 gclient_utils.rmtree(git_info_dir)
2203
2204 def _RunGitPushWithTraces(
2205 self, change_desc, refspec, refspec_opts, git_push_metadata):
2206 """Run git push and collect the traces resulting from the execution."""
2207 # Create a temporary directory to store traces in. Traces will be compressed
2208 # and stored in a 'traces' dir inside depot_tools.
2209 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002210 trace_name = os.path.join(
2211 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002212
2213 env = os.environ.copy()
2214 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2215 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002216 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002217 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2218 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2219 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2220
2221 try:
2222 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002223 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002224 before_push = time_time()
2225 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002226 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002227 env=env,
2228 print_stdout=True,
2229 # Flush after every line: useful for seeing progress when running as
2230 # recipe.
2231 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002232 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002233 except subprocess2.CalledProcessError as e:
2234 push_returncode = e.returncode
2235 DieWithError('Failed to create a change. Please examine output above '
2236 'for the reason of the failure.\n'
2237 'Hint: run command below to diagnose common Git/Gerrit '
2238 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002239 ' git cl creds-check\n'
2240 '\n'
2241 'If git-cl is not working correctly, file a bug under the '
2242 'Infra>SDK component including the files below.\n'
2243 'Review the files before upload, since they might contain '
2244 'sensitive information.\n'
2245 'Set the Restrict-View-Google label so that they are not '
2246 'publicly accessible.\n'
2247 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002248 change_desc)
2249 finally:
2250 execution_time = time_time() - before_push
2251 metrics.collector.add_repeated('sub_commands', {
2252 'command': 'git push',
2253 'execution_time': execution_time,
2254 'exit_code': push_returncode,
2255 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2256 })
2257
Edward Lemur1b52d872019-05-09 21:12:12 +00002258 git_push_metadata['execution_time'] = execution_time
2259 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002260 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002261
Edward Lemur1b52d872019-05-09 21:12:12 +00002262 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002263 gclient_utils.rmtree(traces_dir)
2264
2265 return push_stdout
2266
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002267 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002268 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002269 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002270 # Load default for user, repo, squash=true, in this order.
2271 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002272
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002273 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002274 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002275 # This may be None; default fallback value is determined in logic below.
2276 title = options.title
2277
Dominic Battre7d1c4842017-10-27 09:17:28 +02002278 # Extract bug number from branch name.
2279 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002280 fixed = options.fixed
2281 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2282 self.GetBranch())
2283 if not bug and not fixed and match:
2284 if match.group('type') == 'bug':
2285 bug = match.group('bugnum')
2286 else:
2287 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002288
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002289 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002290 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002291 if self.GetIssue():
2292 # Try to get the message from a previous upload.
Edward Lemur6c6827c2020-02-06 21:15:18 +00002293 message = self.FetchDescription()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002294 if not message:
2295 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002296 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002297 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002298 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002299 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002300 # When uploading a subsequent patchset, -m|--message is taken
2301 # as the patchset title if --title was not provided.
2302 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002303 else:
2304 default_title = RunGit(
2305 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002306 if options.force:
2307 title = default_title
2308 else:
2309 title = ask_for_data(
2310 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002311
2312 # User requested to change description
2313 if options.edit_description:
2314 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2315 change_desc.prompt()
2316 message = change_desc.description
2317
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002318 change_id = self._GetChangeDetail()['change_id']
2319 while True:
2320 footer_change_ids = git_footers.get_footer_change_id(message)
2321 if footer_change_ids == [change_id]:
2322 break
2323 if not footer_change_ids:
2324 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002325 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002326 continue
2327 # There is already a valid footer but with different or several ids.
2328 # Doing this automatically is non-trivial as we don't want to lose
2329 # existing other footers, yet we want to append just 1 desired
2330 # Change-Id. Thus, just create a new footer, but let user verify the
2331 # new description.
2332 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002333 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002334 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002335 print(
2336 'WARNING: change %s has Change-Id footer(s):\n'
2337 ' %s\n'
2338 'but change has Change-Id %s, according to Gerrit.\n'
2339 'Please, check the proposed correction to the description, '
2340 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2341 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2342 change_id))
2343 confirm_or_exit(action='edit')
2344 change_desc.prompt()
2345
2346 message = change_desc.description
2347 if not message:
2348 DieWithError("Description is empty. Aborting...")
2349
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002350 # Continue the while loop.
2351 # Sanity check of this code - we should end up with proper message
2352 # footer.
2353 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002354 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002355 else: # if not self.GetIssue()
2356 if options.message:
2357 message = options.message
2358 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002359 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002360 if options.title:
2361 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002362 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002363 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002364 change_desc.prompt()
2365
Aaron Gableb56ad332017-01-06 15:24:31 -08002366 # On first upload, patchset title is always this string, while
2367 # --title flag gets converted to first line of message.
2368 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002369 if not change_desc.description:
2370 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002371 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002372 if len(change_ids) > 1:
2373 DieWithError('too many Change-Id footers, at most 1 allowed.')
2374 if not change_ids:
2375 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002376 change_desc.set_description(git_footers.add_footer_change_id(
2377 change_desc.description,
2378 GenerateGerritChangeId(change_desc.description)))
2379 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002380 assert len(change_ids) == 1
2381 change_id = change_ids[0]
2382
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002383 if options.reviewers or options.tbrs or options.add_owners_to:
2384 change_desc.update_reviewers(options.reviewers, options.tbrs,
2385 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002386 if options.preserve_tryjobs:
2387 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002388
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002389 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002390 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2391 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002392 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002393 with gclient_utils.temporary_file() as desc_tempfile:
2394 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2395 ref_to_push = RunGit(
2396 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002397 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002398 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002399 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002400 if not change_desc.description:
2401 DieWithError("Description is empty. Aborting...")
2402
2403 if not git_footers.get_footer_change_id(change_desc.description):
2404 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002405 change_desc.set_description(
2406 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002407 if options.reviewers or options.tbrs or options.add_owners_to:
2408 change_desc.update_reviewers(options.reviewers, options.tbrs,
2409 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002410 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002411 # For no-squash mode, we assume the remote called "origin" is the one we
2412 # want. It is not worthwhile to support different workflows for
2413 # no-squash mode.
2414 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002415 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2416
2417 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002418 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002419 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2420 ref_to_push)]).splitlines()
2421 if len(commits) > 1:
2422 print('WARNING: This will upload %d commits. Run the following command '
2423 'to see which commits will be uploaded: ' % len(commits))
2424 print('git log %s..%s' % (parent, ref_to_push))
2425 print('You can also use `git squash-branch` to squash these into a '
2426 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002427 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002428
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002429 if options.reviewers or options.tbrs or options.add_owners_to:
2430 change_desc.update_reviewers(options.reviewers, options.tbrs,
2431 options.add_owners_to, change)
2432
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002433 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002434 cc = []
2435 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2436 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2437 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002438 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002439 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002440 if options.cc:
2441 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002442 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002443 if change_desc.get_cced():
2444 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002445 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2446 valid_accounts = set(reviewers + cc)
2447 # TODO(crbug/877717): relax this for all hosts.
2448 else:
2449 valid_accounts = gerrit_util.ValidAccounts(
2450 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002451 logging.info('accounts %s are recognized, %s invalid',
2452 sorted(valid_accounts),
2453 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002454
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002455 # Extra options that can be specified at push time. Doc:
2456 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002457 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002458
Aaron Gable844cf292017-06-28 11:32:59 -07002459 # By default, new changes are started in WIP mode, and subsequent patchsets
2460 # don't send email. At any time, passing --send-mail will mark the change
2461 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002462 if options.send_mail:
2463 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002464 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002465 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002466 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002467 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002468 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002469
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002470 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002471 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002472
Aaron Gable9b713dd2016-12-14 16:04:21 -08002473 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002474 # Punctuation and whitespace in |title| must be percent-encoded.
2475 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002476
agablec6787972016-09-09 16:13:34 -07002477 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002478 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002479
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002480 for r in sorted(reviewers):
2481 if r in valid_accounts:
2482 refspec_opts.append('r=%s' % r)
2483 reviewers.remove(r)
2484 else:
2485 # TODO(tandrii): this should probably be a hard failure.
2486 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2487 % r)
2488 for c in sorted(cc):
2489 # refspec option will be rejected if cc doesn't correspond to an
2490 # account, even though REST call to add such arbitrary cc may succeed.
2491 if c in valid_accounts:
2492 refspec_opts.append('cc=%s' % c)
2493 cc.remove(c)
2494
rmistry9eadede2016-09-19 11:22:43 -07002495 if options.topic:
2496 # Documentation on Gerrit topics is here:
2497 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002498 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002499
Edward Lemur687ca902018-12-05 02:30:30 +00002500 if options.enable_auto_submit:
2501 refspec_opts.append('l=Auto-Submit+1')
2502 if options.use_commit_queue:
2503 refspec_opts.append('l=Commit-Queue+2')
2504 elif options.cq_dry_run:
2505 refspec_opts.append('l=Commit-Queue+1')
2506
2507 if change_desc.get_reviewers(tbr_only=True):
2508 score = gerrit_util.GetCodeReviewTbrScore(
2509 self._GetGerritHost(),
2510 self._GetGerritProject())
2511 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002512
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002513 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002514 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002515 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002516 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002517 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2518
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002519 refspec_suffix = ''
2520 if refspec_opts:
2521 refspec_suffix = '%' + ','.join(refspec_opts)
2522 assert ' ' not in refspec_suffix, (
2523 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2524 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2525
Edward Lemur1b52d872019-05-09 21:12:12 +00002526 git_push_metadata = {
2527 'gerrit_host': self._GetGerritHost(),
2528 'title': title or '<untitled>',
2529 'change_id': change_id,
2530 'description': change_desc.description,
2531 }
2532 push_stdout = self._RunGitPushWithTraces(
2533 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002534
2535 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002536 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002537 change_numbers = [m.group(1)
2538 for m in map(regex.match, push_stdout.splitlines())
2539 if m]
2540 if len(change_numbers) != 1:
2541 DieWithError(
2542 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002543 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002544 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002545 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002546
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002547 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002548 # GetIssue() is not set in case of non-squash uploads according to tests.
2549 # TODO(agable): non-squash uploads in git cl should be removed.
2550 gerrit_util.AddReviewers(
2551 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002552 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002553 reviewers, cc,
2554 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002555
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002556 return 0
2557
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002558 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2559 change_desc):
2560 """Computes parent of the generated commit to be uploaded to Gerrit.
2561
2562 Returns revision or a ref name.
2563 """
2564 if custom_cl_base:
2565 # Try to avoid creating additional unintended CLs when uploading, unless
2566 # user wants to take this risk.
2567 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2568 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2569 local_ref_of_target_remote])
2570 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002571 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002572 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2573 'If you proceed with upload, more than 1 CL may be created by '
2574 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2575 'If you are certain that specified base `%s` has already been '
2576 'uploaded to Gerrit as another CL, you may proceed.\n' %
2577 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2578 if not force:
2579 confirm_or_exit(
2580 'Do you take responsibility for cleaning up potential mess '
2581 'resulting from proceeding with upload?',
2582 action='upload')
2583 return custom_cl_base
2584
Aaron Gablef97e33d2017-03-30 15:44:27 -07002585 if remote != '.':
2586 return self.GetCommonAncestorWithUpstream()
2587
2588 # If our upstream branch is local, we base our squashed commit on its
2589 # squashed version.
2590 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2591
Aaron Gablef97e33d2017-03-30 15:44:27 -07002592 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002593 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002594
2595 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002596 # TODO(tandrii): consider checking parent change in Gerrit and using its
2597 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2598 # the tree hash of the parent branch. The upside is less likely bogus
2599 # requests to reupload parent change just because it's uploadhash is
2600 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002601 parent = RunGit(['config',
2602 'branch.%s.gerritsquashhash' % upstream_branch_name],
2603 error_ok=True).strip()
2604 # Verify that the upstream branch has been uploaded too, otherwise
2605 # Gerrit will create additional CLs when uploading.
2606 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2607 RunGitSilent(['rev-parse', parent + ':'])):
2608 DieWithError(
2609 '\nUpload upstream branch %s first.\n'
2610 'It is likely that this branch has been rebased since its last '
2611 'upload, so you just need to upload it again.\n'
2612 '(If you uploaded it with --no-squash, then branch dependencies '
2613 'are not supported, and you should reupload with --squash.)'
2614 % upstream_branch_name,
2615 change_desc)
2616 return parent
2617
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002618 def _AddChangeIdToCommitMessage(self, options, args):
2619 """Re-commits using the current message, assumes the commit hook is in
2620 place.
2621 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002622 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002623 git_command = ['commit', '--amend', '-m', log_desc]
2624 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002625 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002626 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002627 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002628 return new_log_desc
2629 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002630 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002631
tandriie113dfd2016-10-11 10:20:12 -07002632 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002633 try:
2634 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002635 except GerritChangeNotExists:
2636 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002637
2638 if data['status'] in ('ABANDONED', 'MERGED'):
2639 return 'CL %s is closed' % self.GetIssue()
2640
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002641 def GetGerritChange(self, patchset=None):
2642 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002643 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002644 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002645 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002646 data = self._GetChangeDetail(['ALL_REVISIONS'])
2647
2648 assert host and issue and patchset, 'CL must be uploaded first'
2649
2650 has_patchset = any(
2651 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002652 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002653 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002654 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002655 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002656
tandrii8c5a3532016-11-04 07:52:02 -07002657 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002658 'host': host,
2659 'change': issue,
2660 'project': data['project'],
2661 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002662 }
tandriie113dfd2016-10-11 10:20:12 -07002663
tandriide281ae2016-10-12 06:02:30 -07002664 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002665 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002666
Edward Lemur707d70b2018-02-07 00:50:14 +01002667 def GetReviewers(self):
2668 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002669 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002670
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002671
tandriif9aefb72016-07-01 09:06:51 -07002672def _get_bug_line_values(default_project, bugs):
2673 """Given default_project and comma separated list of bugs, yields bug line
2674 values.
2675
2676 Each bug can be either:
2677 * a number, which is combined with default_project
2678 * string, which is left as is.
2679
2680 This function may produce more than one line, because bugdroid expects one
2681 project per line.
2682
2683 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2684 ['v8:123', 'chromium:789']
2685 """
2686 default_bugs = []
2687 others = []
2688 for bug in bugs.split(','):
2689 bug = bug.strip()
2690 if bug:
2691 try:
2692 default_bugs.append(int(bug))
2693 except ValueError:
2694 others.append(bug)
2695
2696 if default_bugs:
2697 default_bugs = ','.join(map(str, default_bugs))
2698 if default_project:
2699 yield '%s:%s' % (default_project, default_bugs)
2700 else:
2701 yield default_bugs
2702 for other in sorted(others):
2703 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2704 yield other
2705
2706
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002707class ChangeDescription(object):
2708 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002709 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002710 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002711 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002712 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002713 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002714 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2715 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002716 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002717 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002718
Dan Beamd8b04ca2019-10-10 21:23:26 +00002719 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002720 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002721 if bug:
2722 regexp = re.compile(self.BUG_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, bug))
2726 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002727 if fixed:
2728 regexp = re.compile(self.FIXED_LINE)
2729 prefix = settings.GetBugPrefix()
2730 if not any((regexp.match(line) for line in self._description_lines)):
2731 values = list(_get_bug_line_values(prefix, fixed))
2732 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002733
agable@chromium.org42c20792013-09-12 17:34:49 +00002734 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002735 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002736 return '\n'.join(self._description_lines)
2737
2738 def set_description(self, desc):
2739 if isinstance(desc, basestring):
2740 lines = desc.splitlines()
2741 else:
2742 lines = [line.rstrip() for line in desc]
2743 while lines and not lines[0]:
2744 lines.pop(0)
2745 while lines and not lines[-1]:
2746 lines.pop(-1)
2747 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002748
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002749 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2750 """Rewrites the R=/TBR= line(s) as a single line each.
2751
2752 Args:
2753 reviewers (list(str)) - list of additional emails to use for reviewers.
2754 tbrs (list(str)) - list of additional emails to use for TBRs.
2755 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2756 the change that are missing OWNER coverage. If this is not None, you
2757 must also pass a value for `change`.
2758 change (Change) - The Change that should be used for OWNERS lookups.
2759 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002760 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002761 assert isinstance(tbrs, list), tbrs
2762
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002763 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002764 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002765
2766 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002767 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002768
2769 reviewers = set(reviewers)
2770 tbrs = set(tbrs)
2771 LOOKUP = {
2772 'TBR': tbrs,
2773 'R': reviewers,
2774 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002775
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002776 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002777 regexp = re.compile(self.R_LINE)
2778 matches = [regexp.match(line) for line in self._description_lines]
2779 new_desc = [l for i, l in enumerate(self._description_lines)
2780 if not matches[i]]
2781 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002782
agable@chromium.org42c20792013-09-12 17:34:49 +00002783 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002784
2785 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002786 for match in matches:
2787 if not match:
2788 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002789 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2790
2791 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002792 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002793 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002794 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002795 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002796 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002797 LOOKUP[add_owners_to].update(
2798 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002799
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002800 # If any folks ended up in both groups, remove them from tbrs.
2801 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002802
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002803 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2804 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002805
2806 # Put the new lines in the description where the old first R= line was.
2807 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2808 if 0 <= line_loc < len(self._description_lines):
2809 if new_tbr_line:
2810 self._description_lines.insert(line_loc, new_tbr_line)
2811 if new_r_line:
2812 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002813 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002814 if new_r_line:
2815 self.append_footer(new_r_line)
2816 if new_tbr_line:
2817 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002818
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002819 def set_preserve_tryjobs(self):
2820 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2821 footers = git_footers.parse_footers(self.description)
2822 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2823 if v.lower() == 'true':
2824 return
2825 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2826
Anthony Polito8b955342019-09-24 19:01:36 +00002827 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002828 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002829 self.set_description([
2830 '# Enter a description of the change.',
2831 '# This will be displayed on the codereview site.',
2832 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002833 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002834 '--------------------',
2835 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002836 bug_regexp = re.compile(self.BUG_LINE)
2837 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002838 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002839 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2840 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002841 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002842
agable@chromium.org42c20792013-09-12 17:34:49 +00002843 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002844 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002845 if not content:
2846 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002847 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002848
Bruce Dawson2377b012018-01-11 16:46:49 -08002849 # Strip off comments and default inserted "Bug:" line.
2850 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002851 (line.startswith('#') or
2852 line.rstrip() == "Bug:" or
2853 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002854 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002855 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002856 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002857
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002858 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002859 """Adds a footer line to the description.
2860
2861 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2862 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2863 that Gerrit footers are always at the end.
2864 """
2865 parsed_footer_line = git_footers.parse_footer(line)
2866 if parsed_footer_line:
2867 # Line is a gerrit footer in the form: Footer-Key: any value.
2868 # Thus, must be appended observing Gerrit footer rules.
2869 self.set_description(
2870 git_footers.add_footer(self.description,
2871 key=parsed_footer_line[0],
2872 value=parsed_footer_line[1]))
2873 return
2874
2875 if not self._description_lines:
2876 self._description_lines.append(line)
2877 return
2878
2879 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2880 if gerrit_footers:
2881 # git_footers.split_footers ensures that there is an empty line before
2882 # actual (gerrit) footers, if any. We have to keep it that way.
2883 assert top_lines and top_lines[-1] == ''
2884 top_lines, separator = top_lines[:-1], top_lines[-1:]
2885 else:
2886 separator = [] # No need for separator if there are no gerrit_footers.
2887
2888 prev_line = top_lines[-1] if top_lines else ''
2889 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2890 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2891 top_lines.append('')
2892 top_lines.append(line)
2893 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002894
tandrii99a72f22016-08-17 14:33:24 -07002895 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002896 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002897 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002898 reviewers = [match.group(2).strip()
2899 for match in matches
2900 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002901 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002902
bradnelsond975b302016-10-23 12:20:23 -07002903 def get_cced(self):
2904 """Retrieves the list of reviewers."""
2905 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2906 cced = [match.group(2).strip() for match in matches if match]
2907 return cleanup_list(cced)
2908
Nodir Turakulov23b82142017-11-16 11:04:25 -08002909 def get_hash_tags(self):
2910 """Extracts and sanitizes a list of Gerrit hashtags."""
2911 subject = (self._description_lines or ('',))[0]
2912 subject = re.sub(
2913 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2914
2915 tags = []
2916 start = 0
2917 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2918 while True:
2919 m = bracket_exp.match(subject, start)
2920 if not m:
2921 break
2922 tags.append(self.sanitize_hash_tag(m.group(1)))
2923 start = m.end()
2924
2925 if not tags:
2926 # Try "Tag: " prefix.
2927 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2928 if m:
2929 tags.append(self.sanitize_hash_tag(m.group(1)))
2930 return tags
2931
2932 @classmethod
2933 def sanitize_hash_tag(cls, tag):
2934 """Returns a sanitized Gerrit hash tag.
2935
2936 A sanitized hashtag can be used as a git push refspec parameter value.
2937 """
2938 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2939
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002940 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2941 """Updates this commit description given the parent.
2942
2943 This is essentially what Gnumbd used to do.
2944 Consult https://goo.gl/WMmpDe for more details.
2945 """
2946 assert parent_msg # No, orphan branch creation isn't supported.
2947 assert parent_hash
2948 assert dest_ref
2949 parent_footer_map = git_footers.parse_footers(parent_msg)
2950 # This will also happily parse svn-position, which GnumbD is no longer
2951 # supporting. While we'd generate correct footers, the verifier plugin
2952 # installed in Gerrit will block such commit (ie git push below will fail).
2953 parent_position = git_footers.get_position(parent_footer_map)
2954
2955 # Cherry-picks may have last line obscuring their prior footers,
2956 # from git_footers perspective. This is also what Gnumbd did.
2957 cp_line = None
2958 if (self._description_lines and
2959 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2960 cp_line = self._description_lines.pop()
2961
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002962 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002963
2964 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2965 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002966 for i, line in enumerate(footer_lines):
2967 k, v = git_footers.parse_footer(line) or (None, None)
2968 if k and k.startswith('Cr-'):
2969 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002970
2971 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002972 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002973 if parent_position[0] == dest_ref:
2974 # Same branch as parent.
2975 number = int(parent_position[1]) + 1
2976 else:
2977 number = 1 # New branch, and extra lineage.
2978 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2979 int(parent_position[1])))
2980
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002981 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2982 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002983
2984 self._description_lines = top_lines
2985 if cp_line:
2986 self._description_lines.append(cp_line)
2987 if self._description_lines[-1] != '':
2988 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002989 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002990
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002991
Aaron Gablea1bab272017-04-11 16:38:18 -07002992def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002993 """Retrieves the reviewers that approved a CL from the issue properties with
2994 messages.
2995
2996 Note that the list may contain reviewers that are not committer, thus are not
2997 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002998
2999 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003000 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003001 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003002 return sorted(
3003 set(
3004 message['sender']
3005 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003006 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003007 )
3008 )
3009
3010
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003011def FindCodereviewSettingsFile(filename='codereview.settings'):
3012 """Finds the given file starting in the cwd and going up.
3013
3014 Only looks up to the top of the repository unless an
3015 'inherit-review-settings-ok' file exists in the root of the repository.
3016 """
3017 inherit_ok_file = 'inherit-review-settings-ok'
3018 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003019 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003020 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3021 root = '/'
3022 while True:
3023 if filename in os.listdir(cwd):
3024 if os.path.isfile(os.path.join(cwd, filename)):
3025 return open(os.path.join(cwd, filename))
3026 if cwd == root:
3027 break
3028 cwd = os.path.dirname(cwd)
3029
3030
3031def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003032 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003033 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003034
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003035 def SetProperty(name, setting, unset_error_ok=False):
3036 fullname = 'rietveld.' + name
3037 if setting in keyvals:
3038 RunGit(['config', fullname, keyvals[setting]])
3039 else:
3040 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3041
tandrii48df5812016-10-17 03:55:37 -07003042 if not keyvals.get('GERRIT_HOST', False):
3043 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003044 # Only server setting is required. Other settings can be absent.
3045 # In that case, we ignore errors raised during option deletion attempt.
3046 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3047 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3048 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003049 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003050 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3051 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003052 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3053 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003054 SetProperty(
3055 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003056
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003057 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003058 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003059
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003060 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003061 RunGit(['config', 'gerrit.squash-uploads',
3062 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003063
tandrii@chromium.org28253532016-04-14 13:46:56 +00003064 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003065 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003066 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3067
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003068 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003069 # should be of the form
3070 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3071 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003072 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3073 keyvals['ORIGIN_URL_CONFIG']])
3074
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003075
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003076def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003077 """Downloads a network object to a local file, like urllib.urlretrieve.
3078
3079 This is necessary because urllib is broken for SSL connections via a proxy.
3080 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003081 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003082 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003083
3084
ukai@chromium.org712d6102013-11-27 00:52:58 +00003085def hasSheBang(fname):
3086 """Checks fname is a #! script."""
3087 with open(fname) as f:
3088 return f.read(2).startswith('#!')
3089
3090
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003091# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3092def DownloadHooks(*args, **kwargs):
3093 pass
3094
3095
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003096def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003097 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003098
3099 Args:
3100 force: True to update hooks. False to install hooks if not present.
3101 """
3102 if not settings.GetIsGerrit():
3103 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003104 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003105 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3106 if not os.access(dst, os.X_OK):
3107 if os.path.exists(dst):
3108 if not force:
3109 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003110 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003111 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003112 if not hasSheBang(dst):
3113 DieWithError('Not a script: %s\n'
3114 'You need to download from\n%s\n'
3115 'into .git/hooks/commit-msg and '
3116 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003117 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3118 except Exception:
3119 if os.path.exists(dst):
3120 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003121 DieWithError('\nFailed to download hooks.\n'
3122 'You need to download from\n%s\n'
3123 'into .git/hooks/commit-msg and '
3124 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003125
3126
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003127class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003128 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003129
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003130 _GOOGLESOURCE = 'googlesource.com'
3131
3132 def __init__(self):
3133 # Cached list of [host, identity, source], where source is either
3134 # .gitcookies or .netrc.
3135 self._all_hosts = None
3136
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003137 def ensure_configured_gitcookies(self):
3138 """Runs checks and suggests fixes to make git use .gitcookies from default
3139 path."""
3140 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3141 configured_path = RunGitSilent(
3142 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003143 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003144 if configured_path:
3145 self._ensure_default_gitcookies_path(configured_path, default)
3146 else:
3147 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003148
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003149 @staticmethod
3150 def _ensure_default_gitcookies_path(configured_path, default_path):
3151 assert configured_path
3152 if configured_path == default_path:
3153 print('git is already configured to use your .gitcookies from %s' %
3154 configured_path)
3155 return
3156
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003157 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003158 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3159 (configured_path, default_path))
3160
3161 if not os.path.exists(configured_path):
3162 print('However, your configured .gitcookies file is missing.')
3163 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3164 action='reconfigure')
3165 RunGit(['config', '--global', 'http.cookiefile', default_path])
3166 return
3167
3168 if os.path.exists(default_path):
3169 print('WARNING: default .gitcookies file already exists %s' %
3170 default_path)
3171 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3172 default_path)
3173
3174 confirm_or_exit('Move existing .gitcookies to default location?',
3175 action='move')
3176 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003177 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003178 print('Moved and reconfigured git to use .gitcookies from %s' %
3179 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003180
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003181 @staticmethod
3182 def _configure_gitcookies_path(default_path):
3183 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3184 if os.path.exists(netrc_path):
3185 print('You seem to be using outdated .netrc for git credentials: %s' %
3186 netrc_path)
3187 print('This tool will guide you through setting up recommended '
3188 '.gitcookies store for git credentials.\n'
3189 '\n'
3190 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3191 ' git config --global --unset http.cookiefile\n'
3192 ' mv %s %s.backup\n\n' % (default_path, default_path))
3193 confirm_or_exit(action='setup .gitcookies')
3194 RunGit(['config', '--global', 'http.cookiefile', default_path])
3195 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003196
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003197 def get_hosts_with_creds(self, include_netrc=False):
3198 if self._all_hosts is None:
3199 a = gerrit_util.CookiesAuthenticator()
3200 self._all_hosts = [
3201 (h, u, s)
3202 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003203 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3204 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003205 )
3206 if h.endswith(self._GOOGLESOURCE)
3207 ]
3208
3209 if include_netrc:
3210 return self._all_hosts
3211 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3212
3213 def print_current_creds(self, include_netrc=False):
3214 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3215 if not hosts:
3216 print('No Git/Gerrit credentials found')
3217 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003218 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003219 header = [('Host', 'User', 'Which file'),
3220 ['=' * l for l in lengths]]
3221 for row in (header + hosts):
3222 print('\t'.join((('%%+%ds' % l) % s)
3223 for l, s in zip(lengths, row)))
3224
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003225 @staticmethod
3226 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003227 """Parses identity "git-<username>.domain" into <username> and domain."""
3228 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003229 # distinguishable from sub-domains. But we do know typical domains:
3230 if identity.endswith('.chromium.org'):
3231 domain = 'chromium.org'
3232 username = identity[:-len('.chromium.org')]
3233 else:
3234 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003235 if username.startswith('git-'):
3236 username = username[len('git-'):]
3237 return username, domain
3238
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003239 def _canonical_git_googlesource_host(self, host):
3240 """Normalizes Gerrit hosts (with '-review') to Git host."""
3241 assert host.endswith(self._GOOGLESOURCE)
3242 # Prefix doesn't include '.' at the end.
3243 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3244 if prefix.endswith('-review'):
3245 prefix = prefix[:-len('-review')]
3246 return prefix + '.' + self._GOOGLESOURCE
3247
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003248 def _canonical_gerrit_googlesource_host(self, host):
3249 git_host = self._canonical_git_googlesource_host(host)
3250 prefix = git_host.split('.', 1)[0]
3251 return prefix + '-review.' + self._GOOGLESOURCE
3252
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003253 def _get_counterpart_host(self, host):
3254 assert host.endswith(self._GOOGLESOURCE)
3255 git = self._canonical_git_googlesource_host(host)
3256 gerrit = self._canonical_gerrit_googlesource_host(git)
3257 return git if gerrit == host else gerrit
3258
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003259 def has_generic_host(self):
3260 """Returns whether generic .googlesource.com has been configured.
3261
3262 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3263 """
3264 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3265 if host == '.' + self._GOOGLESOURCE:
3266 return True
3267 return False
3268
3269 def _get_git_gerrit_identity_pairs(self):
3270 """Returns map from canonic host to pair of identities (Git, Gerrit).
3271
3272 One of identities might be None, meaning not configured.
3273 """
3274 host_to_identity_pairs = {}
3275 for host, identity, _ in self.get_hosts_with_creds():
3276 canonical = self._canonical_git_googlesource_host(host)
3277 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3278 idx = 0 if canonical == host else 1
3279 pair[idx] = identity
3280 return host_to_identity_pairs
3281
3282 def get_partially_configured_hosts(self):
3283 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003284 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003285 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003286 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003287
3288 def get_conflicting_hosts(self):
3289 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003290 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003291 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003292 if None not in (i1, i2) and i1 != i2)
3293
3294 def get_duplicated_hosts(self):
3295 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003296 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003297
3298 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3299 'chromium.googlesource.com': 'chromium.org',
3300 'chrome-internal.googlesource.com': 'google.com',
3301 }
3302
3303 def get_hosts_with_wrong_identities(self):
3304 """Finds hosts which **likely** reference wrong identities.
3305
3306 Note: skips hosts which have conflicting identities for Git and Gerrit.
3307 """
3308 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003309 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003310 pair = self._get_git_gerrit_identity_pairs().get(host)
3311 if pair and pair[0] == pair[1]:
3312 _, domain = self._parse_identity(pair[0])
3313 if domain != expected:
3314 hosts.add(host)
3315 return hosts
3316
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003317 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003318 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003319 hosts = sorted(hosts)
3320 assert hosts
3321 if extra_column_func is None:
3322 extras = [''] * len(hosts)
3323 else:
3324 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003325 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3326 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003327 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003328 lines.append(tmpl % he)
3329 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003330
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003331 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003332 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003333 yield ('.googlesource.com wildcard record detected',
3334 ['Chrome Infrastructure team recommends to list full host names '
3335 'explicitly.'],
3336 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003337
3338 dups = self.get_duplicated_hosts()
3339 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003340 yield ('The following hosts were defined twice',
3341 self._format_hosts(dups),
3342 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003343
3344 partial = self.get_partially_configured_hosts()
3345 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003346 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3347 'These hosts are missing',
3348 self._format_hosts(partial, lambda host: 'but %s defined' %
3349 self._get_counterpart_host(host)),
3350 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003351
3352 conflicting = self.get_conflicting_hosts()
3353 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003354 yield ('The following Git hosts have differing credentials from their '
3355 'Gerrit counterparts',
3356 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3357 tuple(self._get_git_gerrit_identity_pairs()[host])),
3358 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003359
3360 wrong = self.get_hosts_with_wrong_identities()
3361 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003362 yield ('These hosts likely use wrong identity',
3363 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3364 (self._get_git_gerrit_identity_pairs()[host][0],
3365 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3366 wrong)
3367
3368 def find_and_report_problems(self):
3369 """Returns True if there was at least one problem, else False."""
3370 found = False
3371 bad_hosts = set()
3372 for title, sublines, hosts in self._find_problems():
3373 if not found:
3374 found = True
3375 print('\n\n.gitcookies problem report:\n')
3376 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003377 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003378 if sublines:
3379 print()
3380 print(' %s' % '\n '.join(sublines))
3381 print()
3382
3383 if bad_hosts:
3384 assert found
3385 print(' You can manually remove corresponding lines in your %s file and '
3386 'visit the following URLs with correct account to generate '
3387 'correct credential lines:\n' %
3388 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3389 print(' %s' % '\n '.join(sorted(set(
3390 gerrit_util.CookiesAuthenticator().get_new_password_url(
3391 self._canonical_git_googlesource_host(host))
3392 for host in bad_hosts
3393 ))))
3394 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003395
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003396
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003397@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003398def CMDcreds_check(parser, args):
3399 """Checks credentials and suggests changes."""
3400 _, _ = parser.parse_args(args)
3401
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003402 # Code below checks .gitcookies. Abort if using something else.
3403 authn = gerrit_util.Authenticator.get()
3404 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3405 if isinstance(authn, gerrit_util.GceAuthenticator):
3406 DieWithError(
3407 'This command is not designed for GCE, are you on a bot?\n'
3408 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3409 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003410 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003411 'This command is not designed for bot environment. It checks '
3412 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003413
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003414 checker = _GitCookiesChecker()
3415 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003416
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003417 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003418 checker.print_current_creds(include_netrc=True)
3419
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003420 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003421 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003422 return 0
3423 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003424
3425
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003426@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003427def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003428 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003429 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003430 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003431 _, args = parser.parse_args(args)
3432 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003433 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003434 return RunGit(['config', 'branch.%s.base-url' % branch],
3435 error_ok=False).strip()
3436 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003437 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003438 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3439 error_ok=False).strip()
3440
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003441
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003442def color_for_status(status):
3443 """Maps a Changelist status to color, for CMDstatus and other tools."""
3444 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003445 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003446 'waiting': Fore.BLUE,
3447 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003448 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003449 'lgtm': Fore.GREEN,
3450 'commit': Fore.MAGENTA,
3451 'closed': Fore.CYAN,
3452 'error': Fore.WHITE,
3453 }.get(status, Fore.WHITE)
3454
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003455
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003456def get_cl_statuses(changes, fine_grained, max_processes=None):
3457 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003458
3459 If fine_grained is true, this will fetch CL statuses from the server.
3460 Otherwise, simply indicate if there's a matching url for the given branches.
3461
3462 If max_processes is specified, it is used as the maximum number of processes
3463 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3464 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003465
3466 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003467 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003468 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003469 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003470
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003471 if not fine_grained:
3472 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003473 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003474 for cl in changes:
3475 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003476 return
3477
3478 # First, sort out authentication issues.
3479 logging.debug('ensuring credentials exist')
3480 for cl in changes:
3481 cl.EnsureAuthenticated(force=False, refresh=True)
3482
3483 def fetch(cl):
3484 try:
3485 return (cl, cl.GetStatus())
3486 except:
3487 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003488 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003489 raise
3490
3491 threads_count = len(changes)
3492 if max_processes:
3493 threads_count = max(1, min(threads_count, max_processes))
3494 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3495
Edward Lemur61bf4172020-02-24 23:22:37 +00003496 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003497 fetched_cls = set()
3498 try:
3499 it = pool.imap_unordered(fetch, changes).__iter__()
3500 while True:
3501 try:
3502 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003503 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003504 break
3505 fetched_cls.add(cl)
3506 yield cl, status
3507 finally:
3508 pool.close()
3509
3510 # Add any branches that failed to fetch.
3511 for cl in set(changes) - fetched_cls:
3512 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003513
rmistry@google.com2dd99862015-06-22 12:22:18 +00003514
3515def upload_branch_deps(cl, args):
3516 """Uploads CLs of local branches that are dependents of the current branch.
3517
3518 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003519
3520 test1 -> test2.1 -> test3.1
3521 -> test3.2
3522 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003523
3524 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3525 run on the dependent branches in this order:
3526 test2.1, test3.1, test3.2, test2.2, test3.3
3527
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003528 Note: This function does not rebase your local dependent branches. Use it
3529 when you make a change to the parent branch that will not conflict
3530 with its dependent branches, and you would like their dependencies
3531 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003532 """
3533 if git_common.is_dirty_git_tree('upload-branch-deps'):
3534 return 1
3535
3536 root_branch = cl.GetBranch()
3537 if root_branch is None:
3538 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3539 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003540 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003541 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3542 'patchset dependencies without an uploaded CL.')
3543
3544 branches = RunGit(['for-each-ref',
3545 '--format=%(refname:short) %(upstream:short)',
3546 'refs/heads'])
3547 if not branches:
3548 print('No local branches found.')
3549 return 0
3550
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003551 # Create a dictionary of all local branches to the branches that are
3552 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003553 tracked_to_dependents = collections.defaultdict(list)
3554 for b in branches.splitlines():
3555 tokens = b.split()
3556 if len(tokens) == 2:
3557 branch_name, tracked = tokens
3558 tracked_to_dependents[tracked].append(branch_name)
3559
vapiera7fbd5a2016-06-16 09:17:49 -07003560 print()
3561 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003562 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003563
rmistry@google.com2dd99862015-06-22 12:22:18 +00003564 def traverse_dependents_preorder(branch, padding=''):
3565 dependents_to_process = tracked_to_dependents.get(branch, [])
3566 padding += ' '
3567 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003568 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003569 dependents.append(dependent)
3570 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003571
rmistry@google.com2dd99862015-06-22 12:22:18 +00003572 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003573 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003574
3575 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003576 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003577 return 0
3578
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003579 confirm_or_exit('This command will checkout all dependent branches and run '
3580 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003581
rmistry@google.com2dd99862015-06-22 12:22:18 +00003582 # Record all dependents that failed to upload.
3583 failures = {}
3584 # Go through all dependents, checkout the branch and upload.
3585 try:
3586 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003587 print()
3588 print('--------------------------------------')
3589 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003590 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003591 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003592 try:
3593 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003594 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003595 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003596 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003597 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003598 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003599 finally:
3600 # Swap back to the original root branch.
3601 RunGit(['checkout', '-q', root_branch])
3602
vapiera7fbd5a2016-06-16 09:17:49 -07003603 print()
3604 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003605 for dependent_branch in dependents:
3606 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003607 print(' %s : %s' % (dependent_branch, upload_status))
3608 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003609
3610 return 0
3611
3612
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003613def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3614 """Given a proposed tag name, returns a tag name that is guaranteed to be
3615 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3616 or 'foo-3', and so on."""
3617
3618 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3619 for suffix_num in itertools.count(1):
3620 if suffix_num == 1:
3621 to_check = proposed_tag
3622 else:
3623 to_check = '%s-%d' % (proposed_tag, suffix_num)
3624
3625 if to_check not in existing_tags:
3626 return to_check
3627
3628
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003629@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003630def CMDarchive(parser, args):
3631 """Archives and deletes branches associated with closed changelists."""
3632 parser.add_option(
3633 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003634 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003635 parser.add_option(
3636 '-f', '--force', action='store_true',
3637 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003638 parser.add_option(
3639 '-d', '--dry-run', action='store_true',
3640 help='Skip the branch tagging and removal steps.')
3641 parser.add_option(
3642 '-t', '--notags', action='store_true',
3643 help='Do not tag archived branches. '
3644 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003645
kmarshall3bff56b2016-06-06 18:31:47 -07003646 options, args = parser.parse_args(args)
3647 if args:
3648 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003649
3650 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3651 if not branches:
3652 return 0
3653
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003654 tags = RunGit(['for-each-ref', '--format=%(refname)',
3655 'refs/tags']).splitlines() or []
3656 tags = [t.split('/')[-1] for t in tags]
3657
vapiera7fbd5a2016-06-16 09:17:49 -07003658 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003659 changes = [Changelist(branchref=b)
3660 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003661 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3662 statuses = get_cl_statuses(changes,
3663 fine_grained=True,
3664 max_processes=options.maxjobs)
3665 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003666 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3667 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003668 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003669 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003670 proposal.sort()
3671
3672 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003673 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003674 return 0
3675
Edward Lemur85153282020-02-14 22:06:29 +00003676 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003677
vapiera7fbd5a2016-06-16 09:17:49 -07003678 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003679 if options.notags:
3680 for next_item in proposal:
3681 print(' ' + next_item[0])
3682 else:
3683 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3684 for next_item in proposal:
3685 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003686
kmarshall9249e012016-08-23 12:02:16 -07003687 # Quit now on precondition failure or if instructed by the user, either
3688 # via an interactive prompt or by command line flags.
3689 if options.dry_run:
3690 print('\nNo changes were made (dry run).\n')
3691 return 0
3692 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003693 print('You are currently on a branch \'%s\' which is associated with a '
3694 'closed codereview issue, so archive cannot proceed. Please '
3695 'checkout another branch and run this command again.' %
3696 current_branch)
3697 return 1
kmarshall9249e012016-08-23 12:02:16 -07003698 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003699 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3700 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003701 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003702 return 1
3703
3704 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003705 if not options.notags:
3706 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003707
3708 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3709 # Clean up the tag if we failed to delete the branch.
3710 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003711
vapiera7fbd5a2016-06-16 09:17:49 -07003712 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003713
3714 return 0
3715
3716
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003717@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003718def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003719 """Show status of changelists.
3720
3721 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003722 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003723 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003724 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003725 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003726 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003727 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003728 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003729
3730 Also see 'git cl comments'.
3731 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003732 parser.add_option(
3733 '--no-branch-color',
3734 action='store_true',
3735 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003736 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003737 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003738 parser.add_option('-f', '--fast', action='store_true',
3739 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003740 parser.add_option(
3741 '-j', '--maxjobs', action='store', type=int,
3742 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003743 parser.add_option(
3744 '-i', '--issue', type=int,
3745 help='Operate on this issue instead of the current branch\'s implicit '
3746 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003747 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003748 if args:
3749 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003750
iannuccie53c9352016-08-17 14:40:40 -07003751 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003752 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003753
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003754 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003755 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003756 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003757 if cl.GetIssue():
3758 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003759 elif options.field == 'id':
3760 issueid = cl.GetIssue()
3761 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003762 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003763 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003764 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003765 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003766 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003767 elif options.field == 'status':
3768 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003769 elif options.field == 'url':
3770 url = cl.GetIssueURL()
3771 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003772 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003773 return 0
3774
3775 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3776 if not branches:
3777 print('No local branch found.')
3778 return 0
3779
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003780 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003781 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003782 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003783 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003784 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003785 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003786 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003787
Edward Lemur85153282020-02-14 22:06:29 +00003788 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003789
3790 def FormatBranchName(branch, colorize=False):
3791 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3792 an asterisk when it is the current branch."""
3793
3794 asterisk = ""
3795 color = Fore.RESET
3796 if branch == current_branch:
3797 asterisk = "* "
3798 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003799 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003800
3801 if colorize:
3802 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003803 return asterisk + branch_name
3804
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003805 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003806
3807 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003808 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3809 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003810 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003811 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003812 branch_statuses[c.GetBranch()] = status
3813 status = branch_statuses.pop(branch)
3814 url = cl.GetIssueURL()
3815 if url and (not status or status == 'error'):
3816 # The issue probably doesn't exist anymore.
3817 url += ' (broken)'
3818
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003819 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003820 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003821 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003822 color = ''
3823 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003824 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003825
Alan Cuttera3be9a52019-03-04 18:50:33 +00003826 branch_display = FormatBranchName(branch)
3827 padding = ' ' * (alignment - len(branch_display))
3828 if not options.no_branch_color:
3829 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003830
Alan Cuttera3be9a52019-03-04 18:50:33 +00003831 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3832 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003833
vapiera7fbd5a2016-06-16 09:17:49 -07003834 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003835 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003836 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003837 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003838 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003839 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003840 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003841 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003842 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003843 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003844 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003845 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003846 return 0
3847
3848
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003849def colorize_CMDstatus_doc():
3850 """To be called once in main() to add colors to git cl status help."""
3851 colors = [i for i in dir(Fore) if i[0].isupper()]
3852
3853 def colorize_line(line):
3854 for color in colors:
3855 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003856 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003857 indent = len(line) - len(line.lstrip(' ')) + 1
3858 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3859 return line
3860
3861 lines = CMDstatus.__doc__.splitlines()
3862 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3863
3864
phajdan.jre328cf92016-08-22 04:12:17 -07003865def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003866 if path == '-':
3867 json.dump(contents, sys.stdout)
3868 else:
3869 with open(path, 'w') as f:
3870 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003871
3872
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003873@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003874@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003875def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003876 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003877
3878 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003879 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003880 parser.add_option('-r', '--reverse', action='store_true',
3881 help='Lookup the branch(es) for the specified issues. If '
3882 'no issues are specified, all branches with mapped '
3883 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003884 parser.add_option('--json',
3885 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003886 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003887
dnj@chromium.org406c4402015-03-03 17:22:28 +00003888 if options.reverse:
3889 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003890 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003891 # Reverse issue lookup.
3892 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003893
3894 git_config = {}
3895 for config in RunGit(['config', '--get-regexp',
3896 r'branch\..*issue']).splitlines():
3897 name, _space, val = config.partition(' ')
3898 git_config[name] = val
3899
dnj@chromium.org406c4402015-03-03 17:22:28 +00003900 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003901 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003902 Changelist.IssueConfigKey())
3903 issue = git_config.get(config_key)
3904 if issue:
3905 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003906 if not args:
3907 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003908 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003909 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003910 try:
3911 issue_num = int(issue)
3912 except ValueError:
3913 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003914 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003915 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003916 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003917 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003918 if options.json:
3919 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003920 return 0
3921
3922 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003923 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003924 if not issue.valid:
3925 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3926 'or no argument to list it.\n'
3927 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003928 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003929 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003930 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003931 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003932 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3933 if options.json:
3934 write_json(options.json, {
3935 'issue': cl.GetIssue(),
3936 'issue_url': cl.GetIssueURL(),
3937 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003938 return 0
3939
3940
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003941@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003942def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003943 """Shows or posts review comments for any changelist."""
3944 parser.add_option('-a', '--add-comment', dest='comment',
3945 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003946 parser.add_option('-p', '--publish', action='store_true',
3947 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003948 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003949 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003950 parser.add_option('-m', '--machine-readable', dest='readable',
3951 action='store_false', default=True,
3952 help='output comments in a format compatible with '
3953 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003954 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003955 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003956 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003957
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003958 issue = None
3959 if options.issue:
3960 try:
3961 issue = int(options.issue)
3962 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003963 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003964
Edward Lemur934836a2019-09-09 20:16:54 +00003965 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003966
3967 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003968 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003969 return 0
3970
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003971 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3972 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003973 for comment in summary:
3974 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003975 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003976 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003977 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003978 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003979 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003980 elif comment.autogenerated:
3981 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003982 else:
3983 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003984 print('\n%s%s %s%s\n%s' % (
3985 color,
3986 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3987 comment.sender,
3988 Fore.RESET,
3989 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3990
smut@google.comc85ac942015-09-15 16:34:43 +00003991 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003992 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003993 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003994 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3995 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003996 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003997 return 0
3998
3999
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004000@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004001@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004002def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004003 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004004 parser.add_option('-d', '--display', action='store_true',
4005 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004006 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004007 help='New description to set for this issue (- for stdin, '
4008 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004009 parser.add_option('-f', '--force', action='store_true',
4010 help='Delete any unpublished Gerrit edits for this issue '
4011 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004012
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004013 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004014
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004015 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004016 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004017 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004018 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004019 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004020
Edward Lemur934836a2019-09-09 20:16:54 +00004021 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004022 if target_issue_arg:
4023 kwargs['issue'] = target_issue_arg.issue
4024 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004025
4026 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004027 if not cl.GetIssue():
4028 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004029
Edward Lemur678a6842019-10-03 22:25:05 +00004030 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004031 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004032
Edward Lemur6c6827c2020-02-06 21:15:18 +00004033 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004034
smut@google.com34fb6b12015-07-13 20:03:26 +00004035 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004036 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004037 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004038
4039 if options.new_description:
4040 text = options.new_description
4041 if text == '-':
4042 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004043 elif text == '+':
4044 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004045 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004046
4047 description.set_description(text)
4048 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004049 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004050 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004051 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004052 return 0
4053
4054
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004055@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004056def CMDlint(parser, args):
4057 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004058 parser.add_option('--filter', action='append', metavar='-x,+y',
4059 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004060 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004061
4062 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004063 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004064 try:
4065 import cpplint
4066 import cpplint_chromium
4067 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004068 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004069 return 1
4070
4071 # Change the current working directory before calling lint so that it
4072 # shows the correct base.
4073 previous_cwd = os.getcwd()
4074 os.chdir(settings.GetRoot())
4075 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004076 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004077 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004078 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004079 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004080 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004081 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004082
4083 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004084 command = args + files
4085 if options.filter:
4086 command = ['--filter=' + ','.join(options.filter)] + command
4087 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004088
4089 white_regex = re.compile(settings.GetLintRegex())
4090 black_regex = re.compile(settings.GetLintIgnoreRegex())
4091 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4092 for filename in filenames:
4093 if white_regex.match(filename):
4094 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004095 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004096 else:
4097 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4098 extra_check_functions)
4099 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004100 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004101 finally:
4102 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004103 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004104 if cpplint._cpplint_state.error_count != 0:
4105 return 1
4106 return 0
4107
4108
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004109@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004110def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004111 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004112 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004113 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004114 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004115 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004116 parser.add_option('--all', action='store_true',
4117 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004118 parser.add_option('--parallel', action='store_true',
4119 help='Run all tests specified by input_api.RunTests in all '
4120 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004121 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004122
sbc@chromium.org71437c02015-04-09 19:29:40 +00004123 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004124 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004125 return 1
4126
Edward Lemur934836a2019-09-09 20:16:54 +00004127 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004128 if args:
4129 base_branch = args[0]
4130 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004131 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004132 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004133
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004134 if cl.GetIssue():
4135 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004136 else:
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004137 description = cl.GetLocalDescription(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004138
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004139 cl.RunHook(
4140 committing=not options.upload,
4141 may_prompt=False,
4142 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004143 parallel=options.parallel,
4144 upstream=base_branch,
4145 description=description,
4146 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004147 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004148
4149
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004150def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004151 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004152
4153 Works the same way as
4154 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4155 but can be called on demand on all platforms.
4156
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004157 The basic idea is to generate git hash of a state of the tree, original
4158 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004159 """
4160 lines = []
4161 tree_hash = RunGitSilent(['write-tree'])
4162 lines.append('tree %s' % tree_hash.strip())
4163 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4164 if code == 0:
4165 lines.append('parent %s' % parent.strip())
4166 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4167 lines.append('author %s' % author.strip())
4168 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4169 lines.append('committer %s' % committer.strip())
4170 lines.append('')
4171 # Note: Gerrit's commit-hook actually cleans message of some lines and
4172 # whitespace. This code is not doing this, but it clearly won't decrease
4173 # entropy.
4174 lines.append(message)
4175 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004176 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004177 return 'I%s' % change_hash.strip()
4178
4179
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004180def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004181 """Computes the remote branch ref to use for the CL.
4182
4183 Args:
4184 remote (str): The git remote for the CL.
4185 remote_branch (str): The git remote branch for the CL.
4186 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004187 """
4188 if not (remote and remote_branch):
4189 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004190
wittman@chromium.org455dc922015-01-26 20:15:50 +00004191 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004192 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004193 # refs, which are then translated into the remote full symbolic refs
4194 # below.
4195 if '/' not in target_branch:
4196 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4197 else:
4198 prefix_replacements = (
4199 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4200 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4201 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4202 )
4203 match = None
4204 for regex, replacement in prefix_replacements:
4205 match = re.search(regex, target_branch)
4206 if match:
4207 remote_branch = target_branch.replace(match.group(0), replacement)
4208 break
4209 if not match:
4210 # This is a branch path but not one we recognize; use as-is.
4211 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004212 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4213 # Handle the refs that need to land in different refs.
4214 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004215
wittman@chromium.org455dc922015-01-26 20:15:50 +00004216 # Create the true path to the remote branch.
4217 # Does the following translation:
4218 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4219 # * refs/remotes/origin/master -> refs/heads/master
4220 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4221 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4222 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4223 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4224 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4225 'refs/heads/')
4226 elif remote_branch.startswith('refs/remotes/branch-heads'):
4227 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004228
wittman@chromium.org455dc922015-01-26 20:15:50 +00004229 return remote_branch
4230
4231
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004232def cleanup_list(l):
4233 """Fixes a list so that comma separated items are put as individual items.
4234
4235 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4236 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4237 """
4238 items = sum((i.split(',') for i in l), [])
4239 stripped_items = (i.strip() for i in items)
4240 return sorted(filter(None, stripped_items))
4241
4242
Aaron Gable4db38df2017-11-03 14:59:07 -07004243@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004244@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004245def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004246 """Uploads the current changelist to codereview.
4247
4248 Can skip dependency patchset uploads for a branch by running:
4249 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004250 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004251 git config --unset branch.branch_name.skip-deps-uploads
4252 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004253
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004254 If the name of the checked out branch starts with "bug-" or "fix-" followed
4255 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004256 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004257
4258 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004259 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004260 [git-cl] add support for hashtags
4261 Foo bar: implement foo
4262 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004263 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004264 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4265 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004266 parser.add_option('--bypass-watchlists', action='store_true',
4267 dest='bypass_watchlists',
4268 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004269 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004270 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004271 parser.add_option('--message', '-m', dest='message',
4272 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004273 parser.add_option('-b', '--bug',
4274 help='pre-populate the bug number(s) for this issue. '
4275 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004276 parser.add_option('--message-file', dest='message_file',
4277 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004278 parser.add_option('--title', '-t', dest='title',
4279 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004280 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004281 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004282 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004283 parser.add_option('--tbrs',
4284 action='append', default=[],
4285 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004286 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004287 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004288 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004289 parser.add_option('--hashtag', dest='hashtags',
4290 action='append', default=[],
4291 help=('Gerrit hashtag for new CL; '
4292 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004293 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004294 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004295 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004296 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004297 metavar='TARGET',
4298 help='Apply CL to remote ref TARGET. ' +
4299 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004300 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004301 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004302 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004303 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004304 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004305 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004306 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4307 const='TBR', help='add a set of OWNERS to TBR')
4308 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4309 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004310 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004311 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004312 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004313 'implies --send-mail')
4314 parser.add_option('-d', '--cq-dry-run',
4315 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004316 help='Send the patchset to do a CQ dry run right after '
4317 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004318 parser.add_option('--preserve-tryjobs', action='store_true',
4319 help='instruct the CQ to let tryjobs running even after '
4320 'new patchsets are uploaded instead of canceling '
4321 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004322 parser.add_option('--dependencies', action='store_true',
4323 help='Uploads CLs of all the local branches that depend on '
4324 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004325 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4326 help='Sends your change to the CQ after an approval. Only '
4327 'works on repos that have the Auto-Submit label '
4328 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004329 parser.add_option('--parallel', action='store_true',
4330 help='Run all tests specified by input_api.RunTests in all '
4331 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004332 parser.add_option('--no-autocc', action='store_true',
4333 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004334 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004335 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004336 parser.add_option('-R', '--retry-failed', action='store_true',
4337 help='Retry failed tryjobs from old patchset immediately '
4338 'after uploading new patchset. Cannot be used with '
4339 '--use-commit-queue or --cq-dry-run.')
4340 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4341 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004342 parser.add_option('--fixed', '-x',
4343 help='List of bugs that will be commented on and marked '
4344 'fixed (pre-populates "Fixed:" tag). Same format as '
4345 '-b option / "Bug:" tag. If fixing several issues, '
4346 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004347 parser.add_option('--edit-description', action='store_true', default=False,
4348 help='Modify description before upload. Cannot be used '
4349 'with --force. It is a noop when --no-squash is set '
4350 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004351
rmistry@google.com2dd99862015-06-22 12:22:18 +00004352 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004353 (options, args) = parser.parse_args(args)
4354
sbc@chromium.org71437c02015-04-09 19:29:40 +00004355 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004356 return 1
4357
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004358 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004359 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004360 options.cc = cleanup_list(options.cc)
4361
Josipe827b0f2020-01-30 00:07:20 +00004362 if options.edit_description and options.force:
4363 parser.error('Only one of --force and --edit-description allowed')
4364
tandriib80458a2016-06-23 12:20:07 -07004365 if options.message_file:
4366 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004367 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004368 options.message = gclient_utils.FileRead(options.message_file)
4369 options.message_file = None
4370
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004371 if ([options.cq_dry_run,
4372 options.use_commit_queue,
4373 options.retry_failed].count(True) > 1):
4374 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4375 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004376
Aaron Gableedbc4132017-09-11 13:22:28 -07004377 if options.use_commit_queue:
4378 options.send_mail = True
4379
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004380 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4381 settings.GetIsGerrit()
4382
Edward Lemur934836a2019-09-09 20:16:54 +00004383 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004384 # Warm change details cache now to avoid RPCs later, reducing latency for
4385 # developers.
4386 if cl.GetIssue():
4387 cl._GetChangeDetail(
4388 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4389
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004390 if options.retry_failed and not cl.GetIssue():
4391 print('No previous patchsets, so --retry-failed has no effect.')
4392 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004393
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004394 # cl.GetMostRecentPatchset uses cached information, and can return the last
4395 # patchset before upload. Calling it here makes it clear that it's the
4396 # last patchset before upload. Note that GetMostRecentPatchset will fail
4397 # if no CL has been uploaded yet.
4398 if options.retry_failed:
4399 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004400
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004401 ret = cl.CMDUpload(options, args, orig_args)
4402
4403 if options.retry_failed:
4404 if ret != 0:
4405 print('Upload failed, so --retry-failed has no effect.')
4406 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004407 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004408 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004409 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004410 if len(buckets) == 0:
4411 print('No failed tryjobs, so --retry-failed has no effect.')
4412 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004413 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004414
4415 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004416
4417
Francois Dorayd42c6812017-05-30 15:10:20 -04004418@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004419@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004420def CMDsplit(parser, args):
4421 """Splits a branch into smaller branches and uploads CLs.
4422
4423 Creates a branch and uploads a CL for each group of files modified in the
4424 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004425 comment, '$directory' is replaced with the directory containing the changes
4426 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4427 sending out, and '$num_cls' is replaced with the total number of CLs that
4428 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004429 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004430 parser.add_option('-d', '--description', dest='description_file',
4431 help='A text file containing a CL description in which '
4432 '$directory will be replaced by each CL\'s directory.')
4433 parser.add_option('-c', '--comment', dest='comment_file',
4434 help='A text file containing a CL comment.')
4435 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004436 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004437 help='List the files and reviewers for each CL that would '
4438 'be created, but don\'t create branches or CLs.')
4439 parser.add_option('--cq-dry-run', action='store_true',
4440 help='If set, will do a cq dry run for each uploaded CL. '
4441 'Please be careful when doing this; more than ~10 CLs '
4442 'has the potential to overload our build '
4443 'infrastructure. Try to upload these not during high '
4444 'load times (usually 11-3 Mountain View time). Email '
4445 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004446 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4447 default=True,
4448 help='Sends your change to the CQ after an approval. Only '
4449 'works on repos that have the Auto-Submit label '
4450 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004451 options, _ = parser.parse_args(args)
4452
4453 if not options.description_file:
4454 parser.error('No --description flag specified.')
4455
4456 def WrappedCMDupload(args):
4457 return CMDupload(OptionParser(), args)
4458
4459 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004460 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004461 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004462
4463
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004464@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004465@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004466def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004467 """DEPRECATED: Used to commit the current changelist via git-svn."""
4468 message = ('git-cl no longer supports committing to SVN repositories via '
4469 'git-svn. You probably want to use `git cl land` instead.')
4470 print(message)
4471 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004472
4473
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004474@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004475@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004476def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004477 """Commits the current changelist via git.
4478
4479 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4480 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004481 """
4482 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4483 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004484 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004485 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004486 parser.add_option('--parallel', action='store_true',
4487 help='Run all tests specified by input_api.RunTests in all '
4488 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004489 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004490
Edward Lemur934836a2019-09-09 20:16:54 +00004491 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004492
Robert Iannucci2e73d432018-03-14 01:10:47 -07004493 if not cl.GetIssue():
4494 DieWithError('You must upload the change first to Gerrit.\n'
4495 ' If you would rather have `git cl land` upload '
4496 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004497 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004498 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004499
4500
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004501@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004502@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004503def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004504 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004505 parser.add_option('-b', dest='newbranch',
4506 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004507 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004508 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004509 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004510 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004511
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004512 group = optparse.OptionGroup(
4513 parser,
4514 'Options for continuing work on the current issue uploaded from a '
4515 'different clone (e.g. different machine). Must be used independently '
4516 'from the other options. No issue number should be specified, and the '
4517 'branch must have an issue number associated with it')
4518 group.add_option('--reapply', action='store_true', dest='reapply',
4519 help='Reset the branch and reapply the issue.\n'
4520 'CAUTION: This will undo any local changes in this '
4521 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004522
4523 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004524 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004525 parser.add_option_group(group)
4526
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004527 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004528
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004529 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004530 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004531 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004532 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004533 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004534
Edward Lemur934836a2019-09-09 20:16:54 +00004535 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004536 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004537 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004538
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004539 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004540 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004541 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004542
4543 RunGit(['reset', '--hard', upstream])
4544 if options.pull:
4545 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004546
Edward Lemur678a6842019-10-03 22:25:05 +00004547 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4548 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004549
4550 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004551 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004552
Edward Lemurf38bc172019-09-03 21:02:13 +00004553 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004554 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004555 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004556
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004557 # We don't want uncommitted changes mixed up with the patch.
4558 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004559 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004560
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004561 if options.newbranch:
4562 if options.force:
4563 RunGit(['branch', '-D', options.newbranch],
4564 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004565 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004566
Edward Lemur678a6842019-10-03 22:25:05 +00004567 cl = Changelist(
4568 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004569
Edward Lemur678a6842019-10-03 22:25:05 +00004570 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004571 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004572
Edward Lemurf38bc172019-09-03 21:02:13 +00004573 return cl.CMDPatchWithParsedIssue(
4574 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004575
4576
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004577def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578 """Fetches the tree status and returns either 'open', 'closed',
4579 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004580 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004581 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004582 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004583 if status.find('closed') != -1 or status == '0':
4584 return 'closed'
4585 elif status.find('open') != -1 or status == '1':
4586 return 'open'
4587 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004588 return 'unset'
4589
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004590
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004591def GetTreeStatusReason():
4592 """Fetches the tree status from a json url and returns the message
4593 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004594 url = settings.GetTreeStatusUrl()
4595 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004596 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004597 status = json.loads(connection.read())
4598 connection.close()
4599 return status['message']
4600
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004601
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004602@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004603def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004604 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004605 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004606 status = GetTreeStatus()
4607 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004608 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004609 return 2
4610
vapiera7fbd5a2016-06-16 09:17:49 -07004611 print('The tree is %s' % status)
4612 print()
4613 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004614 if status != 'open':
4615 return 1
4616 return 0
4617
4618
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004619@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004620def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004621 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4622 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004623 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004624 '-b', '--bot', action='append',
4625 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4626 'times to specify multiple builders. ex: '
4627 '"-b win_rel -b win_layout". See '
4628 'the try server waterfall for the builders name and the tests '
4629 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004630 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004631 '-B', '--bucket', default='',
4632 help=('Buildbucket bucket to send the try requests.'))
4633 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004634 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004635 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004636 'be determined by the try recipe that builder runs, which usually '
4637 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004638 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004639 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004640 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004641 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004642 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004643 '--category', default='git_cl_try', help='Specify custom build category.')
4644 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004645 '--project',
4646 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004647 'in recipe to determine to which repository or directory to '
4648 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004649 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004650 '-p', '--property', dest='properties', action='append', default=[],
4651 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004652 'key2=value2 etc. The value will be treated as '
4653 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004654 'NOTE: using this may make your tryjob not usable for CQ, '
4655 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004656 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004657 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4658 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004659 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004660 parser.add_option(
4661 '-R', '--retry-failed', action='store_true', default=False,
4662 help='Retry failed jobs from the latest set of tryjobs. '
4663 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004664 parser.add_option(
4665 '-i', '--issue', type=int,
4666 help='Operate on this issue instead of the current branch\'s implicit '
4667 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004668 options, args = parser.parse_args(args)
4669
machenbach@chromium.org45453142015-09-15 08:45:22 +00004670 # Make sure that all properties are prop=value pairs.
4671 bad_params = [x for x in options.properties if '=' not in x]
4672 if bad_params:
4673 parser.error('Got properties with missing "=": %s' % bad_params)
4674
maruel@chromium.org15192402012-09-06 12:38:29 +00004675 if args:
4676 parser.error('Unknown arguments: %s' % args)
4677
Edward Lemur934836a2019-09-09 20:16:54 +00004678 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004679 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004680 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004681
Edward Lemurf38bc172019-09-03 21:02:13 +00004682 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004683 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004684
tandriie113dfd2016-10-11 10:20:12 -07004685 error_message = cl.CannotTriggerTryJobReason()
4686 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004687 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004688
Quinten Yearsley983111f2019-09-26 17:18:48 +00004689 if options.retry_failed:
4690 if options.bot or options.bucket:
4691 print('ERROR: The option --retry-failed is not compatible with '
4692 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4693 return 1
4694 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004695 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004696 if options.verbose:
4697 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004698 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004699 if not buckets:
4700 print('There are no failed jobs in the latest set of jobs '
4701 '(patchset #%d), doing nothing.' % patchset)
4702 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004703 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004704 if num_builders > 10:
4705 confirm_or_exit('There are %d builders with failed builds.'
4706 % num_builders, action='continue')
4707 else:
4708 buckets = _get_bucket_map(cl, options, parser)
4709 if buckets and any(b.startswith('master.') for b in buckets):
4710 print('ERROR: Buildbot masters are not supported.')
4711 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004712
qyearsleydd49f942016-10-28 11:57:22 -07004713 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4714 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004715 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004716 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004717 print('git cl try with no bots now defaults to CQ dry run.')
4718 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4719 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004720
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004721 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004722 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004723 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004724 'of bot requires an initial job from a parent (usually a builder). '
4725 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004726 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004727 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004728
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004729 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004730 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004731 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004732 except BuildbucketResponseException as ex:
4733 print('ERROR: %s' % ex)
4734 return 1
4735 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004736
4737
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004738@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004739def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004740 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004741 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004742 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004743 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004744 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004745 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004746 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004747 '--color', action='store_true', default=setup_color.IS_TTY,
4748 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004749 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004750 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4751 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004752 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004753 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004754 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004755 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004756 parser.add_option(
4757 '-i', '--issue', type=int,
4758 help='Operate on this issue instead of the current branch\'s implicit '
4759 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004760 options, args = parser.parse_args(args)
4761 if args:
4762 parser.error('Unrecognized args: %s' % ' '.join(args))
4763
Edward Lemur934836a2019-09-09 20:16:54 +00004764 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004765 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004766 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004767
tandrii221ab252016-10-06 08:12:04 -07004768 patchset = options.patchset
4769 if not patchset:
4770 patchset = cl.GetMostRecentPatchset()
4771 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004772 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004773 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004774 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004775 cl.GetIssue())
4776
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004777 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004778 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004779 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004780 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004781 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004782 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004783 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004784 else:
4785 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004786 return 0
4787
4788
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004789@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004790@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004791def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004792 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004793 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004794 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004795 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004796
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004797 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004798 if args:
4799 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004800 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004801 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004802 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004803 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004804
4805 # Clear configured merge-base, if there is one.
4806 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004807 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004808 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004809 return 0
4810
4811
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004812@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004813def CMDweb(parser, args):
4814 """Opens the current CL in the web browser."""
4815 _, args = parser.parse_args(args)
4816 if args:
4817 parser.error('Unrecognized args: %s' % ' '.join(args))
4818
4819 issue_url = Changelist().GetIssueURL()
4820 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004821 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004822 return 1
4823
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004824 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004825 # allows us to hide the "Created new window in existing browser session."
4826 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004827 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004828 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004829 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004830 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004831 os.open(os.devnull, os.O_RDWR)
4832 try:
4833 webbrowser.open(issue_url)
4834 finally:
4835 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004836 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004837 return 0
4838
4839
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004840@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004841def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004842 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004843 parser.add_option('-d', '--dry-run', action='store_true',
4844 help='trigger in dry run mode')
4845 parser.add_option('-c', '--clear', action='store_true',
4846 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004847 parser.add_option(
4848 '-i', '--issue', type=int,
4849 help='Operate on this issue instead of the current branch\'s implicit '
4850 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004851 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004852 if args:
4853 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004854 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004855 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004856
Edward Lemur934836a2019-09-09 20:16:54 +00004857 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004858 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004859 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004860 elif options.dry_run:
4861 state = _CQState.DRY_RUN
4862 else:
4863 state = _CQState.COMMIT
4864 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004865 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004866 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004867 return 0
4868
4869
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004870@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004871def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004872 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004873 parser.add_option(
4874 '-i', '--issue', type=int,
4875 help='Operate on this issue instead of the current branch\'s implicit '
4876 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004877 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004878 if args:
4879 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004880 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004881 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004882 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004883 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004884 cl.CloseIssue()
4885 return 0
4886
4887
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004888@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004889def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004890 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004891 parser.add_option(
4892 '--stat',
4893 action='store_true',
4894 dest='stat',
4895 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004896 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004897 if args:
4898 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004899
Edward Lemur934836a2019-09-09 20:16:54 +00004900 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004901 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004902 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004903 if not issue:
4904 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004905
Aaron Gablea718c3e2017-08-28 17:47:28 -07004906 base = cl._GitGetBranchConfigValue('last-upload-hash')
4907 if not base:
4908 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4909 if not base:
4910 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4911 revision_info = detail['revisions'][detail['current_revision']]
4912 fetch_info = revision_info['fetch']['http']
4913 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4914 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004915
Aaron Gablea718c3e2017-08-28 17:47:28 -07004916 cmd = ['git', 'diff']
4917 if options.stat:
4918 cmd.append('--stat')
4919 cmd.append(base)
4920 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004921
4922 return 0
4923
4924
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004925@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004926def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004927 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004928 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004929 '--ignore-current',
4930 action='store_true',
4931 help='Ignore the CL\'s current reviewers and start from scratch.')
4932 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004933 '--ignore-self',
4934 action='store_true',
4935 help='Do not consider CL\'s author as an owners.')
4936 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004937 '--no-color',
4938 action='store_true',
4939 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004940 parser.add_option(
4941 '--batch',
4942 action='store_true',
4943 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004944 # TODO: Consider moving this to another command, since other
4945 # git-cl owners commands deal with owners for a given CL.
4946 parser.add_option(
4947 '--show-all',
4948 action='store_true',
4949 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004950 options, args = parser.parse_args(args)
4951
4952 author = RunGit(['config', 'user.email']).strip() or None
4953
Edward Lemur934836a2019-09-09 20:16:54 +00004954 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004955
Yang Guo6e269a02019-06-26 11:17:02 +00004956 if options.show_all:
4957 for arg in args:
4958 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004959 database = owners.Database(settings.GetRoot(), file, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004960 database.load_data_needed_for([arg])
4961 print('Owners for %s:' % arg)
4962 for owner in sorted(database.all_possible_owners([arg], None)):
4963 print(' - %s' % owner)
4964 return 0
4965
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004966 if args:
4967 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004968 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004969 base_branch = args[0]
4970 else:
4971 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004972 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004973
Edward Lemur7f6dec02020-02-06 20:23:58 +00004974 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004975 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4976
4977 if options.batch:
4978 db = owners.Database(change.RepositoryRoot(), file, os.path)
4979 print('\n'.join(db.reviewers_for(affected_files, author)))
4980 return 0
4981
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004982 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004983 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004984 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004985 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004986 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004987 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004988 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004989 override_files=change.OriginalOwnersFiles(),
4990 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004991
4992
Aiden Bennerc08566e2018-10-03 17:52:42 +00004993def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004994 """Generates a diff command."""
4995 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004996 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4997
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004998 if allow_prefix:
4999 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5000 # case that diff.noprefix is set in the user's git config.
5001 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5002 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005003 diff_cmd += ['--no-prefix']
5004
5005 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005006
5007 if args:
5008 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005009 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005010 diff_cmd.append(arg)
5011 else:
5012 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005013
5014 return diff_cmd
5015
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005016
Jamie Madill5e96ad12020-01-13 16:08:35 +00005017def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5018 """Runs clang-format-diff and sets a return value if necessary."""
5019
5020 if not clang_diff_files:
5021 return 0
5022
5023 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5024 # formatted. This is used to block during the presubmit.
5025 return_value = 0
5026
5027 # Locate the clang-format binary in the checkout
5028 try:
5029 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5030 except clang_format.NotFoundError as e:
5031 DieWithError(e)
5032
5033 if opts.full or settings.GetFormatFullByDefault():
5034 cmd = [clang_format_tool]
5035 if not opts.dry_run and not opts.diff:
5036 cmd.append('-i')
5037 if opts.dry_run:
5038 for diff_file in clang_diff_files:
5039 with open(diff_file, 'r') as myfile:
5040 code = myfile.read().replace('\r\n', '\n')
5041 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5042 stdout = stdout.replace('\r\n', '\n')
5043 if opts.diff:
5044 sys.stdout.write(stdout)
5045 if code != stdout:
5046 return_value = 2
5047 else:
5048 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5049 if opts.diff:
5050 sys.stdout.write(stdout)
5051 else:
5052 env = os.environ.copy()
5053 env['PATH'] = str(os.path.dirname(clang_format_tool))
5054 try:
5055 script = clang_format.FindClangFormatScriptInChromiumTree(
5056 'clang-format-diff.py')
5057 except clang_format.NotFoundError as e:
5058 DieWithError(e)
5059
5060 cmd = [sys.executable, script, '-p0']
5061 if not opts.dry_run and not opts.diff:
5062 cmd.append('-i')
5063
5064 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5065 diff_output = RunGit(diff_cmd)
5066
5067 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5068 if opts.diff:
5069 sys.stdout.write(stdout)
5070 if opts.dry_run and len(stdout) > 0:
5071 return_value = 2
5072
5073 return return_value
5074
5075
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005076def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005077 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005078 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005079
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005080
enne@chromium.org555cfe42014-01-29 18:21:39 +00005081@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005082@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005083def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005084 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005085 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005086 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005087 parser.add_option('--full', action='store_true',
5088 help='Reformat the full content of all touched files')
5089 parser.add_option('--dry-run', action='store_true',
5090 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005091 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005092 '--no-clang-format',
5093 dest='clang_format',
5094 action='store_false',
5095 default=True,
5096 help='Disables formatting of various file types using clang-format.')
5097 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005098 '--python',
5099 action='store_true',
5100 default=None,
5101 help='Enables python formatting on all python files.')
5102 parser.add_option(
5103 '--no-python',
5104 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005105 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005106 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005107 'If neither --python or --no-python are set, python files that have a '
5108 '.style.yapf file in an ancestor directory will be formatted. '
5109 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005110 parser.add_option(
5111 '--js',
5112 action='store_true',
5113 help='Format javascript code with clang-format. '
5114 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005115 parser.add_option('--diff', action='store_true',
5116 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005117 parser.add_option('--presubmit', action='store_true',
5118 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005119 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005120
Garrett Beaty91a6f332020-01-06 16:57:24 +00005121 if opts.python is not None and opts.no_python:
5122 raise parser.error('Cannot set both --python and --no-python')
5123 if opts.no_python:
5124 opts.python = False
5125
Daniel Chengc55eecf2016-12-30 03:11:02 -08005126 # Normalize any remaining args against the current path, so paths relative to
5127 # the current directory are still resolved as expected.
5128 args = [os.path.join(os.getcwd(), arg) for arg in args]
5129
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005130 # git diff generates paths against the root of the repository. Change
5131 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005132 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005133 if rel_base_path:
5134 os.chdir(rel_base_path)
5135
digit@chromium.org29e47272013-05-17 17:01:46 +00005136 # Grab the merge-base commit, i.e. the upstream commit of the current
5137 # branch when it was created or the last time it was rebased. This is
5138 # to cover the case where the user may have called "git fetch origin",
5139 # moving the origin branch to a newer commit, but hasn't rebased yet.
5140 upstream_commit = None
5141 cl = Changelist()
5142 upstream_branch = cl.GetUpstreamBranch()
5143 if upstream_branch:
5144 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5145 upstream_commit = upstream_commit.strip()
5146
5147 if not upstream_commit:
5148 DieWithError('Could not find base commit for this branch. '
5149 'Are you in detached state?')
5150
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005151 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5152 diff_output = RunGit(changed_files_cmd)
5153 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005154 # Filter out files deleted by this CL
5155 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005156
Andreas Haas417d89c2020-02-06 10:24:27 +00005157 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005158 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005159
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005160 clang_diff_files = []
5161 if opts.clang_format:
5162 clang_diff_files = [
5163 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5164 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005165 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5166 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005167 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005168
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005169 top_dir = os.path.normpath(
5170 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5171
Jamie Madill5e96ad12020-01-13 16:08:35 +00005172 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5173 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005174
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005175 # Similar code to above, but using yapf on .py files rather than clang-format
5176 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005177 py_explicitly_disabled = opts.python is not None and not opts.python
5178 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005179 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5180 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5181 if sys.platform.startswith('win'):
5182 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005183
Aiden Bennerc08566e2018-10-03 17:52:42 +00005184 # Used for caching.
5185 yapf_configs = {}
5186 for f in python_diff_files:
5187 # Find the yapf style config for the current file, defaults to depot
5188 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005189 _FindYapfConfigFile(f, yapf_configs, top_dir)
5190
5191 # Turn on python formatting by default if a yapf config is specified.
5192 # This breaks in the case of this repo though since the specified
5193 # style file is also the global default.
5194 if opts.python is None:
5195 filtered_py_files = []
5196 for f in python_diff_files:
5197 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5198 filtered_py_files.append(f)
5199 else:
5200 filtered_py_files = python_diff_files
5201
5202 # Note: yapf still seems to fix indentation of the entire file
5203 # even if line ranges are specified.
5204 # See https://github.com/google/yapf/issues/499
5205 if not opts.full and filtered_py_files:
5206 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5207
Brian Sheedyb4307d52019-12-02 19:18:17 +00005208 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5209 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5210 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005211
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005212 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005213 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5214 # Default to pep8 if not .style.yapf is found.
5215 if not yapf_style:
5216 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005217
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005218 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005219
5220 has_formattable_lines = False
5221 if not opts.full:
5222 # Only run yapf over changed line ranges.
5223 for diff_start, diff_len in py_line_diffs[f]:
5224 diff_end = diff_start + diff_len - 1
5225 # Yapf errors out if diff_end < diff_start but this
5226 # is a valid line range diff for a removal.
5227 if diff_end >= diff_start:
5228 has_formattable_lines = True
5229 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5230 # If all line diffs were removals we have nothing to format.
5231 if not has_formattable_lines:
5232 continue
5233
5234 if opts.diff or opts.dry_run:
5235 cmd += ['--diff']
5236 # Will return non-zero exit code if non-empty diff.
5237 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5238 if opts.diff:
5239 sys.stdout.write(stdout)
5240 elif len(stdout) > 0:
5241 return_value = 2
5242 else:
5243 cmd += ['-i']
5244 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005245
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005246 # Dart's formatter does not have the nice property of only operating on
5247 # modified chunks, so hard code full.
5248 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005249 try:
5250 command = [dart_format.FindDartFmtToolInChromiumTree()]
5251 if not opts.dry_run and not opts.diff:
5252 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005253 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005254
ppi@chromium.org6593d932016-03-03 15:41:15 +00005255 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005256 if opts.dry_run and stdout:
5257 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005258 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005259 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5260 'found in this checkout. Files in other languages are still '
5261 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005262
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005263 # Format GN build files. Always run on full build files for canonical form.
5264 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005265 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005266 if opts.dry_run or opts.diff:
5267 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005268 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005269 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5270 shell=sys.platform == 'win32',
5271 cwd=top_dir)
5272 if opts.dry_run and gn_ret == 2:
5273 return_value = 2 # Not formatted.
5274 elif opts.diff and gn_ret == 2:
5275 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005276 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005277 elif gn_ret != 0:
5278 # For non-dry run cases (and non-2 return values for dry-run), a
5279 # nonzero error code indicates a failure, probably because the file
5280 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005281 DieWithError('gn format failed on ' + gn_diff_file +
5282 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005283
Ilya Shermane081cbe2017-08-15 17:51:04 -07005284 # Skip the metrics formatting from the global presubmit hook. These files have
5285 # a separate presubmit hook that issues an error if the files need formatting,
5286 # whereas the top-level presubmit script merely issues a warning. Formatting
5287 # these files is somewhat slow, so it's important not to duplicate the work.
5288 if not opts.presubmit:
5289 for xml_dir in GetDirtyMetricsDirs(diff_files):
5290 tool_dir = os.path.join(top_dir, xml_dir)
5291 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5292 if opts.dry_run or opts.diff:
5293 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005294 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005295 if opts.diff:
5296 sys.stdout.write(stdout)
5297 if opts.dry_run and stdout:
5298 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005299
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005300 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005301
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005302
Steven Holte2e664bf2017-04-21 13:10:47 -07005303def GetDirtyMetricsDirs(diff_files):
5304 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5305 metrics_xml_dirs = [
5306 os.path.join('tools', 'metrics', 'actions'),
5307 os.path.join('tools', 'metrics', 'histograms'),
5308 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005309 os.path.join('tools', 'metrics', 'ukm'),
5310 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005311 for xml_dir in metrics_xml_dirs:
5312 if any(file.startswith(xml_dir) for file in xml_diff_files):
5313 yield xml_dir
5314
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005315
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005316@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005317@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005318def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005319 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005320 _, args = parser.parse_args(args)
5321
5322 if len(args) != 1:
5323 parser.print_help()
5324 return 1
5325
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005326 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005327 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005328 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005329
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005330 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005331
Edward Lemur52969c92020-02-06 18:15:28 +00005332 issueprefix = Changelist.IssueConfigKey()
5333 output = RunGit(['config', '--local', '--get-regexp',
5334 r'branch\..*\.%s' % issueprefix],
5335 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005336
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005337 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005338 for key, issue in [x.split() for x in output.splitlines()]:
5339 if issue == target_issue:
5340 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5341
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005342 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005343 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005344 return 1
5345 if len(branches) == 1:
5346 RunGit(['checkout', branches[0]])
5347 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005348 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005349 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005350 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005351 which = raw_input('Choose by index: ')
5352 try:
5353 RunGit(['checkout', branches[int(which)]])
5354 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005355 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005356 return 1
5357
5358 return 0
5359
5360
maruel@chromium.org29404b52014-09-08 22:58:00 +00005361def CMDlol(parser, args):
5362 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005363 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005364 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5365 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5366 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005367 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005368 return 0
5369
5370
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005371class OptionParser(optparse.OptionParser):
5372 """Creates the option parse and add --verbose support."""
5373 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005374 optparse.OptionParser.__init__(
5375 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005376 self.add_option(
5377 '-v', '--verbose', action='count', default=0,
5378 help='Use 2 times for more debugging info')
5379
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005380 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005381 try:
5382 return self._parse_args(args)
5383 finally:
5384 # Regardless of success or failure of args parsing, we want to report
5385 # metrics, but only after logging has been initialized (if parsing
5386 # succeeded).
5387 global settings
5388 settings = Settings()
5389
5390 if not metrics.DISABLE_METRICS_COLLECTION:
5391 # GetViewVCUrl ultimately calls logging method.
5392 project_url = settings.GetViewVCUrl().strip('/+')
5393 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5394 metrics.collector.add('project_urls', [project_url])
5395
5396 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005397 # Create an optparse.Values object that will store only the actual passed
5398 # options, without the defaults.
5399 actual_options = optparse.Values()
5400 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5401 # Create an optparse.Values object with the default options.
5402 options = optparse.Values(self.get_default_values().__dict__)
5403 # Update it with the options passed by the user.
5404 options._update_careful(actual_options.__dict__)
5405 # Store the options passed by the user in an _actual_options attribute.
5406 # We store only the keys, and not the values, since the values can contain
5407 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005408 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005409
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005410 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005411 logging.basicConfig(
5412 level=levels[min(options.verbose, len(levels) - 1)],
5413 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5414 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005415
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005416 return options, args
5417
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005418
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005419def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005420 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005421 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005422 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005423 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005424
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005425 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005426 dispatcher = subcommand.CommandDispatcher(__name__)
5427 try:
5428 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005429 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005430 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005431 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005432 if e.code != 500:
5433 raise
5434 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005435 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005436 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005437 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005438
5439
5440if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005441 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5442 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005443 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005444 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005445 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005446 sys.exit(main(sys.argv[1:]))