blob: 78ca488ee0f898e260728aaab4746bf08c878539 [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
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010016import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000017import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000018import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010019import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000020import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000022import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000023import optparse
24import os
25import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010026import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000027import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070029import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000031import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000032import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000033import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000034import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000035
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000036from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000037import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000038import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000039import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000040import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000041import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000042import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000043import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000044import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000045import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000046import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000047import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000048import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000049import presubmit_support
50import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000055import watchlists
56
Edward Lemur79d4f992019-11-11 23:49:02 +000057from third_party import six
58from six.moves import urllib
59
60
61if sys.version_info.major == 3:
62 basestring = (str,) # pylint: disable=redefined-builtin
63
Edward Lemurb9830242019-10-30 22:19:20 +000064
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
Edward Lemur0f58ae42019-04-30 17:24:12 +000067# Traces for git push will be stored in a traces directory inside the
68# depot_tools checkout.
69DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
70TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
71
72# When collecting traces, Git hashes will be reduced to 6 characters to reduce
73# the size after compression.
74GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
75# Used to redact the cookies from the gitcookies file.
76GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
77
Edward Lemurd4d1ba42019-09-20 21:46:37 +000078MAX_ATTEMPTS = 3
79
Edward Lemur1b52d872019-05-09 21:12:12 +000080# The maximum number of traces we will keep. Multiplied by 3 since we store
81# 3 files per trace.
82MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000083# Message to be displayed to the user to inform where to find the traces for a
84# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000085TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000086'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000088' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'Copies of your gitcookies file and git config have been recorded at:\n'
90' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000091# Format of the message to be stored as part of the traces to give developers a
92# better context when they go through traces.
93TRACES_README_FORMAT = (
94'Date: %(now)s\n'
95'\n'
96'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
97'Title: %(title)s\n'
98'\n'
99'%(description)s\n'
100'\n'
101'Execution time: %(execution_time)s\n'
102'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000103
tandrii9d2c7a32016-06-22 03:42:45 -0700104COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
thestig@chromium.org44202a22014-03-11 19:22:18 +0000112# Valid extensions for files we want to lint.
113DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
114DEFAULT_LINT_IGNORE_REGEX = r"$^"
115
Aiden Bennerc08566e2018-10-03 17:52:42 +0000116# File name for yapf style config files.
117YAPF_CONFIG_FILENAME = '.style.yapf'
118
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000119# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000120Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000121
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000122# Initialized in main()
123settings = None
124
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100125# Used by tests/git_cl_test.py to add extra logging.
126# Inside the weirdly failing test, add this:
127# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700128# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100129_IS_BEING_TESTED = False
130
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000131
Christopher Lamf732cd52017-01-24 12:40:11 +1100132def DieWithError(message, change_desc=None):
133 if change_desc:
134 SaveDescriptionBackup(change_desc)
135
vapiera7fbd5a2016-06-16 09:17:49 -0700136 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000137 sys.exit(1)
138
139
Christopher Lamf732cd52017-01-24 12:40:11 +1100140def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000141 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000142 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000143 with open(backup_path, 'w') as backup_file:
144 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100145
146
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000147def GetNoGitPagerEnv():
148 env = os.environ.copy()
149 # 'cat' is a magical git string that disables pagers on all platforms.
150 env['GIT_PAGER'] = 'cat'
151 return env
152
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000153
bsep@chromium.org627d9002016-04-29 00:00:52 +0000154def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000155 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000156 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
157 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000158 except subprocess2.CalledProcessError as e:
159 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000160 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000161 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000162 'Command "%s" failed.\n%s' % (
163 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000164 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165
166
167def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000168 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000169 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000170
171
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000172def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000173 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700174 if suppress_stderr:
175 stderr = subprocess2.VOID
176 else:
177 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000178 try:
tandrii5d48c322016-08-18 16:19:37 -0700179 (out, _), code = subprocess2.communicate(['git'] + args,
180 env=GetNoGitPagerEnv(),
181 stdout=subprocess2.PIPE,
182 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000183 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700184 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900185 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000186 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000187
188
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000189def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000190 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000191 return RunGitWithCode(args, suppress_stderr=True)[1]
192
193
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000194def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000195 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000196 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000197 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000198 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000199
200
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000201def BranchExists(branch):
202 """Return True if specified branch exists."""
203 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
204 suppress_stderr=True)
205 return not code
206
207
tandrii2a16b952016-10-19 07:09:44 -0700208def time_sleep(seconds):
209 # Use this so that it can be mocked in tests without interfering with python
210 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700211 return time.sleep(seconds)
212
213
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000214def time_time():
215 # Use this so that it can be mocked in tests without interfering with python
216 # system machinery.
217 return time.time()
218
219
Edward Lemur1b52d872019-05-09 21:12:12 +0000220def datetime_now():
221 # Use this so that it can be mocked in tests without interfering with python
222 # system machinery.
223 return datetime.datetime.now()
224
225
maruel@chromium.org90541732011-04-01 17:54:18 +0000226def ask_for_data(prompt):
227 try:
228 return raw_input(prompt)
229 except KeyboardInterrupt:
230 # Hide the exception.
231 sys.exit(1)
232
233
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100234def confirm_or_exit(prefix='', action='confirm'):
235 """Asks user to press enter to continue or press Ctrl+C to abort."""
236 if not prefix or prefix.endswith('\n'):
237 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100238 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100239 mid = ' Press'
240 elif prefix.endswith(' '):
241 mid = 'press'
242 else:
243 mid = ' press'
244 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
245
246
247def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000248 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100249 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
250 while True:
251 if 'yes'.startswith(result):
252 return True
253 if 'no'.startswith(result):
254 return False
255 result = ask_for_data('Please, type yes or no: ').lower()
256
257
tandrii5d48c322016-08-18 16:19:37 -0700258def _git_branch_config_key(branch, key):
259 """Helper method to return Git config key for a branch."""
260 assert branch, 'branch name is required to set git config for it'
261 return 'branch.%s.%s' % (branch, key)
262
263
264def _git_get_branch_config_value(key, default=None, value_type=str,
265 branch=False):
266 """Returns git config value of given or current branch if any.
267
268 Returns default in all other cases.
269 """
270 assert value_type in (int, str, bool)
271 if branch is False: # Distinguishing default arg value from None.
272 branch = GetCurrentBranch()
273
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000274 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700275 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000276
tandrii5d48c322016-08-18 16:19:37 -0700277 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700278 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700279 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000280 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700281 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700282 args.append(_git_branch_config_key(branch, key))
283 code, out = RunGitWithCode(args)
284 if code == 0:
285 value = out.strip()
286 if value_type == int:
287 return int(value)
288 if value_type == bool:
289 return bool(value.lower() == 'true')
290 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000291 return default
292
293
tandrii5d48c322016-08-18 16:19:37 -0700294def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000295 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700296
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000297 If value is None, the key will be unset, otherwise it will be set.
298 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700299 """
300 if not branch:
301 branch = GetCurrentBranch()
302 assert branch, 'a branch name OR currently checked out branch is required'
303 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700304 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700305 if value is None:
306 args.append('--unset')
307 elif isinstance(value, bool):
308 args.append('--bool')
309 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700310 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000311 # `git config` also has --int, but apparently git config suffers from
312 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700313 value = str(value)
314 args.append(_git_branch_config_key(branch, key))
315 if value is not None:
316 args.append(value)
317 RunGit(args, **kwargs)
318
319
machenbach@chromium.org45453142015-09-15 08:45:22 +0000320def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000321 prop_list = getattr(options, 'properties', [])
322 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000323 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000324 try:
325 properties[key] = json.loads(val)
326 except ValueError:
327 pass # If a value couldn't be evaluated, treat it as a string.
328 return properties
329
330
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000331# TODO(crbug.com/976104): Remove this function once git-cl try-results has
332# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000333def _buildbucket_retry(operation_name, http, *args, **kwargs):
334 """Retries requests to buildbucket service and returns parsed json content."""
335 try_count = 0
336 while True:
337 response, content = http.request(*args, **kwargs)
338 try:
339 content_json = json.loads(content)
340 except ValueError:
341 content_json = None
342
343 # Buildbucket could return an error even if status==200.
344 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000345 error = content_json.get('error')
346 if error.get('code') == 403:
347 raise BuildbucketResponseException(
348 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000349 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000350 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000351 raise BuildbucketResponseException(msg)
352
353 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700354 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000355 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000356 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700357 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000358 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000359 content)
360 return content_json
361 if response.status < 500 or try_count >= 2:
362 raise httplib2.HttpLib2Error(content)
363
364 # status >= 500 means transient failures.
365 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000366 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000367 try_count += 1
368 assert False, 'unreachable'
369
370
Edward Lemur4c707a22019-09-24 21:13:43 +0000371def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000372 """Calls a buildbucket v2 method and returns the parsed json response."""
373 headers = {
374 'Accept': 'application/json',
375 'Content-Type': 'application/json',
376 }
377 request = json.dumps(request)
378 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
379
380 logging.info('POST %s with %s' % (url, request))
381
382 attempts = 1
383 time_to_sleep = 1
384 while True:
385 response, content = http.request(url, 'POST', body=request, headers=headers)
386 if response.status == 200:
387 return json.loads(content[4:])
388 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
389 msg = '%s error when calling POST %s with %s: %s' % (
390 response.status, url, request, content)
391 raise BuildbucketResponseException(msg)
392 logging.debug(
393 '%s error when calling POST %s with %s. '
394 'Sleeping for %d seconds and retrying...' % (
395 response.status, url, request, time_to_sleep))
396 time.sleep(time_to_sleep)
397 time_to_sleep *= 2
398 attempts += 1
399
400 assert False, 'unreachable'
401
402
qyearsley1fdfcb62016-10-24 13:22:03 -0700403def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700404 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000405 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700406 """
qyearsleydd49f942016-10-28 11:57:22 -0700407 # If no bots are listed, we try to get a set of builders and tests based
408 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700409 if not options.bot:
Edward Lemur3b8094a2020-02-07 22:34:43 +0000410 change = changelist.GetChange(changelist.GetCommonAncestorWithUpstream())
qyearsley136b49f2016-10-31 09:02:26 -0700411 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700412 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700413 change=change,
414 changed_files=change.LocalPaths(),
415 repository_root=settings.GetRoot(),
416 default_presubmit=None,
417 project=None,
418 verbose=options.verbose,
419 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700420 if masters is None:
421 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000422 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700423
qyearsley1fdfcb62016-10-24 13:22:03 -0700424 if options.bucket:
425 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000426 option_parser.error(
Edward Lemur5ef16a32019-11-11 21:13:25 +0000427 'Please specify the bucket, e.g. "-B chromium/try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700428
429
Edward Lemur6215c792019-10-03 21:59:05 +0000430def _parse_bucket(raw_bucket):
431 legacy = True
432 project = bucket = None
433 if '/' in raw_bucket:
434 legacy = False
435 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000436 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000437 elif raw_bucket.startswith('luci.'):
438 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000439 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000440 elif '.' in raw_bucket:
441 project = raw_bucket.split('.')[0]
442 bucket = raw_bucket
443 # Legacy buckets.
444 if legacy:
445 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
446 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000447
448
Edward Lemur5b929a42019-10-21 17:57:39 +0000449def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000450 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700451
452 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000453 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700454 buckets: A nested dict mapping bucket names to builders to tests.
455 options: Command-line options.
456 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000457 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000458 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000459 print('Bucket:', bucket)
460 print('\n'.join(
461 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000462 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000463 print('To see results here, run: git cl try-results')
464 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700465
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000466 requests = _make_try_job_schedule_requests(
467 changelist, buckets, options, patchset)
468 if not requests:
469 return
470
Edward Lemur5b929a42019-10-21 17:57:39 +0000471 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000472 http.force_exception_to_status_code = True
473
474 batch_request = {'requests': requests}
475 batch_response = _call_buildbucket(
476 http, options.buildbucket_host, 'Batch', batch_request)
477
478 errors = [
479 ' ' + response['error']['message']
480 for response in batch_response.get('responses', [])
481 if 'error' in response
482 ]
483 if errors:
484 raise BuildbucketResponseException(
485 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
486
487
488def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000489 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000490 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000491 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000492 shared_properties['clobber'] = True
493 shared_properties.update(_get_properties_from_options(options) or {})
494
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000495 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
496 if options.retry_failed:
497 shared_tags.append({'key': 'retry_failed',
498 'value': '1'})
499
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000500 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000501 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000502 project, bucket = _parse_bucket(raw_bucket)
503 if not project or not bucket:
504 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
505 continue
506
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000507 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000508 properties = shared_properties.copy()
509 if 'presubmit' in builder.lower():
510 properties['dry_run'] = 'true'
511 if tests:
512 properties['testfilter'] = tests
513
514 requests.append({
515 'scheduleBuild': {
516 'requestId': str(uuid.uuid4()),
517 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000518 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000519 'bucket': bucket,
520 'builder': builder,
521 },
522 'gerritChanges': gerrit_changes,
523 'properties': properties,
524 'tags': [
525 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000526 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000527 }
528 })
Anthony Polito1a5fe232020-01-24 23:17:52 +0000529
530 if options.revision:
531 requests[-1]['scheduleBuild']['gitilesCommit'] = {
532 'host': gerrit_changes[0]['host'],
533 'project': gerrit_changes[0]['project'],
534 'id': options.revision
535 }
536
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000537 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000538
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000539
Edward Lemur5b929a42019-10-21 17:57:39 +0000540def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000541 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000542
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000543 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000545 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000546 request = {
547 'predicate': {
548 'gerritChanges': [changelist.GetGerritChange(patchset)],
549 },
550 'fields': ','.join('builds.*.' + field for field in fields),
551 }
tandrii221ab252016-10-06 08:12:04 -0700552
Edward Lemur5b929a42019-10-21 17:57:39 +0000553 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554 if authenticator.has_cached_credentials():
555 http = authenticator.authorize(httplib2.Http())
556 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700557 print('Warning: Some results might be missing because %s' %
558 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000559 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000561 http.force_exception_to_status_code = True
562
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000563 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
564 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565
Edward Lemur5b929a42019-10-21 17:57:39 +0000566def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000567 """Fetches builds from the latest patchset that has builds (within
568 the last few patchsets).
569
570 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000571 changelist (Changelist): The CL to fetch builds for
572 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000573 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
574 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000575 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000576 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
577 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000578 """
579 assert buildbucket_host
580 assert changelist.GetIssue(), 'CL must be uploaded first'
581 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000582 if latest_patchset is None:
583 assert changelist.GetMostRecentPatchset()
584 ps = changelist.GetMostRecentPatchset()
585 else:
586 assert latest_patchset > 0, latest_patchset
587 ps = latest_patchset
588
Quinten Yearsley983111f2019-09-26 17:18:48 +0000589 min_ps = max(1, ps - 5)
590 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000591 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000592 if len(builds):
593 return builds, ps
594 ps -= 1
595 return [], 0
596
597
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000598def _filter_failed_for_retry(all_builds):
599 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000600
601 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000602 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000603 i.e. a list of buildbucket.v2.Builds which includes status and builder
604 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000605
606 Returns:
607 A dict of bucket to builder to tests (empty list). This is the same format
608 accepted by _trigger_try_jobs and returned by _get_bucket_map.
609 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000610
611 def _builder_of(build):
612 builder = build['builder']
613 return (builder['project'], builder['bucket'], builder['builder'])
614
615 res = collections.defaultdict(dict)
616 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
617 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
618 # If builder had several builds, retry only if the last one failed.
619 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
620 # build, but in case of retrying failed jobs retrying a flaky one makes
621 # sense.
622 builds = list(builds)
623 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
624 continue
625 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
626 for t in builds[-1]['tags']):
627 # Don't retry experimental build previously triggered by CQ.
628 continue
629 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
630 # Don't retry if any are running.
631 continue
632 res[proj + '/' + buck][bldr] = []
633 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000634
635
qyearsleyeab3c042016-08-24 09:18:28 -0700636def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000637 """Prints nicely result of fetch_try_jobs."""
638 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000639 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000640 return
641
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000642 longest_builder = max(len(b['builder']['builder']) for b in builds)
643 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000644 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000645 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
646 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000647
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000648 builds_by_status = {}
649 for b in builds:
650 builds_by_status.setdefault(b['status'], []).append({
651 'id': b['id'],
652 'name': name_fmt.format(
653 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
654 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000655
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000656 sort_key = lambda b: (b['name'], b['id'])
657
658 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000659 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000660 if not builds:
661 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000662
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000663 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000664 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000665 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000666 else:
667 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
668
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000669 print(colorize(title))
670 for b in sorted(builds, key=sort_key):
671 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000672
673 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000674 print_builds(
675 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
676 print_builds(
677 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
678 color=Fore.MAGENTA)
679 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
680 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
681 color=Fore.MAGENTA)
682 print_builds('Started:', builds_by_status.pop('STARTED', []))
683 print_builds(
684 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000685 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000686 print_builds(
687 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000688 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000689
690
Aiden Bennerc08566e2018-10-03 17:52:42 +0000691def _ComputeDiffLineRanges(files, upstream_commit):
692 """Gets the changed line ranges for each file since upstream_commit.
693
694 Parses a git diff on provided files and returns a dict that maps a file name
695 to an ordered list of range tuples in the form (start_line, count).
696 Ranges are in the same format as a git diff.
697 """
698 # If files is empty then diff_output will be a full diff.
699 if len(files) == 0:
700 return {}
701
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000702 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000703 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000704 diff_output = RunGit(diff_cmd)
705
706 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
707 # 2 capture groups
708 # 0 == fname of diff file
709 # 1 == 'diff_start,diff_count' or 'diff_start'
710 # will match each of
711 # diff --git a/foo.foo b/foo.py
712 # @@ -12,2 +14,3 @@
713 # @@ -12,2 +17 @@
714 # running re.findall on the above string with pattern will give
715 # [('foo.py', ''), ('', '14,3'), ('', '17')]
716
717 curr_file = None
718 line_diffs = {}
719 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
720 if match[0] != '':
721 # Will match the second filename in diff --git a/a.py b/b.py.
722 curr_file = match[0]
723 line_diffs[curr_file] = []
724 else:
725 # Matches +14,3
726 if ',' in match[1]:
727 diff_start, diff_count = match[1].split(',')
728 else:
729 # Single line changes are of the form +12 instead of +12,1.
730 diff_start = match[1]
731 diff_count = 1
732
733 diff_start = int(diff_start)
734 diff_count = int(diff_count)
735
736 # If diff_count == 0 this is a removal we can ignore.
737 line_diffs[curr_file].append((diff_start, diff_count))
738
739 return line_diffs
740
741
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000742def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000743 """Checks if a yapf file is in any parent directory of fpath until top_dir.
744
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000745 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000746 is found returns None. Uses yapf_config_cache as a cache for previously found
747 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000748 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000749 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000750 # Return result if we've already computed it.
751 if fpath in yapf_config_cache:
752 return yapf_config_cache[fpath]
753
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000754 parent_dir = os.path.dirname(fpath)
755 if os.path.isfile(fpath):
756 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000757 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000758 # Otherwise fpath is a directory
759 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
760 if os.path.isfile(yapf_file):
761 ret = yapf_file
762 elif fpath == top_dir or parent_dir == fpath:
763 # If we're at the top level directory, or if we're at root
764 # there is no provided style.
765 ret = None
766 else:
767 # Otherwise recurse on the current directory.
768 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000769 yapf_config_cache[fpath] = ret
770 return ret
771
772
Brian Sheedyb4307d52019-12-02 19:18:17 +0000773def _GetYapfIgnorePatterns(top_dir):
774 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000775
776 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
777 but this functionality appears to break when explicitly passing files to
778 yapf for formatting. According to
779 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
780 the .yapfignore file should be in the directory that yapf is invoked from,
781 which we assume to be the top level directory in this case.
782
783 Args:
784 top_dir: The top level directory for the repository being formatted.
785
786 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000787 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000788 """
789 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000790 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000791 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000792 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000793
Brian Sheedyb4307d52019-12-02 19:18:17 +0000794 with open(yapfignore_file) as f:
795 for line in f.readlines():
796 stripped_line = line.strip()
797 # Comments and blank lines should be ignored.
798 if stripped_line.startswith('#') or stripped_line == '':
799 continue
800 ignore_patterns.add(stripped_line)
801 return ignore_patterns
802
803
804def _FilterYapfIgnoredFiles(filepaths, patterns):
805 """Filters out any filepaths that match any of the given patterns.
806
807 Args:
808 filepaths: An iterable of strings containing filepaths to filter.
809 patterns: An iterable of strings containing fnmatch patterns to filter on.
810
811 Returns:
812 A list of strings containing all the elements of |filepaths| that did not
813 match any of the patterns in |patterns|.
814 """
815 # Not inlined so that tests can use the same implementation.
816 return [f for f in filepaths
817 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000818
819
Aaron Gable13101a62018-02-09 13:20:41 -0800820def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000821 """Prints statistics about the change to the user."""
822 # --no-ext-diff is broken in some versions of Git, so try to work around
823 # this by overriding the environment (but there is still a problem if the
824 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000825 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000826 if 'GIT_EXTERNAL_DIFF' in env:
827 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000828
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000829 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800830 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000831 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000832
833
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000834class BuildbucketResponseException(Exception):
835 pass
836
837
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000838class Settings(object):
839 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000840 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000841 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000842 self.tree_status_url = None
843 self.viewvc_url = None
844 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000845 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000846 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000847 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000848 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000849 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000850
851 def LazyUpdateIfNeeded(self):
852 """Updates the settings from a codereview.settings file, if available."""
853 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000854 # The only value that actually changes the behavior is
855 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000856 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000857 error_ok=True
858 ).strip().lower()
859
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000860 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000861 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000862 LoadCodereviewSettingsFromFile(cr_settings_file)
Josip906bfde2020-01-31 22:38:49 +0000863 cr_settings_file.close()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000864 self.updated = True
865
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000866 @staticmethod
867 def GetRelativeRoot():
868 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000869
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000870 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000871 if self.root is None:
872 self.root = os.path.abspath(self.GetRelativeRoot())
873 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000874
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000875 def GetTreeStatusUrl(self, error_ok=False):
876 if not self.tree_status_url:
877 error_message = ('You must configure your tree status URL by running '
878 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000879 self.tree_status_url = self._GetConfig(
880 'rietveld.tree-status-url', error_ok=error_ok,
881 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000882 return self.tree_status_url
883
884 def GetViewVCUrl(self):
885 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000886 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000887 return self.viewvc_url
888
rmistry@google.com90752582014-01-14 21:04:50 +0000889 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000890 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000891
rmistry@google.com5626a922015-02-26 14:03:30 +0000892 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000893 run_post_upload_hook = self._GetConfig(
894 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000895 return run_post_upload_hook == "True"
896
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000897 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000898 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000899
ukai@chromium.orge8077812012-02-03 03:41:46 +0000900 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000901 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000902 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700903 self.is_gerrit = (
904 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000905 return self.is_gerrit
906
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000907 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000908 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000909 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700910 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
911 if self.squash_gerrit_uploads is None:
912 # Default is squash now (http://crbug.com/611892#c23).
913 self.squash_gerrit_uploads = not (
914 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
915 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000916 return self.squash_gerrit_uploads
917
tandriia60502f2016-06-20 02:01:53 -0700918 def GetSquashGerritUploadsOverride(self):
919 """Return True or False if codereview.settings should be overridden.
920
921 Returns None if no override has been defined.
922 """
923 # See also http://crbug.com/611892#c23
924 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
925 error_ok=True).strip()
926 if result == 'true':
927 return True
928 if result == 'false':
929 return False
930 return None
931
tandrii@chromium.org28253532016-04-14 13:46:56 +0000932 def GetGerritSkipEnsureAuthenticated(self):
933 """Return True if EnsureAuthenticated should not be done for Gerrit
934 uploads."""
935 if self.gerrit_skip_ensure_authenticated is None:
936 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000937 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000938 error_ok=True).strip() == 'true')
939 return self.gerrit_skip_ensure_authenticated
940
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000941 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000942 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000943 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000944 # Git requires single quotes for paths with spaces. We need to replace
945 # them with double quotes for Windows to treat such paths as a single
946 # path.
947 self.git_editor = self._GetConfig(
948 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000949 return self.git_editor or None
950
thestig@chromium.org44202a22014-03-11 19:22:18 +0000951 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000952 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000953 DEFAULT_LINT_REGEX)
954
955 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000956 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000957 DEFAULT_LINT_IGNORE_REGEX)
958
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000959 def GetFormatFullByDefault(self):
960 if self.format_full_by_default is None:
961 result = (
962 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
963 error_ok=True).strip())
964 self.format_full_by_default = (result == 'true')
965 return self.format_full_by_default
966
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000967 def _GetConfig(self, param, **kwargs):
968 self.LazyUpdateIfNeeded()
969 return RunGit(['config', param], **kwargs).strip()
970
971
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000972def ShortBranchName(branch):
973 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000974 return branch.replace('refs/heads/', '', 1)
975
976
977def GetCurrentBranchRef():
978 """Returns branch ref (e.g., refs/heads/master) or None."""
979 return RunGit(['symbolic-ref', 'HEAD'],
980 stderr=subprocess2.VOID, error_ok=True).strip() or None
981
982
983def GetCurrentBranch():
984 """Returns current branch or None.
985
986 For refs/heads/* branches, returns just last part. For others, full ref.
987 """
988 branchref = GetCurrentBranchRef()
989 if branchref:
990 return ShortBranchName(branchref)
991 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000992
993
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000994class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000995 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000996 NONE = 'none'
997 DRY_RUN = 'dry_run'
998 COMMIT = 'commit'
999
1000 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1001
1002
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001003class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +00001004 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001005 self.issue = issue
1006 self.patchset = patchset
1007 self.hostname = hostname
1008
1009 @property
1010 def valid(self):
1011 return self.issue is not None
1012
1013
Edward Lemurf38bc172019-09-03 21:02:13 +00001014def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001015 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1016 fail_result = _ParsedIssueNumberArgument()
1017
Edward Lemur678a6842019-10-03 22:25:05 +00001018 if isinstance(arg, int):
1019 return _ParsedIssueNumberArgument(issue=arg)
1020 if not isinstance(arg, basestring):
1021 return fail_result
1022
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001023 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001024 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001025 if not arg.startswith('http'):
1026 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001027
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001028 url = gclient_utils.UpgradeToHttps(arg)
1029 try:
Edward Lemur79d4f992019-11-11 23:49:02 +00001030 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001031 except ValueError:
1032 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001033
Edward Lemur678a6842019-10-03 22:25:05 +00001034 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1035 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1036 # Short urls like https://domain/<issue_number> can be used, but don't allow
1037 # specifying the patchset (you'd 404), but we allow that here.
1038 if parsed_url.path == '/':
1039 part = parsed_url.fragment
1040 else:
1041 part = parsed_url.path
1042
1043 match = re.match(
1044 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1045 if not match:
1046 return fail_result
1047
1048 issue = int(match.group('issue'))
1049 patchset = match.group('patchset')
1050 return _ParsedIssueNumberArgument(
1051 issue=issue,
1052 patchset=int(patchset) if patchset else None,
1053 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001054
1055
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001056def _create_description_from_log(args):
1057 """Pulls out the commit log to use as a base for the CL description."""
1058 log_args = []
1059 if len(args) == 1 and not args[0].endswith('.'):
1060 log_args = [args[0] + '..']
1061 elif len(args) == 1 and args[0].endswith('...'):
1062 log_args = [args[0][:-1]]
1063 elif len(args) == 2:
1064 log_args = [args[0] + '..' + args[1]]
1065 else:
1066 log_args = args[:] # Hope for the best!
1067 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1068
1069
Aaron Gablea45ee112016-11-22 15:14:38 -08001070class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001071 def __init__(self, issue, url):
1072 self.issue = issue
1073 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001074 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001075
1076 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001077 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001078 self.issue, self.url)
1079
1080
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001081_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001082 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001083 # TODO(tandrii): these two aren't known in Gerrit.
1084 'approval', 'disapproval'])
1085
1086
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001087class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001088 """Changelist works with one changelist in local branch.
1089
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001090 Notes:
1091 * Not safe for concurrent multi-{thread,process} use.
1092 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001093 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001094 """
1095
Edward Lemur125d60a2019-09-13 18:25:41 +00001096 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001097 """Create a new ChangeList instance.
1098
Edward Lemurf38bc172019-09-03 21:02:13 +00001099 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001100 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001101 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001102 global settings
1103 if not settings:
1104 # Happens when git_cl.py is used as a utility library.
1105 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001106
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001107 self.branchref = branchref
1108 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001109 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001110 self.branch = ShortBranchName(self.branchref)
1111 else:
1112 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001113 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001114 self.lookedup_issue = False
1115 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 self.has_description = False
1117 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001118 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001119 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001120 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001121 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001122 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001123 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001124
Edward Lemur125d60a2019-09-13 18:25:41 +00001125 # Lazily cached values.
1126 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1127 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1128 # Map from change number (issue) to its detail cache.
1129 self._detail_cache = {}
1130
1131 if codereview_host is not None:
1132 assert not codereview_host.startswith('https://'), codereview_host
1133 self._gerrit_host = codereview_host
1134 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001135
1136 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001137 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001138
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001139 The return value is a string suitable for passing to git cl with the --cc
1140 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001141 """
1142 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001143 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001144 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001145 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1146 return self.cc
1147
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001148 def GetCCListWithoutDefault(self):
1149 """Return the users cc'd on this CL excluding default ones."""
1150 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001151 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001152 return self.cc
1153
Daniel Cheng7227d212017-11-17 08:12:37 -08001154 def ExtendCC(self, more_cc):
1155 """Extends the list of users to cc on this CL based on the changed files."""
1156 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001157
1158 def GetBranch(self):
1159 """Returns the short branch name, e.g. 'master'."""
1160 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001161 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001162 if not branchref:
1163 return None
1164 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001165 self.branch = ShortBranchName(self.branchref)
1166 return self.branch
1167
1168 def GetBranchRef(self):
1169 """Returns the full branch name, e.g. 'refs/heads/master'."""
1170 self.GetBranch() # Poke the lazy loader.
1171 return self.branchref
1172
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001173 def ClearBranch(self):
1174 """Clears cached branch data of this object."""
1175 self.branch = self.branchref = None
1176
tandrii5d48c322016-08-18 16:19:37 -07001177 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1178 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1179 kwargs['branch'] = self.GetBranch()
1180 return _git_get_branch_config_value(key, default, **kwargs)
1181
1182 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1183 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1184 assert self.GetBranch(), (
1185 'this CL must have an associated branch to %sset %s%s' %
1186 ('un' if value is None else '',
1187 key,
1188 '' if value is None else ' to %r' % value))
1189 kwargs['branch'] = self.GetBranch()
1190 return _git_set_branch_config_value(key, value, **kwargs)
1191
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001192 @staticmethod
1193 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001194 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001195 e.g. 'origin', 'refs/heads/master'
1196 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001197 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1198 settings.GetRoot(), branch)
1199 if not remote or not upstream_branch:
1200 DieWithError(
1201 'Unable to determine default branch to diff against.\n'
1202 'Either pass complete "git diff"-style arguments, like\n'
1203 ' git cl upload origin/master\n'
1204 'or verify this branch is set up to track another \n'
1205 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001206
1207 return remote, upstream_branch
1208
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001209 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001210 upstream_branch = self.GetUpstreamBranch()
1211 if not BranchExists(upstream_branch):
1212 DieWithError('The upstream for the current branch (%s) does not exist '
1213 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001214 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001215 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001216
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001217 def GetUpstreamBranch(self):
1218 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001219 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001220 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001221 upstream_branch = upstream_branch.replace('refs/heads/',
1222 'refs/remotes/%s/' % remote)
1223 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1224 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001225 self.upstream_branch = upstream_branch
1226 return self.upstream_branch
1227
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001228 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001229 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001230 remote, branch = None, self.GetBranch()
1231 seen_branches = set()
1232 while branch not in seen_branches:
1233 seen_branches.add(branch)
1234 remote, branch = self.FetchUpstreamTuple(branch)
1235 branch = ShortBranchName(branch)
1236 if remote != '.' or branch.startswith('refs/remotes'):
1237 break
1238 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001239 remotes = RunGit(['remote'], error_ok=True).split()
1240 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001241 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001242 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001243 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001244 logging.warn('Could not determine which remote this change is '
1245 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001246 else:
1247 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001248 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001249 branch = 'HEAD'
1250 if branch.startswith('refs/remotes'):
1251 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001252 elif branch.startswith('refs/branch-heads/'):
1253 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001254 else:
1255 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001256 return self._remote
1257
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001258 def GitSanityChecks(self, upstream_git_obj):
1259 """Checks git repo status and ensures diff is from local commits."""
1260
sbc@chromium.org79706062015-01-14 21:18:12 +00001261 if upstream_git_obj is None:
1262 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001263 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001264 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001265 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001266 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001267 return False
1268
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001269 # Verify the commit we're diffing against is in our current branch.
1270 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1271 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1272 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001273 print('ERROR: %s is not in the current branch. You may need to rebase '
1274 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001275 return False
1276
1277 # List the commits inside the diff, and verify they are all local.
1278 commits_in_diff = RunGit(
1279 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1280 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1281 remote_branch = remote_branch.strip()
1282 if code != 0:
1283 _, remote_branch = self.GetRemoteBranch()
1284
1285 commits_in_remote = RunGit(
1286 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1287
1288 common_commits = set(commits_in_diff) & set(commits_in_remote)
1289 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001290 print('ERROR: Your diff contains %d commits already in %s.\n'
1291 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1292 'the diff. If you are using a custom git flow, you can override'
1293 ' the reference used for this check with "git config '
1294 'gitcl.remotebranch <git-ref>".' % (
1295 len(common_commits), remote_branch, upstream_git_obj),
1296 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001297 return False
1298 return True
1299
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001300 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001301 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001302
1303 Returns None if it is not set.
1304 """
tandrii5d48c322016-08-18 16:19:37 -07001305 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001306
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001307 def GetRemoteUrl(self):
1308 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1309
1310 Returns None if there is no remote.
1311 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001312 is_cached, value = self._cached_remote_url
1313 if is_cached:
1314 return value
1315
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001316 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001317 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1318
Edward Lemur298f2cf2019-02-22 21:40:39 +00001319 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001320 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001321 if host:
1322 self._cached_remote_url = (True, url)
1323 return url
1324
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001325 # If it cannot be parsed as an url, assume it is a local directory,
1326 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001327 logging.warning('"%s" doesn\'t appear to point to a git host. '
1328 'Interpreting it as a local directory.', url)
1329 if not os.path.isdir(url):
1330 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001331 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1332 'but it doesn\'t exist.',
1333 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001334 return None
1335
1336 cache_path = url
1337 url = RunGit(['config', 'remote.%s.url' % remote],
1338 error_ok=True,
1339 cwd=url).strip()
1340
Edward Lemur79d4f992019-11-11 23:49:02 +00001341 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001342 if not host:
1343 logging.error(
1344 'Remote "%(remote)s" for branch "%(branch)s" points to '
1345 '"%(cache_path)s", but it is misconfigured.\n'
1346 '"%(cache_path)s" must be a git repo and must have a remote named '
1347 '"%(remote)s" pointing to the git host.', {
1348 'remote': remote,
1349 'cache_path': cache_path,
1350 'branch': self.GetBranch()})
1351 return None
1352
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001353 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001354 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001355
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001356 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001357 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001358 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001359 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001360 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001361 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001362 return self.issue
1363
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001364 def GetIssueURL(self):
1365 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001366 issue = self.GetIssue()
1367 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001368 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001369 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001370
Edward Lemur7f6dec02020-02-06 20:23:58 +00001371 def GetLocalDescription(self, upstream_branch):
1372 """Return the log messages of all commits up to the branch point."""
1373 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1374 return RunGitWithCode(args)[1].strip()
1375
Edward Lemur6c6827c2020-02-06 21:15:18 +00001376 def FetchDescription(self, pretty=False):
1377 assert self.GetIssue(), 'issue is required to query Gerrit'
1378
1379 if not self.has_description:
1380 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1381 current_rev = data['current_revision']
1382 self.description = data['revisions'][current_rev]['commit']['message']
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001383 self.has_description = True
Edward Lemur6c6827c2020-02-06 21:15:18 +00001384
1385 if not pretty:
1386 return self.description
1387
1388 # Set width to 72 columns + 2 space indent.
1389 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1390 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1391 lines = self.description.splitlines()
1392 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001393
1394 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001395 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001396 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001397 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001398 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001399 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001400 return self.patchset
1401
1402 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001403 """Set this branch's patchset. If patchset=0, clears the patchset."""
1404 assert self.GetBranch()
1405 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001406 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001407 else:
1408 self.patchset = int(patchset)
1409 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001410 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001411
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001412 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001413 """Set this branch's issue. If issue isn't given, clears the issue."""
1414 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001416 issue = int(issue)
1417 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001418 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001419 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001420 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001421 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001422 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001423 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001424 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001425 else:
tandrii5d48c322016-08-18 16:19:37 -07001426 # Reset all of these just to be clean.
1427 reset_suffixes = [
1428 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001429 self.IssueConfigKey(),
1430 self.PatchsetConfigKey(),
1431 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001432 ] + self._PostUnsetIssueProperties()
1433 for prop in reset_suffixes:
1434 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001435 msg = RunGit(['log', '-1', '--format=%B']).strip()
1436 if msg and git_footers.get_footer_change_id(msg):
1437 print('WARNING: The change patched into this branch has a Change-Id. '
1438 'Removing it.')
1439 RunGit(['commit', '--amend', '-m',
1440 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001441 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001442 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001443 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001444
Edward Lemur7f6dec02020-02-06 20:23:58 +00001445 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001446 if not self.GitSanityChecks(upstream_branch):
1447 DieWithError('\nGit sanity check failure')
1448
Edward Lemur7f6dec02020-02-06 20:23:58 +00001449 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001450 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001451 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001452 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001453 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001454 except subprocess2.CalledProcessError:
1455 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001456 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001457 'This branch probably doesn\'t exist anymore. To reset the\n'
1458 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001459 ' git branch --set-upstream-to origin/master %s\n'
1460 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001461 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001462
maruel@chromium.org52424302012-08-29 15:14:30 +00001463 issue = self.GetIssue()
1464 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001465 if issue:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001466 description = self.FetchDescription()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001467 else:
1468 # If the change was never uploaded, use the log messages of all commits
1469 # up to the branch point, as git cl upload will prefill the description
1470 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001471 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001472
Edward Lemur7f6dec02020-02-06 20:23:58 +00001473 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001474 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001475 name,
1476 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001477 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001478 files,
1479 issue,
1480 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001481 author,
1482 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001483
dsansomee2d6fd92016-09-08 00:10:47 -07001484 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001485 assert self.GetIssue(), 'issue is required to update description'
1486
1487 if gerrit_util.HasPendingChangeEdit(
1488 self._GetGerritHost(), self._GerritChangeIdentifier()):
1489 if not force:
1490 confirm_or_exit(
1491 'The description cannot be modified while the issue has a pending '
1492 'unpublished edit. Either publish the edit in the Gerrit web UI '
1493 'or delete it.\n\n', action='delete the unpublished edit')
1494
1495 gerrit_util.DeletePendingChangeEdit(
1496 self._GetGerritHost(), self._GerritChangeIdentifier())
1497 gerrit_util.SetCommitMessage(
1498 self._GetGerritHost(), self._GerritChangeIdentifier(),
1499 description, notify='NONE')
1500
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001501 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001502 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001503
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001504
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001505
Edward Lesmes8e282792018-04-03 18:50:29 -04001506 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001507 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1508 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001509 start = time_time()
1510 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001511 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1512 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001513 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001514 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001515 metrics.collector.add_repeated('sub_commands', {
1516 'command': 'presubmit',
1517 'execution_time': time_time() - start,
1518 'exit_code': 0 if result.should_continue() else 1,
1519 })
1520 return result
vapierfd77ac72016-06-16 08:33:57 -07001521 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001522 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001523
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001524 def CMDUpload(self, options, git_diff_args, orig_args):
1525 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001526 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001527 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001528 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001529 else:
1530 if self.GetBranch() is None:
1531 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1532
1533 # Default to diffing against common ancestor of upstream branch
1534 base_branch = self.GetCommonAncestorWithUpstream()
1535 git_diff_args = [base_branch, 'HEAD']
1536
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001537 # Fast best-effort checks to abort before running potentially expensive
1538 # hooks if uploading is likely to fail anyway. Passing these checks does
1539 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001540 self.EnsureAuthenticated(force=options.force)
1541 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001542
1543 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001544 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001545 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1546 files = [f.LocalPath() for f in change.AffectedFiles()]
1547 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001548 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001549
1550 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001551 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001552 # Set the reviewer list now so that presubmit checks can access it.
1553 change_description = ChangeDescription(change.FullDescriptionText())
1554 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001555 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001556 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001557 change)
1558 change.SetDescriptionText(change_description.description)
1559 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001560 may_prompt=not options.force,
1561 verbose=options.verbose,
1562 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001563 if not hook_results.should_continue():
1564 return 1
1565 if not options.reviewers and hook_results.reviewers:
1566 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001567 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001568
Aaron Gable13101a62018-02-09 13:20:41 -08001569 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001570 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001571 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001572 _git_set_branch_config_value('last-upload-hash',
1573 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001574 # Run post upload hooks, if specified.
1575 if settings.GetRunPostUploadHook():
1576 presubmit_support.DoPostUploadExecuter(
1577 change,
Edward Lemur016a0872020-02-04 22:13:28 +00001578 self.GetGerritObjForPresubmit(),
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001579 settings.GetRoot(),
1580 options.verbose,
1581 sys.stdout)
1582
1583 # Upload all dependencies if specified.
1584 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001585 print()
1586 print('--dependencies has been specified.')
1587 print('All dependent local branches will be re-uploaded.')
1588 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001589 # Remove the dependencies flag from args so that we do not end up in a
1590 # loop.
1591 orig_args.remove('--dependencies')
1592 ret = upload_branch_deps(self, orig_args)
1593 return ret
1594
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001595 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001596 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001597
1598 Issue must have been already uploaded and known.
1599 """
1600 assert new_state in _CQState.ALL_STATES
1601 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001602 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001603 vote_map = {
1604 _CQState.NONE: 0,
1605 _CQState.DRY_RUN: 1,
1606 _CQState.COMMIT: 2,
1607 }
1608 labels = {'Commit-Queue': vote_map[new_state]}
1609 notify = False if new_state == _CQState.DRY_RUN else None
1610 gerrit_util.SetReview(
1611 self._GetGerritHost(), self._GerritChangeIdentifier(),
1612 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001613 return 0
1614 except KeyboardInterrupt:
1615 raise
1616 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001617 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001618 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001619 ' * Your project has no CQ,\n'
1620 ' * You don\'t have permission to change the CQ state,\n'
1621 ' * There\'s a bug in this code (see stack trace below).\n'
1622 'Consider specifying which bots to trigger manually or asking your '
1623 'project owners for permissions or contacting Chrome Infra at:\n'
1624 'https://www.chromium.org/infra\n\n' %
1625 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001626 # Still raise exception so that stack trace is printed.
1627 raise
1628
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001629 def _GetGerritHost(self):
1630 # Lazy load of configs.
1631 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001632 if self._gerrit_host and '.' not in self._gerrit_host:
1633 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1634 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001635 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001636 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001637 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001638 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001639 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1640 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001641 return self._gerrit_host
1642
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001643 def _GetGitHost(self):
1644 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001645 remote_url = self.GetRemoteUrl()
1646 if not remote_url:
1647 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001648 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001649
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001650 def GetCodereviewServer(self):
1651 if not self._gerrit_server:
1652 # If we're on a branch then get the server potentially associated
1653 # with that branch.
1654 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001655 self._gerrit_server = self._GitGetBranchConfigValue(
1656 self.CodereviewServerConfigKey())
1657 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001658 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001659 if not self._gerrit_server:
1660 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1661 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001662 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001663 parts[0] = parts[0] + '-review'
1664 self._gerrit_host = '.'.join(parts)
1665 self._gerrit_server = 'https://%s' % self._gerrit_host
1666 return self._gerrit_server
1667
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001668 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001669 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001670 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001671 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001672 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001673 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001674 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001675 if project.endswith('.git'):
1676 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001677 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1678 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1679 # gitiles/git-over-https protocol. E.g.,
1680 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1681 # as
1682 # https://chromium.googlesource.com/v8/v8
1683 if project.startswith('a/'):
1684 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001685 return project
1686
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001687 def _GerritChangeIdentifier(self):
1688 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1689
1690 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001691 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001692 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001693 project = self._GetGerritProject()
1694 if project:
1695 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1696 # Fall back on still unique, but less efficient change number.
1697 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001698
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001699 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001700 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001701 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001702
tandrii5d48c322016-08-18 16:19:37 -07001703 @classmethod
1704 def PatchsetConfigKey(cls):
1705 return 'gerritpatchset'
1706
1707 @classmethod
1708 def CodereviewServerConfigKey(cls):
1709 return 'gerritserver'
1710
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001711 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001712 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001713 if settings.GetGerritSkipEnsureAuthenticated():
1714 # For projects with unusual authentication schemes.
1715 # See http://crbug.com/603378.
1716 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001717
1718 # Check presence of cookies only if using cookies-based auth method.
1719 cookie_auth = gerrit_util.Authenticator.get()
1720 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001721 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001722
Florian Mayerae510e82020-01-30 21:04:48 +00001723 remote_url = self.GetRemoteUrl()
1724 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001725 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001726 return
1727 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001728 logging.warning('Ignoring branch %(branch)s with non-https remote '
1729 '%(remote)s', {
1730 'branch': self.branch,
1731 'remote': self.GetRemoteUrl()
1732 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001733 return
1734
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001735 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001736 self.GetCodereviewServer()
1737 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001738 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001739
1740 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1741 git_auth = cookie_auth.get_auth_header(git_host)
1742 if gerrit_auth and git_auth:
1743 if gerrit_auth == git_auth:
1744 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001745 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001746 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001747 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001748 ' %s\n'
1749 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001750 ' Consider running the following command:\n'
1751 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001752 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001753 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001754 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001755 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001756 cookie_auth.get_new_password_message(git_host)))
1757 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001758 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001759 return
1760 else:
1761 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001762 ([] if gerrit_auth else [self._gerrit_host]) +
1763 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001764 DieWithError('Credentials for the following hosts are required:\n'
1765 ' %s\n'
1766 'These are read from %s (or legacy %s)\n'
1767 '%s' % (
1768 '\n '.join(missing),
1769 cookie_auth.get_gitcookies_path(),
1770 cookie_auth.get_netrc_path(),
1771 cookie_auth.get_new_password_message(git_host)))
1772
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001773 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001774 if not self.GetIssue():
1775 return
1776
1777 # Warm change details cache now to avoid RPCs later, reducing latency for
1778 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001779 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001780 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001781
1782 status = self._GetChangeDetail()['status']
1783 if status in ('MERGED', 'ABANDONED'):
1784 DieWithError('Change %s has been %s, new uploads are not allowed' %
1785 (self.GetIssueURL(),
1786 'submitted' if status == 'MERGED' else 'abandoned'))
1787
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001788 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1789 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1790 # Apparently this check is not very important? Otherwise get_auth_email
1791 # could have been added to other implementations of Authenticator.
1792 cookies_auth = gerrit_util.Authenticator.get()
1793 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001794 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001795
1796 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001797 if self.GetIssueOwner() == cookies_user:
1798 return
1799 logging.debug('change %s owner is %s, cookies user is %s',
1800 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001801 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001802 # so ask what Gerrit thinks of this user.
1803 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1804 if details['email'] == self.GetIssueOwner():
1805 return
1806 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001807 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001808 'as %s.\n'
1809 'Uploading may fail due to lack of permissions.' %
1810 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1811 confirm_or_exit(action='upload')
1812
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001813 def _PostUnsetIssueProperties(self):
1814 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001815 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001816
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001817 def GetGerritObjForPresubmit(self):
1818 return presubmit_support.GerritAccessor(self._GetGerritHost())
1819
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001820 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001821 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001822 or CQ status, assuming adherence to a common workflow.
1823
1824 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001825 * 'error' - error from review tool (including deleted issues)
1826 * 'unsent' - no reviewers added
1827 * 'waiting' - waiting for review
1828 * 'reply' - waiting for uploader to reply to review
1829 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001830 * 'dry-run' - dry-running in the CQ
1831 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001832 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001833 """
1834 if not self.GetIssue():
1835 return None
1836
1837 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001838 data = self._GetChangeDetail([
1839 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001840 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001841 return 'error'
1842
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001843 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001844 return 'closed'
1845
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001846 cq_label = data['labels'].get('Commit-Queue', {})
1847 max_cq_vote = 0
1848 for vote in cq_label.get('all', []):
1849 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1850 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001851 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001852 if max_cq_vote == 1:
1853 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001854
Aaron Gable9ab38c62017-04-06 14:36:33 -07001855 if data['labels'].get('Code-Review', {}).get('approved'):
1856 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001857
1858 if not data.get('reviewers', {}).get('REVIEWER', []):
1859 return 'unsent'
1860
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001861 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001862 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001863 last_message_author = messages.pop().get('author', {})
1864 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001865 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1866 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001867 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001868 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001869 if last_message_author.get('_account_id') == owner:
1870 # Most recent message was by owner.
1871 return 'waiting'
1872 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001873 # Some reply from non-owner.
1874 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001875
1876 # Somehow there are no messages even though there are reviewers.
1877 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001878
1879 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001880 if not self.GetIssue():
1881 return None
1882
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001883 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001884 patchset = data['revisions'][data['current_revision']]['_number']
1885 self.SetPatchset(patchset)
1886 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001887
Aaron Gable636b13f2017-07-14 10:42:48 -07001888 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001889 gerrit_util.SetReview(
1890 self._GetGerritHost(), self._GerritChangeIdentifier(),
1891 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001892
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001893 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001894 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001895 # CURRENT_REVISION is included to get the latest patchset so that
1896 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001897 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001898 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1899 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001900 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001901 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001902 robot_file_comments = gerrit_util.GetChangeRobotComments(
1903 self._GetGerritHost(), self._GerritChangeIdentifier())
1904
1905 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001906 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001907 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001908 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001909 line_comments = file_comments.setdefault(path, [])
1910 line_comments.extend(
1911 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001912
1913 # Build dictionary of file comments for easy access and sorting later.
1914 # {author+date: {path: {patchset: {line: url+message}}}}
1915 comments = collections.defaultdict(
1916 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001917 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001918 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001919 tag = comment.get('tag', '')
1920 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001921 continue
1922 key = (comment['author']['email'], comment['updated'])
1923 if comment.get('side', 'REVISION') == 'PARENT':
1924 patchset = 'Base'
1925 else:
1926 patchset = 'PS%d' % comment['patch_set']
1927 line = comment.get('line', 0)
1928 url = ('https://%s/c/%s/%s/%s#%s%s' %
1929 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1930 'b' if comment.get('side') == 'PARENT' else '',
1931 str(line) if line else ''))
1932 comments[key][path][patchset][line] = (url, comment['message'])
1933
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001934 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001935 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001936 summary = self._BuildCommentSummary(msg, comments, readable)
1937 if summary:
1938 summaries.append(summary)
1939 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001940
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001941 @staticmethod
1942 def _BuildCommentSummary(msg, comments, readable):
1943 key = (msg['author']['email'], msg['date'])
1944 # Don't bother showing autogenerated messages that don't have associated
1945 # file or line comments. this will filter out most autogenerated
1946 # messages, but will keep robot comments like those from Tricium.
1947 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1948 if is_autogenerated and not comments.get(key):
1949 return None
1950 message = msg['message']
1951 # Gerrit spits out nanoseconds.
1952 assert len(msg['date'].split('.')[-1]) == 9
1953 date = datetime.datetime.strptime(msg['date'][:-3],
1954 '%Y-%m-%d %H:%M:%S.%f')
1955 if key in comments:
1956 message += '\n'
1957 for path, patchsets in sorted(comments.get(key, {}).items()):
1958 if readable:
1959 message += '\n%s' % path
1960 for patchset, lines in sorted(patchsets.items()):
1961 for line, (url, content) in sorted(lines.items()):
1962 if line:
1963 line_str = 'Line %d' % line
1964 path_str = '%s:%d:' % (path, line)
1965 else:
1966 line_str = 'File comment'
1967 path_str = '%s:0:' % path
1968 if readable:
1969 message += '\n %s, %s: %s' % (patchset, line_str, url)
1970 message += '\n %s\n' % content
1971 else:
1972 message += '\n%s ' % path_str
1973 message += '\n%s\n' % content
1974
1975 return _CommentSummary(
1976 date=date,
1977 message=message,
1978 sender=msg['author']['email'],
1979 autogenerated=is_autogenerated,
1980 # These could be inferred from the text messages and correlated with
1981 # Code-Review label maximum, however this is not reliable.
1982 # Leaving as is until the need arises.
1983 approval=False,
1984 disapproval=False,
1985 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001986
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001987 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001988 gerrit_util.AbandonChange(
1989 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001990
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001991 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001992 gerrit_util.SubmitChange(
1993 self._GetGerritHost(), self._GerritChangeIdentifier(),
1994 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001995
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001996 def _GetChangeDetail(self, options=None, no_cache=False):
1997 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001998
1999 If fresh data is needed, set no_cache=True which will clear cache and
2000 thus new data will be fetched from Gerrit.
2001 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002002 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002003 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002004
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002005 # Optimization to avoid multiple RPCs:
2006 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2007 'CURRENT_COMMIT' not in options):
2008 options.append('CURRENT_COMMIT')
2009
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002010 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002011 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002012 options = [o.upper() for o in options]
2013
2014 # Check in cache first unless no_cache is True.
2015 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002016 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002017 else:
2018 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002019 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002020 # Assumption: data fetched before with extra options is suitable
2021 # for return for a smaller set of options.
2022 # For example, if we cached data for
2023 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2024 # and request is for options=[CURRENT_REVISION],
2025 # THEN we can return prior cached data.
2026 if options_set.issubset(cached_options_set):
2027 return data
2028
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002029 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002030 data = gerrit_util.GetChangeDetail(
2031 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002032 except gerrit_util.GerritError as e:
2033 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002034 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002035 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002036
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002037 self._detail_cache.setdefault(cache_key, []).append(
2038 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002039 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002040
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002041 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002042 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002043 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002044 data = gerrit_util.GetChangeCommit(
2045 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002046 except gerrit_util.GerritError as e:
2047 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002048 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002049 raise
agable32978d92016-11-01 12:55:02 -07002050 return data
2051
Karen Qian40c19422019-03-13 21:28:29 +00002052 def _IsCqConfigured(self):
2053 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002054 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002055
Olivier Robin75ee7252018-04-13 10:02:56 +02002056 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002057 if git_common.is_dirty_git_tree('land'):
2058 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002059
tandriid60367b2016-06-22 05:25:12 -07002060 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002061 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002062 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002063 'which can test and land changes for you. '
2064 'Are you sure you wish to bypass it?\n',
2065 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002066 differs = True
tandriic4344b52016-08-29 06:04:54 -07002067 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002068 # Note: git diff outputs nothing if there is no diff.
2069 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002070 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002071 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002072 if detail['current_revision'] == last_upload:
2073 differs = False
2074 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002075 print('WARNING: Local branch contents differ from latest uploaded '
2076 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002077 if differs:
2078 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002079 confirm_or_exit(
2080 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2081 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002082 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002083 elif not bypass_hooks:
2084 hook_results = self.RunHook(
2085 committing=True,
2086 may_prompt=not force,
2087 verbose=verbose,
Edward Lemur7f6dec02020-02-06 20:23:58 +00002088 change=self.GetChange(self.GetCommonAncestorWithUpstream()),
Olivier Robin75ee7252018-04-13 10:02:56 +02002089 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002090 if not hook_results.should_continue():
2091 return 1
2092
2093 self.SubmitIssue(wait_for_merge=True)
2094 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002095 links = self._GetChangeCommit().get('web_links', [])
2096 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002097 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002098 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002099 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002100 return 0
2101
Edward Lemurf38bc172019-09-03 21:02:13 +00002102 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002103 assert parsed_issue_arg.valid
2104
Edward Lemur125d60a2019-09-13 18:25:41 +00002105 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002106
2107 if parsed_issue_arg.hostname:
2108 self._gerrit_host = parsed_issue_arg.hostname
2109 self._gerrit_server = 'https://%s' % self._gerrit_host
2110
tandriic2405f52016-10-10 08:13:15 -07002111 try:
2112 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002113 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002114 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002115
2116 if not parsed_issue_arg.patchset:
2117 # Use current revision by default.
2118 revision_info = detail['revisions'][detail['current_revision']]
2119 patchset = int(revision_info['_number'])
2120 else:
2121 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002122 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002123 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2124 break
2125 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002126 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002127 (parsed_issue_arg.patchset, self.GetIssue()))
2128
Edward Lemur125d60a2019-09-13 18:25:41 +00002129 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002130 if remote_url.endswith('.git'):
2131 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002132 remote_url = remote_url.rstrip('/')
2133
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002134 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002135 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002136
2137 if remote_url != fetch_info['url']:
2138 DieWithError('Trying to patch a change from %s but this repo appears '
2139 'to be %s.' % (fetch_info['url'], remote_url))
2140
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002142
Aaron Gable62619a32017-06-16 08:22:09 -07002143 if force:
2144 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2145 print('Checked out commit for change %i patchset %i locally' %
2146 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002147 elif nocommit:
2148 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2149 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002150 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002151 RunGit(['cherry-pick', 'FETCH_HEAD'])
2152 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002153 (parsed_issue_arg.issue, patchset))
2154 print('Note: this created a local commit which does not have '
2155 'the same hash as the one uploaded for review. This will make '
2156 'uploading changes based on top of this branch difficult.\n'
2157 'If you want to do that, use "git cl patch --force" instead.')
2158
Stefan Zagerd08043c2017-10-12 12:07:02 -07002159 if self.GetBranch():
2160 self.SetIssue(parsed_issue_arg.issue)
2161 self.SetPatchset(patchset)
2162 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2163 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2164 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2165 else:
2166 print('WARNING: You are in detached HEAD state.\n'
2167 'The patch has been applied to your checkout, but you will not be '
2168 'able to upload a new patch set to the gerrit issue.\n'
2169 'Try using the \'-b\' option if you would like to work on a '
2170 'branch and/or upload a new patch set.')
2171
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002172 return 0
2173
tandrii16e0b4e2016-06-07 10:34:28 -07002174 def _GerritCommitMsgHookCheck(self, offer_removal):
2175 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2176 if not os.path.exists(hook):
2177 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002178 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2179 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002180 data = gclient_utils.FileRead(hook)
2181 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2182 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002183 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002184 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002185 'and may interfere with it in subtle ways.\n'
2186 'We recommend you remove the commit-msg hook.')
2187 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002188 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002189 gclient_utils.rm_file_or_tree(hook)
2190 print('Gerrit commit-msg hook removed.')
2191 else:
2192 print('OK, will keep Gerrit commit-msg hook in place.')
2193
Edward Lemur1b52d872019-05-09 21:12:12 +00002194 def _CleanUpOldTraces(self):
2195 """Keep only the last |MAX_TRACES| traces."""
2196 try:
2197 traces = sorted([
2198 os.path.join(TRACES_DIR, f)
2199 for f in os.listdir(TRACES_DIR)
2200 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2201 and not f.startswith('tmp'))
2202 ])
2203 traces_to_delete = traces[:-MAX_TRACES]
2204 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002205 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002206 except OSError:
2207 print('WARNING: Failed to remove old git traces from\n'
2208 ' %s'
2209 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002210
Edward Lemur5737f022019-05-17 01:24:00 +00002211 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002212 """Zip and write the git push traces stored in traces_dir."""
2213 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002214 traces_zip = trace_name + '-traces'
2215 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002216 # Create a temporary dir to store git config and gitcookies in. It will be
2217 # compressed and stored next to the traces.
2218 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002219 git_info_zip = trace_name + '-git-info'
2220
Edward Lemur5737f022019-05-17 01:24:00 +00002221 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002222 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002223 git_push_metadata['now'] = git_push_metadata['now'].decode(
2224 sys.stdin.encoding)
2225
Edward Lemur1b52d872019-05-09 21:12:12 +00002226 git_push_metadata['trace_name'] = trace_name
2227 gclient_utils.FileWrite(
2228 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2229
2230 # Keep only the first 6 characters of the git hashes on the packet
2231 # trace. This greatly decreases size after compression.
2232 packet_traces = os.path.join(traces_dir, 'trace-packet')
2233 if os.path.isfile(packet_traces):
2234 contents = gclient_utils.FileRead(packet_traces)
2235 gclient_utils.FileWrite(
2236 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2237 shutil.make_archive(traces_zip, 'zip', traces_dir)
2238
2239 # Collect and compress the git config and gitcookies.
2240 git_config = RunGit(['config', '-l'])
2241 gclient_utils.FileWrite(
2242 os.path.join(git_info_dir, 'git-config'),
2243 git_config)
2244
2245 cookie_auth = gerrit_util.Authenticator.get()
2246 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2247 gitcookies_path = cookie_auth.get_gitcookies_path()
2248 if os.path.isfile(gitcookies_path):
2249 gitcookies = gclient_utils.FileRead(gitcookies_path)
2250 gclient_utils.FileWrite(
2251 os.path.join(git_info_dir, 'gitcookies'),
2252 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2253 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2254
Edward Lemur1b52d872019-05-09 21:12:12 +00002255 gclient_utils.rmtree(git_info_dir)
2256
2257 def _RunGitPushWithTraces(
2258 self, change_desc, refspec, refspec_opts, git_push_metadata):
2259 """Run git push and collect the traces resulting from the execution."""
2260 # Create a temporary directory to store traces in. Traces will be compressed
2261 # and stored in a 'traces' dir inside depot_tools.
2262 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002263 trace_name = os.path.join(
2264 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002265
2266 env = os.environ.copy()
2267 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2268 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002269 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002270 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2271 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2272 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2273
2274 try:
2275 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002276 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002277 before_push = time_time()
2278 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002279 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002280 env=env,
2281 print_stdout=True,
2282 # Flush after every line: useful for seeing progress when running as
2283 # recipe.
2284 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002285 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002286 except subprocess2.CalledProcessError as e:
2287 push_returncode = e.returncode
2288 DieWithError('Failed to create a change. Please examine output above '
2289 'for the reason of the failure.\n'
2290 'Hint: run command below to diagnose common Git/Gerrit '
2291 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002292 ' git cl creds-check\n'
2293 '\n'
2294 'If git-cl is not working correctly, file a bug under the '
2295 'Infra>SDK component including the files below.\n'
2296 'Review the files before upload, since they might contain '
2297 'sensitive information.\n'
2298 'Set the Restrict-View-Google label so that they are not '
2299 'publicly accessible.\n'
2300 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002301 change_desc)
2302 finally:
2303 execution_time = time_time() - before_push
2304 metrics.collector.add_repeated('sub_commands', {
2305 'command': 'git push',
2306 'execution_time': execution_time,
2307 'exit_code': push_returncode,
2308 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2309 })
2310
Edward Lemur1b52d872019-05-09 21:12:12 +00002311 git_push_metadata['execution_time'] = execution_time
2312 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002313 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002314
Edward Lemur1b52d872019-05-09 21:12:12 +00002315 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002316 gclient_utils.rmtree(traces_dir)
2317
2318 return push_stdout
2319
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002320 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002321 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002322 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002323 # Load default for user, repo, squash=true, in this order.
2324 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002325
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002326 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002327 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002328 # This may be None; default fallback value is determined in logic below.
2329 title = options.title
2330
Dominic Battre7d1c4842017-10-27 09:17:28 +02002331 # Extract bug number from branch name.
2332 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002333 fixed = options.fixed
2334 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2335 self.GetBranch())
2336 if not bug and not fixed and match:
2337 if match.group('type') == 'bug':
2338 bug = match.group('bugnum')
2339 else:
2340 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002341
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002342 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002343 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002344 if self.GetIssue():
2345 # Try to get the message from a previous upload.
Edward Lemur6c6827c2020-02-06 21:15:18 +00002346 message = self.FetchDescription()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002347 if not message:
2348 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002349 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002350 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002351 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002352 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002353 # When uploading a subsequent patchset, -m|--message is taken
2354 # as the patchset title if --title was not provided.
2355 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002356 else:
2357 default_title = RunGit(
2358 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002359 if options.force:
2360 title = default_title
2361 else:
2362 title = ask_for_data(
2363 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002364
2365 # User requested to change description
2366 if options.edit_description:
2367 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2368 change_desc.prompt()
2369 message = change_desc.description
2370
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002371 change_id = self._GetChangeDetail()['change_id']
2372 while True:
2373 footer_change_ids = git_footers.get_footer_change_id(message)
2374 if footer_change_ids == [change_id]:
2375 break
2376 if not footer_change_ids:
2377 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002378 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 continue
2380 # There is already a valid footer but with different or several ids.
2381 # Doing this automatically is non-trivial as we don't want to lose
2382 # existing other footers, yet we want to append just 1 desired
2383 # Change-Id. Thus, just create a new footer, but let user verify the
2384 # new description.
2385 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002386 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002387 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002388 print(
2389 'WARNING: change %s has Change-Id footer(s):\n'
2390 ' %s\n'
2391 'but change has Change-Id %s, according to Gerrit.\n'
2392 'Please, check the proposed correction to the description, '
2393 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2394 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2395 change_id))
2396 confirm_or_exit(action='edit')
2397 change_desc.prompt()
2398
2399 message = change_desc.description
2400 if not message:
2401 DieWithError("Description is empty. Aborting...")
2402
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403 # Continue the while loop.
2404 # Sanity check of this code - we should end up with proper message
2405 # footer.
2406 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002407 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002408 else: # if not self.GetIssue()
2409 if options.message:
2410 message = options.message
2411 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002412 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002413 if options.title:
2414 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002415 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002416 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002417 change_desc.prompt()
2418
Aaron Gableb56ad332017-01-06 15:24:31 -08002419 # On first upload, patchset title is always this string, while
2420 # --title flag gets converted to first line of message.
2421 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002422 if not change_desc.description:
2423 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002424 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002425 if len(change_ids) > 1:
2426 DieWithError('too many Change-Id footers, at most 1 allowed.')
2427 if not change_ids:
2428 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002429 change_desc.set_description(git_footers.add_footer_change_id(
2430 change_desc.description,
2431 GenerateGerritChangeId(change_desc.description)))
2432 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002433 assert len(change_ids) == 1
2434 change_id = change_ids[0]
2435
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002436 if options.reviewers or options.tbrs or options.add_owners_to:
2437 change_desc.update_reviewers(options.reviewers, options.tbrs,
2438 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002439 if options.preserve_tryjobs:
2440 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002441
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002442 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002443 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2444 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002445 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lesmesf6a22322019-11-04 22:14:39 +00002446 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
Edward Lemur79d4f992019-11-11 23:49:02 +00002447 desc_tempfile.write(change_desc.description.encode('utf-8', 'replace'))
Aaron Gable9a03ae02017-11-03 11:31:07 -07002448 desc_tempfile.close()
2449 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2450 '-F', desc_tempfile.name]).strip()
2451 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002452 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002453 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002454 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002455 if not change_desc.description:
2456 DieWithError("Description is empty. Aborting...")
2457
2458 if not git_footers.get_footer_change_id(change_desc.description):
2459 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002460 change_desc.set_description(
2461 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002462 if options.reviewers or options.tbrs or options.add_owners_to:
2463 change_desc.update_reviewers(options.reviewers, options.tbrs,
2464 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002465 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002466 # For no-squash mode, we assume the remote called "origin" is the one we
2467 # want. It is not worthwhile to support different workflows for
2468 # no-squash mode.
2469 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002470 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2471
2472 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002473 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002474 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2475 ref_to_push)]).splitlines()
2476 if len(commits) > 1:
2477 print('WARNING: This will upload %d commits. Run the following command '
2478 'to see which commits will be uploaded: ' % len(commits))
2479 print('git log %s..%s' % (parent, ref_to_push))
2480 print('You can also use `git squash-branch` to squash these into a '
2481 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002482 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002483
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002484 if options.reviewers or options.tbrs or options.add_owners_to:
2485 change_desc.update_reviewers(options.reviewers, options.tbrs,
2486 options.add_owners_to, change)
2487
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002488 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002489 cc = []
2490 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2491 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2492 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002493 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002494 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002495 if options.cc:
2496 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002497 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002498 if change_desc.get_cced():
2499 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002500 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2501 valid_accounts = set(reviewers + cc)
2502 # TODO(crbug/877717): relax this for all hosts.
2503 else:
2504 valid_accounts = gerrit_util.ValidAccounts(
2505 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002506 logging.info('accounts %s are recognized, %s invalid',
2507 sorted(valid_accounts),
2508 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002509
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002510 # Extra options that can be specified at push time. Doc:
2511 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002512 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002513
Aaron Gable844cf292017-06-28 11:32:59 -07002514 # By default, new changes are started in WIP mode, and subsequent patchsets
2515 # don't send email. At any time, passing --send-mail will mark the change
2516 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002517 if options.send_mail:
2518 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002519 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002520 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002521 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002522 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002523 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002524
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002525 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002526 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002527
Aaron Gable9b713dd2016-12-14 16:04:21 -08002528 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002529 # Punctuation and whitespace in |title| must be percent-encoded.
2530 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002531
agablec6787972016-09-09 16:13:34 -07002532 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002533 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002534
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002535 for r in sorted(reviewers):
2536 if r in valid_accounts:
2537 refspec_opts.append('r=%s' % r)
2538 reviewers.remove(r)
2539 else:
2540 # TODO(tandrii): this should probably be a hard failure.
2541 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2542 % r)
2543 for c in sorted(cc):
2544 # refspec option will be rejected if cc doesn't correspond to an
2545 # account, even though REST call to add such arbitrary cc may succeed.
2546 if c in valid_accounts:
2547 refspec_opts.append('cc=%s' % c)
2548 cc.remove(c)
2549
rmistry9eadede2016-09-19 11:22:43 -07002550 if options.topic:
2551 # Documentation on Gerrit topics is here:
2552 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002553 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002554
Edward Lemur687ca902018-12-05 02:30:30 +00002555 if options.enable_auto_submit:
2556 refspec_opts.append('l=Auto-Submit+1')
2557 if options.use_commit_queue:
2558 refspec_opts.append('l=Commit-Queue+2')
2559 elif options.cq_dry_run:
2560 refspec_opts.append('l=Commit-Queue+1')
2561
2562 if change_desc.get_reviewers(tbr_only=True):
2563 score = gerrit_util.GetCodeReviewTbrScore(
2564 self._GetGerritHost(),
2565 self._GetGerritProject())
2566 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002567
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002568 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002569 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002570 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002571 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002572 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2573
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002574 refspec_suffix = ''
2575 if refspec_opts:
2576 refspec_suffix = '%' + ','.join(refspec_opts)
2577 assert ' ' not in refspec_suffix, (
2578 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2579 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2580
Edward Lemur1b52d872019-05-09 21:12:12 +00002581 git_push_metadata = {
2582 'gerrit_host': self._GetGerritHost(),
2583 'title': title or '<untitled>',
2584 'change_id': change_id,
2585 'description': change_desc.description,
2586 }
2587 push_stdout = self._RunGitPushWithTraces(
2588 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002589
2590 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002591 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002592 change_numbers = [m.group(1)
2593 for m in map(regex.match, push_stdout.splitlines())
2594 if m]
2595 if len(change_numbers) != 1:
2596 DieWithError(
2597 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002598 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002599 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002600 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002601
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002602 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002603 # GetIssue() is not set in case of non-squash uploads according to tests.
2604 # TODO(agable): non-squash uploads in git cl should be removed.
2605 gerrit_util.AddReviewers(
2606 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002607 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002608 reviewers, cc,
2609 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002610
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002611 return 0
2612
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002613 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2614 change_desc):
2615 """Computes parent of the generated commit to be uploaded to Gerrit.
2616
2617 Returns revision or a ref name.
2618 """
2619 if custom_cl_base:
2620 # Try to avoid creating additional unintended CLs when uploading, unless
2621 # user wants to take this risk.
2622 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2623 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2624 local_ref_of_target_remote])
2625 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002626 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002627 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2628 'If you proceed with upload, more than 1 CL may be created by '
2629 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2630 'If you are certain that specified base `%s` has already been '
2631 'uploaded to Gerrit as another CL, you may proceed.\n' %
2632 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2633 if not force:
2634 confirm_or_exit(
2635 'Do you take responsibility for cleaning up potential mess '
2636 'resulting from proceeding with upload?',
2637 action='upload')
2638 return custom_cl_base
2639
Aaron Gablef97e33d2017-03-30 15:44:27 -07002640 if remote != '.':
2641 return self.GetCommonAncestorWithUpstream()
2642
2643 # If our upstream branch is local, we base our squashed commit on its
2644 # squashed version.
2645 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2646
Aaron Gablef97e33d2017-03-30 15:44:27 -07002647 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002648 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002649
2650 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002651 # TODO(tandrii): consider checking parent change in Gerrit and using its
2652 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2653 # the tree hash of the parent branch. The upside is less likely bogus
2654 # requests to reupload parent change just because it's uploadhash is
2655 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002656 parent = RunGit(['config',
2657 'branch.%s.gerritsquashhash' % upstream_branch_name],
2658 error_ok=True).strip()
2659 # Verify that the upstream branch has been uploaded too, otherwise
2660 # Gerrit will create additional CLs when uploading.
2661 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2662 RunGitSilent(['rev-parse', parent + ':'])):
2663 DieWithError(
2664 '\nUpload upstream branch %s first.\n'
2665 'It is likely that this branch has been rebased since its last '
2666 'upload, so you just need to upload it again.\n'
2667 '(If you uploaded it with --no-squash, then branch dependencies '
2668 'are not supported, and you should reupload with --squash.)'
2669 % upstream_branch_name,
2670 change_desc)
2671 return parent
2672
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002673 def _AddChangeIdToCommitMessage(self, options, args):
2674 """Re-commits using the current message, assumes the commit hook is in
2675 place.
2676 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002677 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002678 git_command = ['commit', '--amend', '-m', log_desc]
2679 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002680 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002681 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002682 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002683 return new_log_desc
2684 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002685 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002686
tandriie113dfd2016-10-11 10:20:12 -07002687 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002688 try:
2689 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002690 except GerritChangeNotExists:
2691 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002692
2693 if data['status'] in ('ABANDONED', 'MERGED'):
2694 return 'CL %s is closed' % self.GetIssue()
2695
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002696 def GetGerritChange(self, patchset=None):
2697 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002698 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002699 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002700 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002701 data = self._GetChangeDetail(['ALL_REVISIONS'])
2702
2703 assert host and issue and patchset, 'CL must be uploaded first'
2704
2705 has_patchset = any(
2706 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002707 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002708 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002709 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002710 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002711
tandrii8c5a3532016-11-04 07:52:02 -07002712 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002713 'host': host,
2714 'change': issue,
2715 'project': data['project'],
2716 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002717 }
tandriie113dfd2016-10-11 10:20:12 -07002718
tandriide281ae2016-10-12 06:02:30 -07002719 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002720 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002721
Edward Lemur707d70b2018-02-07 00:50:14 +01002722 def GetReviewers(self):
2723 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002724 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002725
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002726
tandriif9aefb72016-07-01 09:06:51 -07002727def _get_bug_line_values(default_project, bugs):
2728 """Given default_project and comma separated list of bugs, yields bug line
2729 values.
2730
2731 Each bug can be either:
2732 * a number, which is combined with default_project
2733 * string, which is left as is.
2734
2735 This function may produce more than one line, because bugdroid expects one
2736 project per line.
2737
2738 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2739 ['v8:123', 'chromium:789']
2740 """
2741 default_bugs = []
2742 others = []
2743 for bug in bugs.split(','):
2744 bug = bug.strip()
2745 if bug:
2746 try:
2747 default_bugs.append(int(bug))
2748 except ValueError:
2749 others.append(bug)
2750
2751 if default_bugs:
2752 default_bugs = ','.join(map(str, default_bugs))
2753 if default_project:
2754 yield '%s:%s' % (default_project, default_bugs)
2755 else:
2756 yield default_bugs
2757 for other in sorted(others):
2758 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2759 yield other
2760
2761
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002762class ChangeDescription(object):
2763 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002764 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002765 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002766 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002767 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002768 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002769 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2770 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002771 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002772 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002773
Dan Beamd8b04ca2019-10-10 21:23:26 +00002774 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002775 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002776 if bug:
2777 regexp = re.compile(self.BUG_LINE)
2778 prefix = settings.GetBugPrefix()
2779 if not any((regexp.match(line) for line in self._description_lines)):
2780 values = list(_get_bug_line_values(prefix, bug))
2781 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002782 if fixed:
2783 regexp = re.compile(self.FIXED_LINE)
2784 prefix = settings.GetBugPrefix()
2785 if not any((regexp.match(line) for line in self._description_lines)):
2786 values = list(_get_bug_line_values(prefix, fixed))
2787 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002788
agable@chromium.org42c20792013-09-12 17:34:49 +00002789 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002790 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002791 return '\n'.join(self._description_lines)
2792
2793 def set_description(self, desc):
2794 if isinstance(desc, basestring):
2795 lines = desc.splitlines()
2796 else:
2797 lines = [line.rstrip() for line in desc]
2798 while lines and not lines[0]:
2799 lines.pop(0)
2800 while lines and not lines[-1]:
2801 lines.pop(-1)
2802 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002803
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002804 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2805 """Rewrites the R=/TBR= line(s) as a single line each.
2806
2807 Args:
2808 reviewers (list(str)) - list of additional emails to use for reviewers.
2809 tbrs (list(str)) - list of additional emails to use for TBRs.
2810 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2811 the change that are missing OWNER coverage. If this is not None, you
2812 must also pass a value for `change`.
2813 change (Change) - The Change that should be used for OWNERS lookups.
2814 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002815 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002816 assert isinstance(tbrs, list), tbrs
2817
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002818 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002819 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002820
2821 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002822 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002823
2824 reviewers = set(reviewers)
2825 tbrs = set(tbrs)
2826 LOOKUP = {
2827 'TBR': tbrs,
2828 'R': reviewers,
2829 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002830
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002831 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002832 regexp = re.compile(self.R_LINE)
2833 matches = [regexp.match(line) for line in self._description_lines]
2834 new_desc = [l for i, l in enumerate(self._description_lines)
2835 if not matches[i]]
2836 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002837
agable@chromium.org42c20792013-09-12 17:34:49 +00002838 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002839
2840 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002841 for match in matches:
2842 if not match:
2843 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002844 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2845
2846 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002847 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002848 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002849 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002850 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002851 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002852 LOOKUP[add_owners_to].update(
2853 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002854
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002855 # If any folks ended up in both groups, remove them from tbrs.
2856 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002857
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002858 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2859 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002860
2861 # Put the new lines in the description where the old first R= line was.
2862 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2863 if 0 <= line_loc < len(self._description_lines):
2864 if new_tbr_line:
2865 self._description_lines.insert(line_loc, new_tbr_line)
2866 if new_r_line:
2867 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002868 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002869 if new_r_line:
2870 self.append_footer(new_r_line)
2871 if new_tbr_line:
2872 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002873
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002874 def set_preserve_tryjobs(self):
2875 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2876 footers = git_footers.parse_footers(self.description)
2877 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2878 if v.lower() == 'true':
2879 return
2880 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2881
Anthony Polito8b955342019-09-24 19:01:36 +00002882 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002883 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002884 self.set_description([
2885 '# Enter a description of the change.',
2886 '# This will be displayed on the codereview site.',
2887 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002888 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002889 '--------------------',
2890 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002891 bug_regexp = re.compile(self.BUG_LINE)
2892 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002893 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002894 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2895 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002896 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002897
agable@chromium.org42c20792013-09-12 17:34:49 +00002898 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002899 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002900 if not content:
2901 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002902 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002903
Bruce Dawson2377b012018-01-11 16:46:49 -08002904 # Strip off comments and default inserted "Bug:" line.
2905 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002906 (line.startswith('#') or
2907 line.rstrip() == "Bug:" or
2908 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002909 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002910 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002911 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002912
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002913 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002914 """Adds a footer line to the description.
2915
2916 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2917 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2918 that Gerrit footers are always at the end.
2919 """
2920 parsed_footer_line = git_footers.parse_footer(line)
2921 if parsed_footer_line:
2922 # Line is a gerrit footer in the form: Footer-Key: any value.
2923 # Thus, must be appended observing Gerrit footer rules.
2924 self.set_description(
2925 git_footers.add_footer(self.description,
2926 key=parsed_footer_line[0],
2927 value=parsed_footer_line[1]))
2928 return
2929
2930 if not self._description_lines:
2931 self._description_lines.append(line)
2932 return
2933
2934 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2935 if gerrit_footers:
2936 # git_footers.split_footers ensures that there is an empty line before
2937 # actual (gerrit) footers, if any. We have to keep it that way.
2938 assert top_lines and top_lines[-1] == ''
2939 top_lines, separator = top_lines[:-1], top_lines[-1:]
2940 else:
2941 separator = [] # No need for separator if there are no gerrit_footers.
2942
2943 prev_line = top_lines[-1] if top_lines else ''
2944 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2945 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2946 top_lines.append('')
2947 top_lines.append(line)
2948 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002949
tandrii99a72f22016-08-17 14:33:24 -07002950 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002951 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002952 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002953 reviewers = [match.group(2).strip()
2954 for match in matches
2955 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002956 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002957
bradnelsond975b302016-10-23 12:20:23 -07002958 def get_cced(self):
2959 """Retrieves the list of reviewers."""
2960 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2961 cced = [match.group(2).strip() for match in matches if match]
2962 return cleanup_list(cced)
2963
Nodir Turakulov23b82142017-11-16 11:04:25 -08002964 def get_hash_tags(self):
2965 """Extracts and sanitizes a list of Gerrit hashtags."""
2966 subject = (self._description_lines or ('',))[0]
2967 subject = re.sub(
2968 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2969
2970 tags = []
2971 start = 0
2972 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2973 while True:
2974 m = bracket_exp.match(subject, start)
2975 if not m:
2976 break
2977 tags.append(self.sanitize_hash_tag(m.group(1)))
2978 start = m.end()
2979
2980 if not tags:
2981 # Try "Tag: " prefix.
2982 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2983 if m:
2984 tags.append(self.sanitize_hash_tag(m.group(1)))
2985 return tags
2986
2987 @classmethod
2988 def sanitize_hash_tag(cls, tag):
2989 """Returns a sanitized Gerrit hash tag.
2990
2991 A sanitized hashtag can be used as a git push refspec parameter value.
2992 """
2993 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2994
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002995 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2996 """Updates this commit description given the parent.
2997
2998 This is essentially what Gnumbd used to do.
2999 Consult https://goo.gl/WMmpDe for more details.
3000 """
3001 assert parent_msg # No, orphan branch creation isn't supported.
3002 assert parent_hash
3003 assert dest_ref
3004 parent_footer_map = git_footers.parse_footers(parent_msg)
3005 # This will also happily parse svn-position, which GnumbD is no longer
3006 # supporting. While we'd generate correct footers, the verifier plugin
3007 # installed in Gerrit will block such commit (ie git push below will fail).
3008 parent_position = git_footers.get_position(parent_footer_map)
3009
3010 # Cherry-picks may have last line obscuring their prior footers,
3011 # from git_footers perspective. This is also what Gnumbd did.
3012 cp_line = None
3013 if (self._description_lines and
3014 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3015 cp_line = self._description_lines.pop()
3016
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003017 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003018
3019 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3020 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003021 for i, line in enumerate(footer_lines):
3022 k, v = git_footers.parse_footer(line) or (None, None)
3023 if k and k.startswith('Cr-'):
3024 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003025
3026 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003027 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003028 if parent_position[0] == dest_ref:
3029 # Same branch as parent.
3030 number = int(parent_position[1]) + 1
3031 else:
3032 number = 1 # New branch, and extra lineage.
3033 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3034 int(parent_position[1])))
3035
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003036 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3037 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003038
3039 self._description_lines = top_lines
3040 if cp_line:
3041 self._description_lines.append(cp_line)
3042 if self._description_lines[-1] != '':
3043 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003044 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003045
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003046
Aaron Gablea1bab272017-04-11 16:38:18 -07003047def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003048 """Retrieves the reviewers that approved a CL from the issue properties with
3049 messages.
3050
3051 Note that the list may contain reviewers that are not committer, thus are not
3052 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003053
3054 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003055 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003056 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003057 return sorted(
3058 set(
3059 message['sender']
3060 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003061 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003062 )
3063 )
3064
3065
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003066def FindCodereviewSettingsFile(filename='codereview.settings'):
3067 """Finds the given file starting in the cwd and going up.
3068
3069 Only looks up to the top of the repository unless an
3070 'inherit-review-settings-ok' file exists in the root of the repository.
3071 """
3072 inherit_ok_file = 'inherit-review-settings-ok'
3073 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003074 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003075 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3076 root = '/'
3077 while True:
3078 if filename in os.listdir(cwd):
3079 if os.path.isfile(os.path.join(cwd, filename)):
3080 return open(os.path.join(cwd, filename))
3081 if cwd == root:
3082 break
3083 cwd = os.path.dirname(cwd)
3084
3085
3086def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003087 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003088 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003089
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003090 def SetProperty(name, setting, unset_error_ok=False):
3091 fullname = 'rietveld.' + name
3092 if setting in keyvals:
3093 RunGit(['config', fullname, keyvals[setting]])
3094 else:
3095 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3096
tandrii48df5812016-10-17 03:55:37 -07003097 if not keyvals.get('GERRIT_HOST', False):
3098 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003099 # Only server setting is required. Other settings can be absent.
3100 # In that case, we ignore errors raised during option deletion attempt.
3101 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3102 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3103 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003104 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003105 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3106 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003107 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3108 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003109 SetProperty(
3110 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003111
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003112 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003113 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003114
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003115 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003116 RunGit(['config', 'gerrit.squash-uploads',
3117 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003118
tandrii@chromium.org28253532016-04-14 13:46:56 +00003119 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003120 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003121 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3122
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003123 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003124 # should be of the form
3125 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3126 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003127 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3128 keyvals['ORIGIN_URL_CONFIG']])
3129
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003130
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003131def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003132 """Downloads a network object to a local file, like urllib.urlretrieve.
3133
3134 This is necessary because urllib is broken for SSL connections via a proxy.
3135 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003136 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003137 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003138
3139
ukai@chromium.org712d6102013-11-27 00:52:58 +00003140def hasSheBang(fname):
3141 """Checks fname is a #! script."""
3142 with open(fname) as f:
3143 return f.read(2).startswith('#!')
3144
3145
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003146# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3147def DownloadHooks(*args, **kwargs):
3148 pass
3149
3150
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003151def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003152 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003153
3154 Args:
3155 force: True to update hooks. False to install hooks if not present.
3156 """
3157 if not settings.GetIsGerrit():
3158 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003159 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003160 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3161 if not os.access(dst, os.X_OK):
3162 if os.path.exists(dst):
3163 if not force:
3164 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003165 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003166 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003167 if not hasSheBang(dst):
3168 DieWithError('Not a script: %s\n'
3169 'You need to download from\n%s\n'
3170 'into .git/hooks/commit-msg and '
3171 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003172 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3173 except Exception:
3174 if os.path.exists(dst):
3175 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003176 DieWithError('\nFailed to download hooks.\n'
3177 'You need to download from\n%s\n'
3178 'into .git/hooks/commit-msg and '
3179 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003180
3181
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003182class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003183 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003184
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003185 _GOOGLESOURCE = 'googlesource.com'
3186
3187 def __init__(self):
3188 # Cached list of [host, identity, source], where source is either
3189 # .gitcookies or .netrc.
3190 self._all_hosts = None
3191
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003192 def ensure_configured_gitcookies(self):
3193 """Runs checks and suggests fixes to make git use .gitcookies from default
3194 path."""
3195 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3196 configured_path = RunGitSilent(
3197 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003198 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003199 if configured_path:
3200 self._ensure_default_gitcookies_path(configured_path, default)
3201 else:
3202 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003203
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003204 @staticmethod
3205 def _ensure_default_gitcookies_path(configured_path, default_path):
3206 assert configured_path
3207 if configured_path == default_path:
3208 print('git is already configured to use your .gitcookies from %s' %
3209 configured_path)
3210 return
3211
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003212 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003213 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3214 (configured_path, default_path))
3215
3216 if not os.path.exists(configured_path):
3217 print('However, your configured .gitcookies file is missing.')
3218 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3219 action='reconfigure')
3220 RunGit(['config', '--global', 'http.cookiefile', default_path])
3221 return
3222
3223 if os.path.exists(default_path):
3224 print('WARNING: default .gitcookies file already exists %s' %
3225 default_path)
3226 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3227 default_path)
3228
3229 confirm_or_exit('Move existing .gitcookies to default location?',
3230 action='move')
3231 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003232 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003233 print('Moved and reconfigured git to use .gitcookies from %s' %
3234 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003235
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003236 @staticmethod
3237 def _configure_gitcookies_path(default_path):
3238 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3239 if os.path.exists(netrc_path):
3240 print('You seem to be using outdated .netrc for git credentials: %s' %
3241 netrc_path)
3242 print('This tool will guide you through setting up recommended '
3243 '.gitcookies store for git credentials.\n'
3244 '\n'
3245 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3246 ' git config --global --unset http.cookiefile\n'
3247 ' mv %s %s.backup\n\n' % (default_path, default_path))
3248 confirm_or_exit(action='setup .gitcookies')
3249 RunGit(['config', '--global', 'http.cookiefile', default_path])
3250 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003251
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003252 def get_hosts_with_creds(self, include_netrc=False):
3253 if self._all_hosts is None:
3254 a = gerrit_util.CookiesAuthenticator()
3255 self._all_hosts = [
3256 (h, u, s)
3257 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003258 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3259 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003260 )
3261 if h.endswith(self._GOOGLESOURCE)
3262 ]
3263
3264 if include_netrc:
3265 return self._all_hosts
3266 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3267
3268 def print_current_creds(self, include_netrc=False):
3269 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3270 if not hosts:
3271 print('No Git/Gerrit credentials found')
3272 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003273 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003274 header = [('Host', 'User', 'Which file'),
3275 ['=' * l for l in lengths]]
3276 for row in (header + hosts):
3277 print('\t'.join((('%%+%ds' % l) % s)
3278 for l, s in zip(lengths, row)))
3279
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003280 @staticmethod
3281 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003282 """Parses identity "git-<username>.domain" into <username> and domain."""
3283 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003284 # distinguishable from sub-domains. But we do know typical domains:
3285 if identity.endswith('.chromium.org'):
3286 domain = 'chromium.org'
3287 username = identity[:-len('.chromium.org')]
3288 else:
3289 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003290 if username.startswith('git-'):
3291 username = username[len('git-'):]
3292 return username, domain
3293
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003294 def _canonical_git_googlesource_host(self, host):
3295 """Normalizes Gerrit hosts (with '-review') to Git host."""
3296 assert host.endswith(self._GOOGLESOURCE)
3297 # Prefix doesn't include '.' at the end.
3298 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3299 if prefix.endswith('-review'):
3300 prefix = prefix[:-len('-review')]
3301 return prefix + '.' + self._GOOGLESOURCE
3302
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003303 def _canonical_gerrit_googlesource_host(self, host):
3304 git_host = self._canonical_git_googlesource_host(host)
3305 prefix = git_host.split('.', 1)[0]
3306 return prefix + '-review.' + self._GOOGLESOURCE
3307
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003308 def _get_counterpart_host(self, host):
3309 assert host.endswith(self._GOOGLESOURCE)
3310 git = self._canonical_git_googlesource_host(host)
3311 gerrit = self._canonical_gerrit_googlesource_host(git)
3312 return git if gerrit == host else gerrit
3313
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003314 def has_generic_host(self):
3315 """Returns whether generic .googlesource.com has been configured.
3316
3317 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3318 """
3319 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3320 if host == '.' + self._GOOGLESOURCE:
3321 return True
3322 return False
3323
3324 def _get_git_gerrit_identity_pairs(self):
3325 """Returns map from canonic host to pair of identities (Git, Gerrit).
3326
3327 One of identities might be None, meaning not configured.
3328 """
3329 host_to_identity_pairs = {}
3330 for host, identity, _ in self.get_hosts_with_creds():
3331 canonical = self._canonical_git_googlesource_host(host)
3332 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3333 idx = 0 if canonical == host else 1
3334 pair[idx] = identity
3335 return host_to_identity_pairs
3336
3337 def get_partially_configured_hosts(self):
3338 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003339 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003340 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003341 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003342
3343 def get_conflicting_hosts(self):
3344 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003345 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003346 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003347 if None not in (i1, i2) and i1 != i2)
3348
3349 def get_duplicated_hosts(self):
3350 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003351 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003352
3353 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3354 'chromium.googlesource.com': 'chromium.org',
3355 'chrome-internal.googlesource.com': 'google.com',
3356 }
3357
3358 def get_hosts_with_wrong_identities(self):
3359 """Finds hosts which **likely** reference wrong identities.
3360
3361 Note: skips hosts which have conflicting identities for Git and Gerrit.
3362 """
3363 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003364 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003365 pair = self._get_git_gerrit_identity_pairs().get(host)
3366 if pair and pair[0] == pair[1]:
3367 _, domain = self._parse_identity(pair[0])
3368 if domain != expected:
3369 hosts.add(host)
3370 return hosts
3371
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003372 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003373 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003374 hosts = sorted(hosts)
3375 assert hosts
3376 if extra_column_func is None:
3377 extras = [''] * len(hosts)
3378 else:
3379 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003380 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3381 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003382 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003383 lines.append(tmpl % he)
3384 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003385
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003386 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003387 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003388 yield ('.googlesource.com wildcard record detected',
3389 ['Chrome Infrastructure team recommends to list full host names '
3390 'explicitly.'],
3391 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003392
3393 dups = self.get_duplicated_hosts()
3394 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003395 yield ('The following hosts were defined twice',
3396 self._format_hosts(dups),
3397 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003398
3399 partial = self.get_partially_configured_hosts()
3400 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003401 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3402 'These hosts are missing',
3403 self._format_hosts(partial, lambda host: 'but %s defined' %
3404 self._get_counterpart_host(host)),
3405 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003406
3407 conflicting = self.get_conflicting_hosts()
3408 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003409 yield ('The following Git hosts have differing credentials from their '
3410 'Gerrit counterparts',
3411 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3412 tuple(self._get_git_gerrit_identity_pairs()[host])),
3413 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003414
3415 wrong = self.get_hosts_with_wrong_identities()
3416 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003417 yield ('These hosts likely use wrong identity',
3418 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3419 (self._get_git_gerrit_identity_pairs()[host][0],
3420 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3421 wrong)
3422
3423 def find_and_report_problems(self):
3424 """Returns True if there was at least one problem, else False."""
3425 found = False
3426 bad_hosts = set()
3427 for title, sublines, hosts in self._find_problems():
3428 if not found:
3429 found = True
3430 print('\n\n.gitcookies problem report:\n')
3431 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003432 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003433 if sublines:
3434 print()
3435 print(' %s' % '\n '.join(sublines))
3436 print()
3437
3438 if bad_hosts:
3439 assert found
3440 print(' You can manually remove corresponding lines in your %s file and '
3441 'visit the following URLs with correct account to generate '
3442 'correct credential lines:\n' %
3443 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3444 print(' %s' % '\n '.join(sorted(set(
3445 gerrit_util.CookiesAuthenticator().get_new_password_url(
3446 self._canonical_git_googlesource_host(host))
3447 for host in bad_hosts
3448 ))))
3449 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003450
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003451
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003452@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003453def CMDcreds_check(parser, args):
3454 """Checks credentials and suggests changes."""
3455 _, _ = parser.parse_args(args)
3456
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003457 # Code below checks .gitcookies. Abort if using something else.
3458 authn = gerrit_util.Authenticator.get()
3459 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3460 if isinstance(authn, gerrit_util.GceAuthenticator):
3461 DieWithError(
3462 'This command is not designed for GCE, are you on a bot?\n'
3463 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3464 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003465 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003466 'This command is not designed for bot environment. It checks '
3467 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003468
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003469 checker = _GitCookiesChecker()
3470 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003471
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003472 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003473 checker.print_current_creds(include_netrc=True)
3474
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003475 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003476 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003477 return 0
3478 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003479
3480
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003481@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003482def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003483 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003484 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3485 branch = ShortBranchName(branchref)
3486 _, args = parser.parse_args(args)
3487 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003488 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003489 return RunGit(['config', 'branch.%s.base-url' % branch],
3490 error_ok=False).strip()
3491 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003492 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003493 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3494 error_ok=False).strip()
3495
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003496
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003497def color_for_status(status):
3498 """Maps a Changelist status to color, for CMDstatus and other tools."""
3499 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003500 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003501 'waiting': Fore.BLUE,
3502 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003503 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003504 'lgtm': Fore.GREEN,
3505 'commit': Fore.MAGENTA,
3506 'closed': Fore.CYAN,
3507 'error': Fore.WHITE,
3508 }.get(status, Fore.WHITE)
3509
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003510
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003511def get_cl_statuses(changes, fine_grained, max_processes=None):
3512 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003513
3514 If fine_grained is true, this will fetch CL statuses from the server.
3515 Otherwise, simply indicate if there's a matching url for the given branches.
3516
3517 If max_processes is specified, it is used as the maximum number of processes
3518 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3519 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003520
3521 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003522 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003523 if not changes:
3524 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003525
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003526 if not fine_grained:
3527 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003528 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003529 for cl in changes:
3530 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003531 return
3532
3533 # First, sort out authentication issues.
3534 logging.debug('ensuring credentials exist')
3535 for cl in changes:
3536 cl.EnsureAuthenticated(force=False, refresh=True)
3537
3538 def fetch(cl):
3539 try:
3540 return (cl, cl.GetStatus())
3541 except:
3542 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003543 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003544 raise
3545
3546 threads_count = len(changes)
3547 if max_processes:
3548 threads_count = max(1, min(threads_count, max_processes))
3549 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3550
3551 pool = ThreadPool(threads_count)
3552 fetched_cls = set()
3553 try:
3554 it = pool.imap_unordered(fetch, changes).__iter__()
3555 while True:
3556 try:
3557 cl, status = it.next(timeout=5)
3558 except multiprocessing.TimeoutError:
3559 break
3560 fetched_cls.add(cl)
3561 yield cl, status
3562 finally:
3563 pool.close()
3564
3565 # Add any branches that failed to fetch.
3566 for cl in set(changes) - fetched_cls:
3567 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003568
rmistry@google.com2dd99862015-06-22 12:22:18 +00003569
3570def upload_branch_deps(cl, args):
3571 """Uploads CLs of local branches that are dependents of the current branch.
3572
3573 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003574
3575 test1 -> test2.1 -> test3.1
3576 -> test3.2
3577 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003578
3579 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3580 run on the dependent branches in this order:
3581 test2.1, test3.1, test3.2, test2.2, test3.3
3582
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003583 Note: This function does not rebase your local dependent branches. Use it
3584 when you make a change to the parent branch that will not conflict
3585 with its dependent branches, and you would like their dependencies
3586 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003587 """
3588 if git_common.is_dirty_git_tree('upload-branch-deps'):
3589 return 1
3590
3591 root_branch = cl.GetBranch()
3592 if root_branch is None:
3593 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3594 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003595 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003596 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3597 'patchset dependencies without an uploaded CL.')
3598
3599 branches = RunGit(['for-each-ref',
3600 '--format=%(refname:short) %(upstream:short)',
3601 'refs/heads'])
3602 if not branches:
3603 print('No local branches found.')
3604 return 0
3605
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003606 # Create a dictionary of all local branches to the branches that are
3607 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003608 tracked_to_dependents = collections.defaultdict(list)
3609 for b in branches.splitlines():
3610 tokens = b.split()
3611 if len(tokens) == 2:
3612 branch_name, tracked = tokens
3613 tracked_to_dependents[tracked].append(branch_name)
3614
vapiera7fbd5a2016-06-16 09:17:49 -07003615 print()
3616 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003617 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003618
rmistry@google.com2dd99862015-06-22 12:22:18 +00003619 def traverse_dependents_preorder(branch, padding=''):
3620 dependents_to_process = tracked_to_dependents.get(branch, [])
3621 padding += ' '
3622 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003623 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003624 dependents.append(dependent)
3625 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003626
rmistry@google.com2dd99862015-06-22 12:22:18 +00003627 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003628 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003629
3630 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003631 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003632 return 0
3633
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003634 confirm_or_exit('This command will checkout all dependent branches and run '
3635 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003636
rmistry@google.com2dd99862015-06-22 12:22:18 +00003637 # Record all dependents that failed to upload.
3638 failures = {}
3639 # Go through all dependents, checkout the branch and upload.
3640 try:
3641 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003642 print()
3643 print('--------------------------------------')
3644 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003645 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003646 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003647 try:
3648 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003649 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003650 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003651 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003652 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003653 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003654 finally:
3655 # Swap back to the original root branch.
3656 RunGit(['checkout', '-q', root_branch])
3657
vapiera7fbd5a2016-06-16 09:17:49 -07003658 print()
3659 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003660 for dependent_branch in dependents:
3661 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003662 print(' %s : %s' % (dependent_branch, upload_status))
3663 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003664
3665 return 0
3666
3667
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003668def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3669 """Given a proposed tag name, returns a tag name that is guaranteed to be
3670 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3671 or 'foo-3', and so on."""
3672
3673 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3674 for suffix_num in itertools.count(1):
3675 if suffix_num == 1:
3676 to_check = proposed_tag
3677 else:
3678 to_check = '%s-%d' % (proposed_tag, suffix_num)
3679
3680 if to_check not in existing_tags:
3681 return to_check
3682
3683
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003684@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003685def CMDarchive(parser, args):
3686 """Archives and deletes branches associated with closed changelists."""
3687 parser.add_option(
3688 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003689 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003690 parser.add_option(
3691 '-f', '--force', action='store_true',
3692 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003693 parser.add_option(
3694 '-d', '--dry-run', action='store_true',
3695 help='Skip the branch tagging and removal steps.')
3696 parser.add_option(
3697 '-t', '--notags', action='store_true',
3698 help='Do not tag archived branches. '
3699 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003700
kmarshall3bff56b2016-06-06 18:31:47 -07003701 options, args = parser.parse_args(args)
3702 if args:
3703 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003704
3705 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3706 if not branches:
3707 return 0
3708
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003709 tags = RunGit(['for-each-ref', '--format=%(refname)',
3710 'refs/tags']).splitlines() or []
3711 tags = [t.split('/')[-1] for t in tags]
3712
vapiera7fbd5a2016-06-16 09:17:49 -07003713 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003714 changes = [Changelist(branchref=b)
3715 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003716 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3717 statuses = get_cl_statuses(changes,
3718 fine_grained=True,
3719 max_processes=options.maxjobs)
3720 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003721 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3722 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003723 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003724 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003725 proposal.sort()
3726
3727 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003728 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003729 return 0
3730
3731 current_branch = GetCurrentBranch()
3732
vapiera7fbd5a2016-06-16 09:17:49 -07003733 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003734 if options.notags:
3735 for next_item in proposal:
3736 print(' ' + next_item[0])
3737 else:
3738 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3739 for next_item in proposal:
3740 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003741
kmarshall9249e012016-08-23 12:02:16 -07003742 # Quit now on precondition failure or if instructed by the user, either
3743 # via an interactive prompt or by command line flags.
3744 if options.dry_run:
3745 print('\nNo changes were made (dry run).\n')
3746 return 0
3747 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003748 print('You are currently on a branch \'%s\' which is associated with a '
3749 'closed codereview issue, so archive cannot proceed. Please '
3750 'checkout another branch and run this command again.' %
3751 current_branch)
3752 return 1
kmarshall9249e012016-08-23 12:02:16 -07003753 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003754 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3755 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003756 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003757 return 1
3758
3759 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003760 if not options.notags:
3761 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003762
3763 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3764 # Clean up the tag if we failed to delete the branch.
3765 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003766
vapiera7fbd5a2016-06-16 09:17:49 -07003767 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003768
3769 return 0
3770
3771
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003772@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003773def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003774 """Show status of changelists.
3775
3776 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003777 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003778 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003779 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003780 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003781 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003782 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003783 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003784
3785 Also see 'git cl comments'.
3786 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003787 parser.add_option(
3788 '--no-branch-color',
3789 action='store_true',
3790 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003791 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003792 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003793 parser.add_option('-f', '--fast', action='store_true',
3794 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003795 parser.add_option(
3796 '-j', '--maxjobs', action='store', type=int,
3797 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003798 parser.add_option(
3799 '-i', '--issue', type=int,
3800 help='Operate on this issue instead of the current branch\'s implicit '
3801 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003802 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003803 if args:
3804 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003805
iannuccie53c9352016-08-17 14:40:40 -07003806 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003807 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003808
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003809 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003810 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003811 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003812 if cl.GetIssue():
3813 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003814 elif options.field == 'id':
3815 issueid = cl.GetIssue()
3816 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003817 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003818 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003819 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003820 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003821 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003822 elif options.field == 'status':
3823 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003824 elif options.field == 'url':
3825 url = cl.GetIssueURL()
3826 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003827 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003828 return 0
3829
3830 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3831 if not branches:
3832 print('No local branch found.')
3833 return 0
3834
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003835 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003836 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003837 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003838 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003839 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003840 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003841 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003842
Daniel McArdlea23bf592019-02-12 00:25:12 +00003843 current_branch = GetCurrentBranch()
3844
3845 def FormatBranchName(branch, colorize=False):
3846 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3847 an asterisk when it is the current branch."""
3848
3849 asterisk = ""
3850 color = Fore.RESET
3851 if branch == current_branch:
3852 asterisk = "* "
3853 color = Fore.GREEN
3854 branch_name = ShortBranchName(branch)
3855
3856 if colorize:
3857 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003858 return asterisk + branch_name
3859
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003860 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003861
3862 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003863 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3864 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003865 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003866 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003867 branch_statuses[c.GetBranch()] = status
3868 status = branch_statuses.pop(branch)
3869 url = cl.GetIssueURL()
3870 if url and (not status or status == 'error'):
3871 # The issue probably doesn't exist anymore.
3872 url += ' (broken)'
3873
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003874 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003875 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003876 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003877 color = ''
3878 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003879 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003880
Alan Cuttera3be9a52019-03-04 18:50:33 +00003881 branch_display = FormatBranchName(branch)
3882 padding = ' ' * (alignment - len(branch_display))
3883 if not options.no_branch_color:
3884 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003885
Alan Cuttera3be9a52019-03-04 18:50:33 +00003886 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3887 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003888
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003890 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003891 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003892 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003893 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003894 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003895 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003896 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003897 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003898 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003899 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003900 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003901 return 0
3902
3903
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003904def colorize_CMDstatus_doc():
3905 """To be called once in main() to add colors to git cl status help."""
3906 colors = [i for i in dir(Fore) if i[0].isupper()]
3907
3908 def colorize_line(line):
3909 for color in colors:
3910 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003911 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003912 indent = len(line) - len(line.lstrip(' ')) + 1
3913 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3914 return line
3915
3916 lines = CMDstatus.__doc__.splitlines()
3917 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3918
3919
phajdan.jre328cf92016-08-22 04:12:17 -07003920def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003921 if path == '-':
3922 json.dump(contents, sys.stdout)
3923 else:
3924 with open(path, 'w') as f:
3925 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003926
3927
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003928@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003929@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003930def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003931 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003932
3933 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003934 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003935 parser.add_option('-r', '--reverse', action='store_true',
3936 help='Lookup the branch(es) for the specified issues. If '
3937 'no issues are specified, all branches with mapped '
3938 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003939 parser.add_option('--json',
3940 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003941 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003942
dnj@chromium.org406c4402015-03-03 17:22:28 +00003943 if options.reverse:
3944 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003945 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003946 # Reverse issue lookup.
3947 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003948
3949 git_config = {}
3950 for config in RunGit(['config', '--get-regexp',
3951 r'branch\..*issue']).splitlines():
3952 name, _space, val = config.partition(' ')
3953 git_config[name] = val
3954
dnj@chromium.org406c4402015-03-03 17:22:28 +00003955 for branch in branches:
Edward Lemur52969c92020-02-06 18:15:28 +00003956 config_key = _git_branch_config_key(ShortBranchName(branch),
3957 Changelist.IssueConfigKey())
3958 issue = git_config.get(config_key)
3959 if issue:
3960 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003961 if not args:
3962 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003963 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003964 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003965 try:
3966 issue_num = int(issue)
3967 except ValueError:
3968 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003969 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003970 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003971 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003972 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003973 if options.json:
3974 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003975 return 0
3976
3977 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003978 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003979 if not issue.valid:
3980 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3981 'or no argument to list it.\n'
3982 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003983 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003984 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003985 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003986 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003987 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3988 if options.json:
3989 write_json(options.json, {
3990 'issue': cl.GetIssue(),
3991 'issue_url': cl.GetIssueURL(),
3992 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003993 return 0
3994
3995
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003996@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003997def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003998 """Shows or posts review comments for any changelist."""
3999 parser.add_option('-a', '--add-comment', dest='comment',
4000 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004001 parser.add_option('-p', '--publish', action='store_true',
4002 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004003 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004004 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004005 parser.add_option('-m', '--machine-readable', dest='readable',
4006 action='store_false', default=True,
4007 help='output comments in a format compatible with '
4008 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004009 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004010 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004011 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004012
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004013 issue = None
4014 if options.issue:
4015 try:
4016 issue = int(options.issue)
4017 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004018 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004019
Edward Lemur934836a2019-09-09 20:16:54 +00004020 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004021
4022 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004023 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004024 return 0
4025
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004026 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4027 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004028 for comment in summary:
4029 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004030 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004031 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004032 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004033 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004034 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004035 elif comment.autogenerated:
4036 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004037 else:
4038 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004039 print('\n%s%s %s%s\n%s' % (
4040 color,
4041 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4042 comment.sender,
4043 Fore.RESET,
4044 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4045
smut@google.comc85ac942015-09-15 16:34:43 +00004046 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004047 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004048 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004049 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4050 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004051 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004052 return 0
4053
4054
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004055@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004056@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004057def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004058 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004059 parser.add_option('-d', '--display', action='store_true',
4060 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004061 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004062 help='New description to set for this issue (- for stdin, '
4063 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004064 parser.add_option('-f', '--force', action='store_true',
4065 help='Delete any unpublished Gerrit edits for this issue '
4066 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004067
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004068 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004069
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004070 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004071 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004072 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004073 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004074 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004075
Edward Lemur934836a2019-09-09 20:16:54 +00004076 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004077 if target_issue_arg:
4078 kwargs['issue'] = target_issue_arg.issue
4079 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004080
4081 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004082 if not cl.GetIssue():
4083 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004084
Edward Lemur678a6842019-10-03 22:25:05 +00004085 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004086 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004087
Edward Lemur6c6827c2020-02-06 21:15:18 +00004088 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004089
smut@google.com34fb6b12015-07-13 20:03:26 +00004090 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004091 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004092 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004093
4094 if options.new_description:
4095 text = options.new_description
4096 if text == '-':
4097 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004098 elif text == '+':
4099 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004100 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004101
4102 description.set_description(text)
4103 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004104 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004105 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004106 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004107 return 0
4108
4109
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004110@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004111def CMDlint(parser, args):
4112 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004113 parser.add_option('--filter', action='append', metavar='-x,+y',
4114 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004115 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004116
4117 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004118 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004119 try:
4120 import cpplint
4121 import cpplint_chromium
4122 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004123 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004124 return 1
4125
4126 # Change the current working directory before calling lint so that it
4127 # shows the correct base.
4128 previous_cwd = os.getcwd()
4129 os.chdir(settings.GetRoot())
4130 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004131 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004132 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004133 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004134 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004135 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004136 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004137
4138 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004139 command = args + files
4140 if options.filter:
4141 command = ['--filter=' + ','.join(options.filter)] + command
4142 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004143
4144 white_regex = re.compile(settings.GetLintRegex())
4145 black_regex = re.compile(settings.GetLintIgnoreRegex())
4146 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4147 for filename in filenames:
4148 if white_regex.match(filename):
4149 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004150 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004151 else:
4152 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4153 extra_check_functions)
4154 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004155 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004156 finally:
4157 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004158 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004159 if cpplint._cpplint_state.error_count != 0:
4160 return 1
4161 return 0
4162
4163
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004164@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004165def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004166 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004167 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004168 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004169 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004170 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004171 parser.add_option('--all', action='store_true',
4172 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004173 parser.add_option('--parallel', action='store_true',
4174 help='Run all tests specified by input_api.RunTests in all '
4175 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004176 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004177
sbc@chromium.org71437c02015-04-09 19:29:40 +00004178 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004179 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004180 return 1
4181
Edward Lemur934836a2019-09-09 20:16:54 +00004182 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004183 if args:
4184 base_branch = args[0]
4185 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004186 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004187 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004188
Aaron Gable8076c282017-11-29 14:39:41 -08004189 if options.all:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004190 base_change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004191 files = [('M', f) for f in base_change.AllFiles()]
4192 change = presubmit_support.GitChange(
4193 base_change.Name(),
4194 base_change.FullDescriptionText(),
4195 base_change.RepositoryRoot(),
4196 files,
4197 base_change.issue,
4198 base_change.patchset,
4199 base_change.author_email,
4200 base_change._upstream)
4201 else:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004202 change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004203
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004204 cl.RunHook(
4205 committing=not options.upload,
4206 may_prompt=False,
4207 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004208 change=change,
4209 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004210 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004211
4212
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004213def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004214 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004215
4216 Works the same way as
4217 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4218 but can be called on demand on all platforms.
4219
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004220 The basic idea is to generate git hash of a state of the tree, original
4221 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004222 """
4223 lines = []
4224 tree_hash = RunGitSilent(['write-tree'])
4225 lines.append('tree %s' % tree_hash.strip())
4226 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4227 if code == 0:
4228 lines.append('parent %s' % parent.strip())
4229 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4230 lines.append('author %s' % author.strip())
4231 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4232 lines.append('committer %s' % committer.strip())
4233 lines.append('')
4234 # Note: Gerrit's commit-hook actually cleans message of some lines and
4235 # whitespace. This code is not doing this, but it clearly won't decrease
4236 # entropy.
4237 lines.append(message)
4238 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004239 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004240 return 'I%s' % change_hash.strip()
4241
4242
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004243def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004244 """Computes the remote branch ref to use for the CL.
4245
4246 Args:
4247 remote (str): The git remote for the CL.
4248 remote_branch (str): The git remote branch for the CL.
4249 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004250 """
4251 if not (remote and remote_branch):
4252 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004253
wittman@chromium.org455dc922015-01-26 20:15:50 +00004254 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004255 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004256 # refs, which are then translated into the remote full symbolic refs
4257 # below.
4258 if '/' not in target_branch:
4259 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4260 else:
4261 prefix_replacements = (
4262 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4263 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4264 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4265 )
4266 match = None
4267 for regex, replacement in prefix_replacements:
4268 match = re.search(regex, target_branch)
4269 if match:
4270 remote_branch = target_branch.replace(match.group(0), replacement)
4271 break
4272 if not match:
4273 # This is a branch path but not one we recognize; use as-is.
4274 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004275 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4276 # Handle the refs that need to land in different refs.
4277 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004278
wittman@chromium.org455dc922015-01-26 20:15:50 +00004279 # Create the true path to the remote branch.
4280 # Does the following translation:
4281 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4282 # * refs/remotes/origin/master -> refs/heads/master
4283 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4284 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4285 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4286 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4287 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4288 'refs/heads/')
4289 elif remote_branch.startswith('refs/remotes/branch-heads'):
4290 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004291
wittman@chromium.org455dc922015-01-26 20:15:50 +00004292 return remote_branch
4293
4294
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004295def cleanup_list(l):
4296 """Fixes a list so that comma separated items are put as individual items.
4297
4298 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4299 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4300 """
4301 items = sum((i.split(',') for i in l), [])
4302 stripped_items = (i.strip() for i in items)
4303 return sorted(filter(None, stripped_items))
4304
4305
Aaron Gable4db38df2017-11-03 14:59:07 -07004306@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004307@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004308def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004309 """Uploads the current changelist to codereview.
4310
4311 Can skip dependency patchset uploads for a branch by running:
4312 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004313 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004314 git config --unset branch.branch_name.skip-deps-uploads
4315 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004316
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004317 If the name of the checked out branch starts with "bug-" or "fix-" followed
4318 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004319 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004320
4321 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004322 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004323 [git-cl] add support for hashtags
4324 Foo bar: implement foo
4325 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004326 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004327 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4328 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004329 parser.add_option('--bypass-watchlists', action='store_true',
4330 dest='bypass_watchlists',
4331 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004332 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004333 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004334 parser.add_option('--message', '-m', dest='message',
4335 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004336 parser.add_option('-b', '--bug',
4337 help='pre-populate the bug number(s) for this issue. '
4338 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004339 parser.add_option('--message-file', dest='message_file',
4340 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004341 parser.add_option('--title', '-t', dest='title',
4342 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004343 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004344 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004345 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004346 parser.add_option('--tbrs',
4347 action='append', default=[],
4348 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004349 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004350 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004351 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004352 parser.add_option('--hashtag', dest='hashtags',
4353 action='append', default=[],
4354 help=('Gerrit hashtag for new CL; '
4355 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004356 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004357 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004358 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004359 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004360 metavar='TARGET',
4361 help='Apply CL to remote ref TARGET. ' +
4362 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004363 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004364 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004365 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004366 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004367 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004368 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004369 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4370 const='TBR', help='add a set of OWNERS to TBR')
4371 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4372 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004373 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004374 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004375 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004376 'implies --send-mail')
4377 parser.add_option('-d', '--cq-dry-run',
4378 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004379 help='Send the patchset to do a CQ dry run right after '
4380 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004381 parser.add_option('--preserve-tryjobs', action='store_true',
4382 help='instruct the CQ to let tryjobs running even after '
4383 'new patchsets are uploaded instead of canceling '
4384 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004385 parser.add_option('--dependencies', action='store_true',
4386 help='Uploads CLs of all the local branches that depend on '
4387 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004388 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4389 help='Sends your change to the CQ after an approval. Only '
4390 'works on repos that have the Auto-Submit label '
4391 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004392 parser.add_option('--parallel', action='store_true',
4393 help='Run all tests specified by input_api.RunTests in all '
4394 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004395 parser.add_option('--no-autocc', action='store_true',
4396 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004397 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004398 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004399 parser.add_option('-R', '--retry-failed', action='store_true',
4400 help='Retry failed tryjobs from old patchset immediately '
4401 'after uploading new patchset. Cannot be used with '
4402 '--use-commit-queue or --cq-dry-run.')
4403 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4404 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004405 parser.add_option('--fixed', '-x',
4406 help='List of bugs that will be commented on and marked '
4407 'fixed (pre-populates "Fixed:" tag). Same format as '
4408 '-b option / "Bug:" tag. If fixing several issues, '
4409 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004410 parser.add_option('--edit-description', action='store_true', default=False,
4411 help='Modify description before upload. Cannot be used '
4412 'with --force. It is a noop when --no-squash is set '
4413 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004414
rmistry@google.com2dd99862015-06-22 12:22:18 +00004415 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004416 (options, args) = parser.parse_args(args)
4417
sbc@chromium.org71437c02015-04-09 19:29:40 +00004418 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004419 return 1
4420
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004421 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004422 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004423 options.cc = cleanup_list(options.cc)
4424
Josipe827b0f2020-01-30 00:07:20 +00004425 if options.edit_description and options.force:
4426 parser.error('Only one of --force and --edit-description allowed')
4427
tandriib80458a2016-06-23 12:20:07 -07004428 if options.message_file:
4429 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004430 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004431 options.message = gclient_utils.FileRead(options.message_file)
4432 options.message_file = None
4433
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004434 if ([options.cq_dry_run,
4435 options.use_commit_queue,
4436 options.retry_failed].count(True) > 1):
4437 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4438 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004439
Aaron Gableedbc4132017-09-11 13:22:28 -07004440 if options.use_commit_queue:
4441 options.send_mail = True
4442
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004443 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4444 settings.GetIsGerrit()
4445
Edward Lemur934836a2019-09-09 20:16:54 +00004446 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004447 if options.retry_failed and not cl.GetIssue():
4448 print('No previous patchsets, so --retry-failed has no effect.')
4449 options.retry_failed = False
4450 # cl.GetMostRecentPatchset uses cached information, and can return the last
4451 # patchset before upload. Calling it here makes it clear that it's the
4452 # last patchset before upload. Note that GetMostRecentPatchset will fail
4453 # if no CL has been uploaded yet.
4454 if options.retry_failed:
4455 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004456
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004457 ret = cl.CMDUpload(options, args, orig_args)
4458
4459 if options.retry_failed:
4460 if ret != 0:
4461 print('Upload failed, so --retry-failed has no effect.')
4462 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004463 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004464 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004465 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004466 if len(buckets) == 0:
4467 print('No failed tryjobs, so --retry-failed has no effect.')
4468 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004469 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004470
4471 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004472
4473
Francois Dorayd42c6812017-05-30 15:10:20 -04004474@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004475@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004476def CMDsplit(parser, args):
4477 """Splits a branch into smaller branches and uploads CLs.
4478
4479 Creates a branch and uploads a CL for each group of files modified in the
4480 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004481 comment, '$directory' is replaced with the directory containing the changes
4482 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4483 sending out, and '$num_cls' is replaced with the total number of CLs that
4484 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004485 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004486 parser.add_option('-d', '--description', dest='description_file',
4487 help='A text file containing a CL description in which '
4488 '$directory will be replaced by each CL\'s directory.')
4489 parser.add_option('-c', '--comment', dest='comment_file',
4490 help='A text file containing a CL comment.')
4491 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004492 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004493 help='List the files and reviewers for each CL that would '
4494 'be created, but don\'t create branches or CLs.')
4495 parser.add_option('--cq-dry-run', action='store_true',
4496 help='If set, will do a cq dry run for each uploaded CL. '
4497 'Please be careful when doing this; more than ~10 CLs '
4498 'has the potential to overload our build '
4499 'infrastructure. Try to upload these not during high '
4500 'load times (usually 11-3 Mountain View time). Email '
4501 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004502 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4503 default=True,
4504 help='Sends your change to the CQ after an approval. Only '
4505 'works on repos that have the Auto-Submit label '
4506 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004507 options, _ = parser.parse_args(args)
4508
4509 if not options.description_file:
4510 parser.error('No --description flag specified.')
4511
4512 def WrappedCMDupload(args):
4513 return CMDupload(OptionParser(), args)
4514
4515 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004516 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004517 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004518
4519
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004520@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004521@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004522def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004523 """DEPRECATED: Used to commit the current changelist via git-svn."""
4524 message = ('git-cl no longer supports committing to SVN repositories via '
4525 'git-svn. You probably want to use `git cl land` instead.')
4526 print(message)
4527 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004528
4529
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004530@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004531@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004532def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004533 """Commits the current changelist via git.
4534
4535 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4536 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004537 """
4538 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4539 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004540 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004541 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004542 parser.add_option('--parallel', action='store_true',
4543 help='Run all tests specified by input_api.RunTests in all '
4544 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004545 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004546
Edward Lemur934836a2019-09-09 20:16:54 +00004547 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004548
Robert Iannucci2e73d432018-03-14 01:10:47 -07004549 if not cl.GetIssue():
4550 DieWithError('You must upload the change first to Gerrit.\n'
4551 ' If you would rather have `git cl land` upload '
4552 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004553 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004554 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004555
4556
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004557@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004558@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004559def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004560 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004561 parser.add_option('-b', dest='newbranch',
4562 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004563 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004564 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004565 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004566 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004567
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004568 group = optparse.OptionGroup(
4569 parser,
4570 'Options for continuing work on the current issue uploaded from a '
4571 'different clone (e.g. different machine). Must be used independently '
4572 'from the other options. No issue number should be specified, and the '
4573 'branch must have an issue number associated with it')
4574 group.add_option('--reapply', action='store_true', dest='reapply',
4575 help='Reset the branch and reapply the issue.\n'
4576 'CAUTION: This will undo any local changes in this '
4577 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004578
4579 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004580 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004581 parser.add_option_group(group)
4582
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004583 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004584
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004585 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004586 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004587 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004588 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004589 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004590
Edward Lemur934836a2019-09-09 20:16:54 +00004591 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004592 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004593 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004594
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004595 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004596 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004597 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004598
4599 RunGit(['reset', '--hard', upstream])
4600 if options.pull:
4601 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004602
Edward Lemur678a6842019-10-03 22:25:05 +00004603 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4604 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004605
4606 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004607 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004608
Edward Lemurf38bc172019-09-03 21:02:13 +00004609 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004610 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004611 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004612
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004613 # We don't want uncommitted changes mixed up with the patch.
4614 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004615 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004616
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004617 if options.newbranch:
4618 if options.force:
4619 RunGit(['branch', '-D', options.newbranch],
4620 stderr=subprocess2.PIPE, error_ok=True)
4621 RunGit(['new-branch', options.newbranch])
4622
Edward Lemur678a6842019-10-03 22:25:05 +00004623 cl = Changelist(
4624 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004625
Edward Lemur678a6842019-10-03 22:25:05 +00004626 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004627 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004628
Edward Lemurf38bc172019-09-03 21:02:13 +00004629 return cl.CMDPatchWithParsedIssue(
4630 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004631
4632
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004633def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004634 """Fetches the tree status and returns either 'open', 'closed',
4635 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004636 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004637 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004638 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004639 if status.find('closed') != -1 or status == '0':
4640 return 'closed'
4641 elif status.find('open') != -1 or status == '1':
4642 return 'open'
4643 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004644 return 'unset'
4645
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004646
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004647def GetTreeStatusReason():
4648 """Fetches the tree status from a json url and returns the message
4649 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004650 url = settings.GetTreeStatusUrl()
4651 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004652 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004653 status = json.loads(connection.read())
4654 connection.close()
4655 return status['message']
4656
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004657
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004658@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004659def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004660 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004661 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004662 status = GetTreeStatus()
4663 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004664 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004665 return 2
4666
vapiera7fbd5a2016-06-16 09:17:49 -07004667 print('The tree is %s' % status)
4668 print()
4669 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004670 if status != 'open':
4671 return 1
4672 return 0
4673
4674
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004675@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004676def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004677 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4678 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004679 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004680 '-b', '--bot', action='append',
4681 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4682 'times to specify multiple builders. ex: '
4683 '"-b win_rel -b win_layout". See '
4684 'the try server waterfall for the builders name and the tests '
4685 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004686 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004687 '-B', '--bucket', default='',
4688 help=('Buildbucket bucket to send the try requests.'))
4689 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004690 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004691 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004692 'be determined by the try recipe that builder runs, which usually '
4693 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004694 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004695 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004696 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004697 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004698 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004699 '--category', default='git_cl_try', help='Specify custom build category.')
4700 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004701 '--project',
4702 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004703 'in recipe to determine to which repository or directory to '
4704 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004705 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004706 '-p', '--property', dest='properties', action='append', default=[],
4707 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004708 'key2=value2 etc. The value will be treated as '
4709 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004710 'NOTE: using this may make your tryjob not usable for CQ, '
4711 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004712 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004713 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4714 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004715 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004716 parser.add_option(
4717 '-R', '--retry-failed', action='store_true', default=False,
4718 help='Retry failed jobs from the latest set of tryjobs. '
4719 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004720 parser.add_option(
4721 '-i', '--issue', type=int,
4722 help='Operate on this issue instead of the current branch\'s implicit '
4723 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004724 options, args = parser.parse_args(args)
4725
machenbach@chromium.org45453142015-09-15 08:45:22 +00004726 # Make sure that all properties are prop=value pairs.
4727 bad_params = [x for x in options.properties if '=' not in x]
4728 if bad_params:
4729 parser.error('Got properties with missing "=": %s' % bad_params)
4730
maruel@chromium.org15192402012-09-06 12:38:29 +00004731 if args:
4732 parser.error('Unknown arguments: %s' % args)
4733
Edward Lemur934836a2019-09-09 20:16:54 +00004734 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004735 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004736 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004737
Edward Lemurf38bc172019-09-03 21:02:13 +00004738 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004739 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004740
tandriie113dfd2016-10-11 10:20:12 -07004741 error_message = cl.CannotTriggerTryJobReason()
4742 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004743 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004744
Quinten Yearsley983111f2019-09-26 17:18:48 +00004745 if options.retry_failed:
4746 if options.bot or options.bucket:
4747 print('ERROR: The option --retry-failed is not compatible with '
4748 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4749 return 1
4750 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004751 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004752 if options.verbose:
4753 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004754 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004755 if not buckets:
4756 print('There are no failed jobs in the latest set of jobs '
4757 '(patchset #%d), doing nothing.' % patchset)
4758 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004759 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004760 if num_builders > 10:
4761 confirm_or_exit('There are %d builders with failed builds.'
4762 % num_builders, action='continue')
4763 else:
4764 buckets = _get_bucket_map(cl, options, parser)
4765 if buckets and any(b.startswith('master.') for b in buckets):
4766 print('ERROR: Buildbot masters are not supported.')
4767 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004768
qyearsleydd49f942016-10-28 11:57:22 -07004769 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4770 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004771 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004772 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004773 print('git cl try with no bots now defaults to CQ dry run.')
4774 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4775 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004776
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004777 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004778 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004779 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004780 'of bot requires an initial job from a parent (usually a builder). '
4781 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004782 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004783 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004784
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004785 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004786 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004787 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004788 except BuildbucketResponseException as ex:
4789 print('ERROR: %s' % ex)
4790 return 1
4791 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004792
4793
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004794@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004795def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004796 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004797 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004798 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004799 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004800 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004801 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004802 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004803 '--color', action='store_true', default=setup_color.IS_TTY,
4804 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004805 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004806 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4807 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004808 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004809 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004810 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004811 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004812 parser.add_option(
4813 '-i', '--issue', type=int,
4814 help='Operate on this issue instead of the current branch\'s implicit '
4815 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004816 options, args = parser.parse_args(args)
4817 if args:
4818 parser.error('Unrecognized args: %s' % ' '.join(args))
4819
Edward Lemur934836a2019-09-09 20:16:54 +00004820 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004821 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004822 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004823
tandrii221ab252016-10-06 08:12:04 -07004824 patchset = options.patchset
4825 if not patchset:
4826 patchset = cl.GetMostRecentPatchset()
4827 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004828 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004829 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004830 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004831 cl.GetIssue())
4832
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004833 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004834 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004835 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004836 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004837 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004838 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004839 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004840 else:
4841 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004842 return 0
4843
4844
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004845@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004846@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004847def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004848 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004849 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004850 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004851 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004852
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004853 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004854 if args:
4855 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004856 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004857 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004858 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004859 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004860
4861 # Clear configured merge-base, if there is one.
4862 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004863 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004864 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004865 return 0
4866
4867
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004868@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004869def CMDweb(parser, args):
4870 """Opens the current CL in the web browser."""
4871 _, args = parser.parse_args(args)
4872 if args:
4873 parser.error('Unrecognized args: %s' % ' '.join(args))
4874
4875 issue_url = Changelist().GetIssueURL()
4876 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004877 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004878 return 1
4879
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004880 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004881 # allows us to hide the "Created new window in existing browser session."
4882 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004883 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004884 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004885 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004886 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004887 os.open(os.devnull, os.O_RDWR)
4888 try:
4889 webbrowser.open(issue_url)
4890 finally:
4891 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004892 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004893 return 0
4894
4895
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004896@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004897def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004898 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004899 parser.add_option('-d', '--dry-run', action='store_true',
4900 help='trigger in dry run mode')
4901 parser.add_option('-c', '--clear', action='store_true',
4902 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004903 parser.add_option(
4904 '-i', '--issue', type=int,
4905 help='Operate on this issue instead of the current branch\'s implicit '
4906 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004907 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004908 if args:
4909 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004910 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004911 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004912
Edward Lemur934836a2019-09-09 20:16:54 +00004913 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004914 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004915 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004916 elif options.dry_run:
4917 state = _CQState.DRY_RUN
4918 else:
4919 state = _CQState.COMMIT
4920 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004921 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004922 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004923 return 0
4924
4925
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004926@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004927def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004928 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004929 parser.add_option(
4930 '-i', '--issue', type=int,
4931 help='Operate on this issue instead of the current branch\'s implicit '
4932 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004933 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004934 if args:
4935 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004936 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004937 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004938 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004939 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004940 cl.CloseIssue()
4941 return 0
4942
4943
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004944@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004945def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004946 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004947 parser.add_option(
4948 '--stat',
4949 action='store_true',
4950 dest='stat',
4951 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004952 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004953 if args:
4954 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004955
Edward Lemur934836a2019-09-09 20:16:54 +00004956 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004957 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004958 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004959 if not issue:
4960 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004961
Aaron Gablea718c3e2017-08-28 17:47:28 -07004962 base = cl._GitGetBranchConfigValue('last-upload-hash')
4963 if not base:
4964 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4965 if not base:
4966 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4967 revision_info = detail['revisions'][detail['current_revision']]
4968 fetch_info = revision_info['fetch']['http']
4969 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4970 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004971
Aaron Gablea718c3e2017-08-28 17:47:28 -07004972 cmd = ['git', 'diff']
4973 if options.stat:
4974 cmd.append('--stat')
4975 cmd.append(base)
4976 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004977
4978 return 0
4979
4980
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004981@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004982def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004983 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004984 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004985 '--ignore-current',
4986 action='store_true',
4987 help='Ignore the CL\'s current reviewers and start from scratch.')
4988 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004989 '--ignore-self',
4990 action='store_true',
4991 help='Do not consider CL\'s author as an owners.')
4992 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004993 '--no-color',
4994 action='store_true',
4995 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004996 parser.add_option(
4997 '--batch',
4998 action='store_true',
4999 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005000 # TODO: Consider moving this to another command, since other
5001 # git-cl owners commands deal with owners for a given CL.
5002 parser.add_option(
5003 '--show-all',
5004 action='store_true',
5005 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005006 options, args = parser.parse_args(args)
5007
5008 author = RunGit(['config', 'user.email']).strip() or None
5009
Edward Lemur934836a2019-09-09 20:16:54 +00005010 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005011
Yang Guo6e269a02019-06-26 11:17:02 +00005012 if options.show_all:
5013 for arg in args:
5014 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00005015 database = owners.Database(settings.GetRoot(), file, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00005016 database.load_data_needed_for([arg])
5017 print('Owners for %s:' % arg)
5018 for owner in sorted(database.all_possible_owners([arg], None)):
5019 print(' - %s' % owner)
5020 return 0
5021
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005022 if args:
5023 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005024 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005025 base_branch = args[0]
5026 else:
5027 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005028 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005029
Edward Lemur7f6dec02020-02-06 20:23:58 +00005030 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005031 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5032
5033 if options.batch:
5034 db = owners.Database(change.RepositoryRoot(), file, os.path)
5035 print('\n'.join(db.reviewers_for(affected_files, author)))
5036 return 0
5037
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005038 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005039 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005040 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005041 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005042 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005043 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005044 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005045 override_files=change.OriginalOwnersFiles(),
5046 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005047
5048
Aiden Bennerc08566e2018-10-03 17:52:42 +00005049def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005050 """Generates a diff command."""
5051 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005052 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5053
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005054 if allow_prefix:
5055 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5056 # case that diff.noprefix is set in the user's git config.
5057 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5058 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005059 diff_cmd += ['--no-prefix']
5060
5061 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005062
5063 if args:
5064 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005065 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005066 diff_cmd.append(arg)
5067 else:
5068 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005069
5070 return diff_cmd
5071
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005072
Jamie Madill5e96ad12020-01-13 16:08:35 +00005073def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5074 """Runs clang-format-diff and sets a return value if necessary."""
5075
5076 if not clang_diff_files:
5077 return 0
5078
5079 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5080 # formatted. This is used to block during the presubmit.
5081 return_value = 0
5082
5083 # Locate the clang-format binary in the checkout
5084 try:
5085 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5086 except clang_format.NotFoundError as e:
5087 DieWithError(e)
5088
5089 if opts.full or settings.GetFormatFullByDefault():
5090 cmd = [clang_format_tool]
5091 if not opts.dry_run and not opts.diff:
5092 cmd.append('-i')
5093 if opts.dry_run:
5094 for diff_file in clang_diff_files:
5095 with open(diff_file, 'r') as myfile:
5096 code = myfile.read().replace('\r\n', '\n')
5097 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5098 stdout = stdout.replace('\r\n', '\n')
5099 if opts.diff:
5100 sys.stdout.write(stdout)
5101 if code != stdout:
5102 return_value = 2
5103 else:
5104 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5105 if opts.diff:
5106 sys.stdout.write(stdout)
5107 else:
5108 env = os.environ.copy()
5109 env['PATH'] = str(os.path.dirname(clang_format_tool))
5110 try:
5111 script = clang_format.FindClangFormatScriptInChromiumTree(
5112 'clang-format-diff.py')
5113 except clang_format.NotFoundError as e:
5114 DieWithError(e)
5115
5116 cmd = [sys.executable, script, '-p0']
5117 if not opts.dry_run and not opts.diff:
5118 cmd.append('-i')
5119
5120 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5121 diff_output = RunGit(diff_cmd)
5122
5123 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5124 if opts.diff:
5125 sys.stdout.write(stdout)
5126 if opts.dry_run and len(stdout) > 0:
5127 return_value = 2
5128
5129 return return_value
5130
5131
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005132def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005133 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005134 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005135
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005136
enne@chromium.org555cfe42014-01-29 18:21:39 +00005137@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005138@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005139def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005140 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005141 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005142 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005143 parser.add_option('--full', action='store_true',
5144 help='Reformat the full content of all touched files')
5145 parser.add_option('--dry-run', action='store_true',
5146 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005147 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005148 '--no-clang-format',
5149 dest='clang_format',
5150 action='store_false',
5151 default=True,
5152 help='Disables formatting of various file types using clang-format.')
5153 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005154 '--python',
5155 action='store_true',
5156 default=None,
5157 help='Enables python formatting on all python files.')
5158 parser.add_option(
5159 '--no-python',
5160 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005161 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005162 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005163 'If neither --python or --no-python are set, python files that have a '
5164 '.style.yapf file in an ancestor directory will be formatted. '
5165 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005166 parser.add_option(
5167 '--js',
5168 action='store_true',
5169 help='Format javascript code with clang-format. '
5170 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005171 parser.add_option('--diff', action='store_true',
5172 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005173 parser.add_option('--presubmit', action='store_true',
5174 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005175 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005176
Garrett Beaty91a6f332020-01-06 16:57:24 +00005177 if opts.python is not None and opts.no_python:
5178 raise parser.error('Cannot set both --python and --no-python')
5179 if opts.no_python:
5180 opts.python = False
5181
Daniel Chengc55eecf2016-12-30 03:11:02 -08005182 # Normalize any remaining args against the current path, so paths relative to
5183 # the current directory are still resolved as expected.
5184 args = [os.path.join(os.getcwd(), arg) for arg in args]
5185
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005186 # git diff generates paths against the root of the repository. Change
5187 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005188 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005189 if rel_base_path:
5190 os.chdir(rel_base_path)
5191
digit@chromium.org29e47272013-05-17 17:01:46 +00005192 # Grab the merge-base commit, i.e. the upstream commit of the current
5193 # branch when it was created or the last time it was rebased. This is
5194 # to cover the case where the user may have called "git fetch origin",
5195 # moving the origin branch to a newer commit, but hasn't rebased yet.
5196 upstream_commit = None
5197 cl = Changelist()
5198 upstream_branch = cl.GetUpstreamBranch()
5199 if upstream_branch:
5200 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5201 upstream_commit = upstream_commit.strip()
5202
5203 if not upstream_commit:
5204 DieWithError('Could not find base commit for this branch. '
5205 'Are you in detached state?')
5206
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005207 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5208 diff_output = RunGit(changed_files_cmd)
5209 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005210 # Filter out files deleted by this CL
5211 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005212
Andreas Haas417d89c2020-02-06 10:24:27 +00005213 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005214 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005215
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005216 clang_diff_files = []
5217 if opts.clang_format:
5218 clang_diff_files = [
5219 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5220 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005221 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5222 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005223 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005224
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005225 top_dir = os.path.normpath(
5226 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5227
Jamie Madill5e96ad12020-01-13 16:08:35 +00005228 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5229 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005230
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005231 # Similar code to above, but using yapf on .py files rather than clang-format
5232 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005233 py_explicitly_disabled = opts.python is not None and not opts.python
5234 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005235 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5236 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5237 if sys.platform.startswith('win'):
5238 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005239
Aiden Bennerc08566e2018-10-03 17:52:42 +00005240 # Used for caching.
5241 yapf_configs = {}
5242 for f in python_diff_files:
5243 # Find the yapf style config for the current file, defaults to depot
5244 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005245 _FindYapfConfigFile(f, yapf_configs, top_dir)
5246
5247 # Turn on python formatting by default if a yapf config is specified.
5248 # This breaks in the case of this repo though since the specified
5249 # style file is also the global default.
5250 if opts.python is None:
5251 filtered_py_files = []
5252 for f in python_diff_files:
5253 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5254 filtered_py_files.append(f)
5255 else:
5256 filtered_py_files = python_diff_files
5257
5258 # Note: yapf still seems to fix indentation of the entire file
5259 # even if line ranges are specified.
5260 # See https://github.com/google/yapf/issues/499
5261 if not opts.full and filtered_py_files:
5262 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5263
Brian Sheedyb4307d52019-12-02 19:18:17 +00005264 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5265 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5266 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005267
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005268 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005269 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5270 # Default to pep8 if not .style.yapf is found.
5271 if not yapf_style:
5272 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005273
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005274 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005275
5276 has_formattable_lines = False
5277 if not opts.full:
5278 # Only run yapf over changed line ranges.
5279 for diff_start, diff_len in py_line_diffs[f]:
5280 diff_end = diff_start + diff_len - 1
5281 # Yapf errors out if diff_end < diff_start but this
5282 # is a valid line range diff for a removal.
5283 if diff_end >= diff_start:
5284 has_formattable_lines = True
5285 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5286 # If all line diffs were removals we have nothing to format.
5287 if not has_formattable_lines:
5288 continue
5289
5290 if opts.diff or opts.dry_run:
5291 cmd += ['--diff']
5292 # Will return non-zero exit code if non-empty diff.
5293 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5294 if opts.diff:
5295 sys.stdout.write(stdout)
5296 elif len(stdout) > 0:
5297 return_value = 2
5298 else:
5299 cmd += ['-i']
5300 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005301
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005302 # Dart's formatter does not have the nice property of only operating on
5303 # modified chunks, so hard code full.
5304 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005305 try:
5306 command = [dart_format.FindDartFmtToolInChromiumTree()]
5307 if not opts.dry_run and not opts.diff:
5308 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005309 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005310
ppi@chromium.org6593d932016-03-03 15:41:15 +00005311 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005312 if opts.dry_run and stdout:
5313 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005314 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005315 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5316 'found in this checkout. Files in other languages are still '
5317 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005318
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005319 # Format GN build files. Always run on full build files for canonical form.
5320 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005321 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005322 if opts.dry_run or opts.diff:
5323 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005324 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005325 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5326 shell=sys.platform == 'win32',
5327 cwd=top_dir)
5328 if opts.dry_run and gn_ret == 2:
5329 return_value = 2 # Not formatted.
5330 elif opts.diff and gn_ret == 2:
5331 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005332 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005333 elif gn_ret != 0:
5334 # For non-dry run cases (and non-2 return values for dry-run), a
5335 # nonzero error code indicates a failure, probably because the file
5336 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005337 DieWithError('gn format failed on ' + gn_diff_file +
5338 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005339
Ilya Shermane081cbe2017-08-15 17:51:04 -07005340 # Skip the metrics formatting from the global presubmit hook. These files have
5341 # a separate presubmit hook that issues an error if the files need formatting,
5342 # whereas the top-level presubmit script merely issues a warning. Formatting
5343 # these files is somewhat slow, so it's important not to duplicate the work.
5344 if not opts.presubmit:
5345 for xml_dir in GetDirtyMetricsDirs(diff_files):
5346 tool_dir = os.path.join(top_dir, xml_dir)
5347 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5348 if opts.dry_run or opts.diff:
5349 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005350 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005351 if opts.diff:
5352 sys.stdout.write(stdout)
5353 if opts.dry_run and stdout:
5354 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005355
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005356 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005357
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005358
Steven Holte2e664bf2017-04-21 13:10:47 -07005359def GetDirtyMetricsDirs(diff_files):
5360 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5361 metrics_xml_dirs = [
5362 os.path.join('tools', 'metrics', 'actions'),
5363 os.path.join('tools', 'metrics', 'histograms'),
5364 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005365 os.path.join('tools', 'metrics', 'ukm'),
5366 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005367 for xml_dir in metrics_xml_dirs:
5368 if any(file.startswith(xml_dir) for file in xml_diff_files):
5369 yield xml_dir
5370
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005371
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005372@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005373@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005374def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005375 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005376 _, args = parser.parse_args(args)
5377
5378 if len(args) != 1:
5379 parser.print_help()
5380 return 1
5381
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005382 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005383 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005384 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005385
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005386 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005387
Edward Lemur52969c92020-02-06 18:15:28 +00005388 issueprefix = Changelist.IssueConfigKey()
5389 output = RunGit(['config', '--local', '--get-regexp',
5390 r'branch\..*\.%s' % issueprefix],
5391 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005392
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005393 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005394 for key, issue in [x.split() for x in output.splitlines()]:
5395 if issue == target_issue:
5396 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5397
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005398 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005399 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005400 return 1
5401 if len(branches) == 1:
5402 RunGit(['checkout', branches[0]])
5403 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005404 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005405 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005406 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005407 which = raw_input('Choose by index: ')
5408 try:
5409 RunGit(['checkout', branches[int(which)]])
5410 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005411 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005412 return 1
5413
5414 return 0
5415
5416
maruel@chromium.org29404b52014-09-08 22:58:00 +00005417def CMDlol(parser, args):
5418 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005419 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005420 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5421 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5422 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005423 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005424 return 0
5425
5426
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005427class OptionParser(optparse.OptionParser):
5428 """Creates the option parse and add --verbose support."""
5429 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005430 optparse.OptionParser.__init__(
5431 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005432 self.add_option(
5433 '-v', '--verbose', action='count', default=0,
5434 help='Use 2 times for more debugging info')
5435
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005436 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005437 try:
5438 return self._parse_args(args)
5439 finally:
5440 # Regardless of success or failure of args parsing, we want to report
5441 # metrics, but only after logging has been initialized (if parsing
5442 # succeeded).
5443 global settings
5444 settings = Settings()
5445
5446 if not metrics.DISABLE_METRICS_COLLECTION:
5447 # GetViewVCUrl ultimately calls logging method.
5448 project_url = settings.GetViewVCUrl().strip('/+')
5449 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5450 metrics.collector.add('project_urls', [project_url])
5451
5452 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005453 # Create an optparse.Values object that will store only the actual passed
5454 # options, without the defaults.
5455 actual_options = optparse.Values()
5456 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5457 # Create an optparse.Values object with the default options.
5458 options = optparse.Values(self.get_default_values().__dict__)
5459 # Update it with the options passed by the user.
5460 options._update_careful(actual_options.__dict__)
5461 # Store the options passed by the user in an _actual_options attribute.
5462 # We store only the keys, and not the values, since the values can contain
5463 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005464 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005465
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005466 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005467 logging.basicConfig(
5468 level=levels[min(options.verbose, len(levels) - 1)],
5469 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5470 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005471
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005472 return options, args
5473
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005474
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005475def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005476 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005477 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005478 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005479 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005480
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005481 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005482 dispatcher = subcommand.CommandDispatcher(__name__)
5483 try:
5484 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005485 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005486 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005487 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005488 if e.code != 500:
5489 raise
5490 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005491 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005492 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005493 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005494
5495
5496if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005497 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5498 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005499 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005500 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005501 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005502 sys.exit(main(sys.argv[1:]))