blob: 7ea25f2209f58adc931c434e477ba0d2be3e129f [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:
410 change = changelist.GetChange(
411 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700412 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700413 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700414 change=change,
415 changed_files=change.LocalPaths(),
416 repository_root=settings.GetRoot(),
417 default_presubmit=None,
418 project=None,
419 verbose=options.verbose,
420 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700421 if masters is None:
422 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000423 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700424
qyearsley1fdfcb62016-10-24 13:22:03 -0700425 if options.bucket:
426 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000427 option_parser.error(
Edward Lemur5ef16a32019-11-11 21:13:25 +0000428 'Please specify the bucket, e.g. "-B chromium/try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700429
430
Edward Lemur6215c792019-10-03 21:59:05 +0000431def _parse_bucket(raw_bucket):
432 legacy = True
433 project = bucket = None
434 if '/' in raw_bucket:
435 legacy = False
436 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000437 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000438 elif raw_bucket.startswith('luci.'):
439 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000440 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000441 elif '.' in raw_bucket:
442 project = raw_bucket.split('.')[0]
443 bucket = raw_bucket
444 # Legacy buckets.
445 if legacy:
446 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
447 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000448
449
Edward Lemur5b929a42019-10-21 17:57:39 +0000450def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000451 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700452
453 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000454 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700455 buckets: A nested dict mapping bucket names to builders to tests.
456 options: Command-line options.
457 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000458 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000459 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000460 print('Bucket:', bucket)
461 print('\n'.join(
462 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000463 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000464 print('To see results here, run: git cl try-results')
465 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700466
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000467 requests = _make_try_job_schedule_requests(
468 changelist, buckets, options, patchset)
469 if not requests:
470 return
471
Edward Lemur5b929a42019-10-21 17:57:39 +0000472 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000473 http.force_exception_to_status_code = True
474
475 batch_request = {'requests': requests}
476 batch_response = _call_buildbucket(
477 http, options.buildbucket_host, 'Batch', batch_request)
478
479 errors = [
480 ' ' + response['error']['message']
481 for response in batch_response.get('responses', [])
482 if 'error' in response
483 ]
484 if errors:
485 raise BuildbucketResponseException(
486 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
487
488
489def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000490 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000491 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000492 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000493 shared_properties['clobber'] = True
494 shared_properties.update(_get_properties_from_options(options) or {})
495
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000496 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
497 if options.retry_failed:
498 shared_tags.append({'key': 'retry_failed',
499 'value': '1'})
500
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000501 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000502 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000503 project, bucket = _parse_bucket(raw_bucket)
504 if not project or not bucket:
505 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
506 continue
507
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000508 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000509 properties = shared_properties.copy()
510 if 'presubmit' in builder.lower():
511 properties['dry_run'] = 'true'
512 if tests:
513 properties['testfilter'] = tests
514
515 requests.append({
516 'scheduleBuild': {
517 'requestId': str(uuid.uuid4()),
518 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000519 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000520 'bucket': bucket,
521 'builder': builder,
522 },
523 'gerritChanges': gerrit_changes,
524 'properties': properties,
525 'tags': [
526 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000527 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000528 }
529 })
Anthony Polito1a5fe232020-01-24 23:17:52 +0000530
531 if options.revision:
532 requests[-1]['scheduleBuild']['gitilesCommit'] = {
533 'host': gerrit_changes[0]['host'],
534 'project': gerrit_changes[0]['project'],
535 'id': options.revision
536 }
537
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000538 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000539
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000540
Edward Lemur5b929a42019-10-21 17:57:39 +0000541def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000542 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000543
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000544 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000546 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000547 request = {
548 'predicate': {
549 'gerritChanges': [changelist.GetGerritChange(patchset)],
550 },
551 'fields': ','.join('builds.*.' + field for field in fields),
552 }
tandrii221ab252016-10-06 08:12:04 -0700553
Edward Lemur5b929a42019-10-21 17:57:39 +0000554 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000555 if authenticator.has_cached_credentials():
556 http = authenticator.authorize(httplib2.Http())
557 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700558 print('Warning: Some results might be missing because %s' %
559 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000560 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000561 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 http.force_exception_to_status_code = True
563
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000564 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
565 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566
Edward Lemur5b929a42019-10-21 17:57:39 +0000567def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000568 """Fetches builds from the latest patchset that has builds (within
569 the last few patchsets).
570
571 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000572 changelist (Changelist): The CL to fetch builds for
573 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000574 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
575 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000576 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000577 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
578 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000579 """
580 assert buildbucket_host
581 assert changelist.GetIssue(), 'CL must be uploaded first'
582 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000583 if latest_patchset is None:
584 assert changelist.GetMostRecentPatchset()
585 ps = changelist.GetMostRecentPatchset()
586 else:
587 assert latest_patchset > 0, latest_patchset
588 ps = latest_patchset
589
Quinten Yearsley983111f2019-09-26 17:18:48 +0000590 min_ps = max(1, ps - 5)
591 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000592 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000593 if len(builds):
594 return builds, ps
595 ps -= 1
596 return [], 0
597
598
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000599def _filter_failed_for_retry(all_builds):
600 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000601
602 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000603 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000604 i.e. a list of buildbucket.v2.Builds which includes status and builder
605 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000606
607 Returns:
608 A dict of bucket to builder to tests (empty list). This is the same format
609 accepted by _trigger_try_jobs and returned by _get_bucket_map.
610 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000611
612 def _builder_of(build):
613 builder = build['builder']
614 return (builder['project'], builder['bucket'], builder['builder'])
615
616 res = collections.defaultdict(dict)
617 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
618 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
619 # If builder had several builds, retry only if the last one failed.
620 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
621 # build, but in case of retrying failed jobs retrying a flaky one makes
622 # sense.
623 builds = list(builds)
624 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
625 continue
626 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
627 for t in builds[-1]['tags']):
628 # Don't retry experimental build previously triggered by CQ.
629 continue
630 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
631 # Don't retry if any are running.
632 continue
633 res[proj + '/' + buck][bldr] = []
634 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000635
636
qyearsleyeab3c042016-08-24 09:18:28 -0700637def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000638 """Prints nicely result of fetch_try_jobs."""
639 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000640 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000641 return
642
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000643 longest_builder = max(len(b['builder']['builder']) for b in builds)
644 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000645 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000646 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
647 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000648
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000649 builds_by_status = {}
650 for b in builds:
651 builds_by_status.setdefault(b['status'], []).append({
652 'id': b['id'],
653 'name': name_fmt.format(
654 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
655 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000656
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000657 sort_key = lambda b: (b['name'], b['id'])
658
659 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000661 if not builds:
662 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000663
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000664 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000665 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000666 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000667 else:
668 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
669
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000670 print(colorize(title))
671 for b in sorted(builds, key=sort_key):
672 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000673
674 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000675 print_builds(
676 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
677 print_builds(
678 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
679 color=Fore.MAGENTA)
680 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
681 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
682 color=Fore.MAGENTA)
683 print_builds('Started:', builds_by_status.pop('STARTED', []))
684 print_builds(
685 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000686 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000687 print_builds(
688 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000689 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000690
691
Aiden Bennerc08566e2018-10-03 17:52:42 +0000692def _ComputeDiffLineRanges(files, upstream_commit):
693 """Gets the changed line ranges for each file since upstream_commit.
694
695 Parses a git diff on provided files and returns a dict that maps a file name
696 to an ordered list of range tuples in the form (start_line, count).
697 Ranges are in the same format as a git diff.
698 """
699 # If files is empty then diff_output will be a full diff.
700 if len(files) == 0:
701 return {}
702
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000703 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000704 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000705 diff_output = RunGit(diff_cmd)
706
707 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
708 # 2 capture groups
709 # 0 == fname of diff file
710 # 1 == 'diff_start,diff_count' or 'diff_start'
711 # will match each of
712 # diff --git a/foo.foo b/foo.py
713 # @@ -12,2 +14,3 @@
714 # @@ -12,2 +17 @@
715 # running re.findall on the above string with pattern will give
716 # [('foo.py', ''), ('', '14,3'), ('', '17')]
717
718 curr_file = None
719 line_diffs = {}
720 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
721 if match[0] != '':
722 # Will match the second filename in diff --git a/a.py b/b.py.
723 curr_file = match[0]
724 line_diffs[curr_file] = []
725 else:
726 # Matches +14,3
727 if ',' in match[1]:
728 diff_start, diff_count = match[1].split(',')
729 else:
730 # Single line changes are of the form +12 instead of +12,1.
731 diff_start = match[1]
732 diff_count = 1
733
734 diff_start = int(diff_start)
735 diff_count = int(diff_count)
736
737 # If diff_count == 0 this is a removal we can ignore.
738 line_diffs[curr_file].append((diff_start, diff_count))
739
740 return line_diffs
741
742
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000743def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000744 """Checks if a yapf file is in any parent directory of fpath until top_dir.
745
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000746 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000747 is found returns None. Uses yapf_config_cache as a cache for previously found
748 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000749 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000750 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000751 # Return result if we've already computed it.
752 if fpath in yapf_config_cache:
753 return yapf_config_cache[fpath]
754
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000755 parent_dir = os.path.dirname(fpath)
756 if os.path.isfile(fpath):
757 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000758 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000759 # Otherwise fpath is a directory
760 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
761 if os.path.isfile(yapf_file):
762 ret = yapf_file
763 elif fpath == top_dir or parent_dir == fpath:
764 # If we're at the top level directory, or if we're at root
765 # there is no provided style.
766 ret = None
767 else:
768 # Otherwise recurse on the current directory.
769 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000770 yapf_config_cache[fpath] = ret
771 return ret
772
773
Brian Sheedyb4307d52019-12-02 19:18:17 +0000774def _GetYapfIgnorePatterns(top_dir):
775 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000776
777 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
778 but this functionality appears to break when explicitly passing files to
779 yapf for formatting. According to
780 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
781 the .yapfignore file should be in the directory that yapf is invoked from,
782 which we assume to be the top level directory in this case.
783
784 Args:
785 top_dir: The top level directory for the repository being formatted.
786
787 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000788 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000789 """
790 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000791 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000792 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000793 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000794
Brian Sheedyb4307d52019-12-02 19:18:17 +0000795 with open(yapfignore_file) as f:
796 for line in f.readlines():
797 stripped_line = line.strip()
798 # Comments and blank lines should be ignored.
799 if stripped_line.startswith('#') or stripped_line == '':
800 continue
801 ignore_patterns.add(stripped_line)
802 return ignore_patterns
803
804
805def _FilterYapfIgnoredFiles(filepaths, patterns):
806 """Filters out any filepaths that match any of the given patterns.
807
808 Args:
809 filepaths: An iterable of strings containing filepaths to filter.
810 patterns: An iterable of strings containing fnmatch patterns to filter on.
811
812 Returns:
813 A list of strings containing all the elements of |filepaths| that did not
814 match any of the patterns in |patterns|.
815 """
816 # Not inlined so that tests can use the same implementation.
817 return [f for f in filepaths
818 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000819
820
Aaron Gable13101a62018-02-09 13:20:41 -0800821def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000822 """Prints statistics about the change to the user."""
823 # --no-ext-diff is broken in some versions of Git, so try to work around
824 # this by overriding the environment (but there is still a problem if the
825 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000826 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000827 if 'GIT_EXTERNAL_DIFF' in env:
828 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000829
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000830 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800831 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000832 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000833
834
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000835class BuildbucketResponseException(Exception):
836 pass
837
838
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000839class Settings(object):
840 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000841 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000842 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000843 self.tree_status_url = None
844 self.viewvc_url = None
845 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000846 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000847 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000848 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000849 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000850 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000851
852 def LazyUpdateIfNeeded(self):
853 """Updates the settings from a codereview.settings file, if available."""
854 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000855 # The only value that actually changes the behavior is
856 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000857 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000858 error_ok=True
859 ).strip().lower()
860
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000861 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000862 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000863 LoadCodereviewSettingsFromFile(cr_settings_file)
Josip906bfde2020-01-31 22:38:49 +0000864 cr_settings_file.close()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000865 self.updated = True
866
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000867 @staticmethod
868 def GetRelativeRoot():
869 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000870
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000871 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000872 if self.root is None:
873 self.root = os.path.abspath(self.GetRelativeRoot())
874 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000875
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000876 def GetTreeStatusUrl(self, error_ok=False):
877 if not self.tree_status_url:
878 error_message = ('You must configure your tree status URL by running '
879 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000880 self.tree_status_url = self._GetConfig(
881 'rietveld.tree-status-url', error_ok=error_ok,
882 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000883 return self.tree_status_url
884
885 def GetViewVCUrl(self):
886 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000887 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000888 return self.viewvc_url
889
rmistry@google.com90752582014-01-14 21:04:50 +0000890 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000891 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000892
rmistry@google.com5626a922015-02-26 14:03:30 +0000893 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000894 run_post_upload_hook = self._GetConfig(
895 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000896 return run_post_upload_hook == "True"
897
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000898 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000899 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000900
ukai@chromium.orge8077812012-02-03 03:41:46 +0000901 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000902 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000903 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700904 self.is_gerrit = (
905 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000906 return self.is_gerrit
907
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000908 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000909 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000910 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700911 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
912 if self.squash_gerrit_uploads is None:
913 # Default is squash now (http://crbug.com/611892#c23).
914 self.squash_gerrit_uploads = not (
915 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
916 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000917 return self.squash_gerrit_uploads
918
tandriia60502f2016-06-20 02:01:53 -0700919 def GetSquashGerritUploadsOverride(self):
920 """Return True or False if codereview.settings should be overridden.
921
922 Returns None if no override has been defined.
923 """
924 # See also http://crbug.com/611892#c23
925 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
926 error_ok=True).strip()
927 if result == 'true':
928 return True
929 if result == 'false':
930 return False
931 return None
932
tandrii@chromium.org28253532016-04-14 13:46:56 +0000933 def GetGerritSkipEnsureAuthenticated(self):
934 """Return True if EnsureAuthenticated should not be done for Gerrit
935 uploads."""
936 if self.gerrit_skip_ensure_authenticated is None:
937 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000938 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000939 error_ok=True).strip() == 'true')
940 return self.gerrit_skip_ensure_authenticated
941
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000942 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000943 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000944 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000945 # Git requires single quotes for paths with spaces. We need to replace
946 # them with double quotes for Windows to treat such paths as a single
947 # path.
948 self.git_editor = self._GetConfig(
949 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000950 return self.git_editor or None
951
thestig@chromium.org44202a22014-03-11 19:22:18 +0000952 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000953 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000954 DEFAULT_LINT_REGEX)
955
956 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000957 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000958 DEFAULT_LINT_IGNORE_REGEX)
959
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000960 def GetFormatFullByDefault(self):
961 if self.format_full_by_default is None:
962 result = (
963 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
964 error_ok=True).strip())
965 self.format_full_by_default = (result == 'true')
966 return self.format_full_by_default
967
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000968 def _GetConfig(self, param, **kwargs):
969 self.LazyUpdateIfNeeded()
970 return RunGit(['config', param], **kwargs).strip()
971
972
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000973def ShortBranchName(branch):
974 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000975 return branch.replace('refs/heads/', '', 1)
976
977
978def GetCurrentBranchRef():
979 """Returns branch ref (e.g., refs/heads/master) or None."""
980 return RunGit(['symbolic-ref', 'HEAD'],
981 stderr=subprocess2.VOID, error_ok=True).strip() or None
982
983
984def GetCurrentBranch():
985 """Returns current branch or None.
986
987 For refs/heads/* branches, returns just last part. For others, full ref.
988 """
989 branchref = GetCurrentBranchRef()
990 if branchref:
991 return ShortBranchName(branchref)
992 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000993
994
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000995class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000996 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000997 NONE = 'none'
998 DRY_RUN = 'dry_run'
999 COMMIT = 'commit'
1000
1001 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1002
1003
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001004class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +00001005 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001006 self.issue = issue
1007 self.patchset = patchset
1008 self.hostname = hostname
1009
1010 @property
1011 def valid(self):
1012 return self.issue is not None
1013
1014
Edward Lemurf38bc172019-09-03 21:02:13 +00001015def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001016 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1017 fail_result = _ParsedIssueNumberArgument()
1018
Edward Lemur678a6842019-10-03 22:25:05 +00001019 if isinstance(arg, int):
1020 return _ParsedIssueNumberArgument(issue=arg)
1021 if not isinstance(arg, basestring):
1022 return fail_result
1023
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001024 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001025 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001026 if not arg.startswith('http'):
1027 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001028
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001029 url = gclient_utils.UpgradeToHttps(arg)
1030 try:
Edward Lemur79d4f992019-11-11 23:49:02 +00001031 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001032 except ValueError:
1033 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001034
Edward Lemur678a6842019-10-03 22:25:05 +00001035 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1036 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1037 # Short urls like https://domain/<issue_number> can be used, but don't allow
1038 # specifying the patchset (you'd 404), but we allow that here.
1039 if parsed_url.path == '/':
1040 part = parsed_url.fragment
1041 else:
1042 part = parsed_url.path
1043
1044 match = re.match(
1045 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1046 if not match:
1047 return fail_result
1048
1049 issue = int(match.group('issue'))
1050 patchset = match.group('patchset')
1051 return _ParsedIssueNumberArgument(
1052 issue=issue,
1053 patchset=int(patchset) if patchset else None,
1054 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001055
1056
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001057def _create_description_from_log(args):
1058 """Pulls out the commit log to use as a base for the CL description."""
1059 log_args = []
1060 if len(args) == 1 and not args[0].endswith('.'):
1061 log_args = [args[0] + '..']
1062 elif len(args) == 1 and args[0].endswith('...'):
1063 log_args = [args[0][:-1]]
1064 elif len(args) == 2:
1065 log_args = [args[0] + '..' + args[1]]
1066 else:
1067 log_args = args[:] # Hope for the best!
1068 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1069
1070
Aaron Gablea45ee112016-11-22 15:14:38 -08001071class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001072 def __init__(self, issue, url):
1073 self.issue = issue
1074 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001075 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001076
1077 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001078 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001079 self.issue, self.url)
1080
1081
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001082_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001083 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001084 # TODO(tandrii): these two aren't known in Gerrit.
1085 'approval', 'disapproval'])
1086
1087
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001089 """Changelist works with one changelist in local branch.
1090
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001091 Notes:
1092 * Not safe for concurrent multi-{thread,process} use.
1093 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001094 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001095 """
1096
Edward Lemur125d60a2019-09-13 18:25:41 +00001097 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001098 """Create a new ChangeList instance.
1099
Edward Lemurf38bc172019-09-03 21:02:13 +00001100 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001101 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001103 global settings
1104 if not settings:
1105 # Happens when git_cl.py is used as a utility library.
1106 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108 self.branchref = branchref
1109 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001110 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111 self.branch = ShortBranchName(self.branchref)
1112 else:
1113 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001114 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001115 self.lookedup_issue = False
1116 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001117 self.has_description = False
1118 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001119 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001121 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001122 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001123 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001124 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001125
Edward Lemur125d60a2019-09-13 18:25:41 +00001126 # Lazily cached values.
1127 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1128 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1129 # Map from change number (issue) to its detail cache.
1130 self._detail_cache = {}
1131
1132 if codereview_host is not None:
1133 assert not codereview_host.startswith('https://'), codereview_host
1134 self._gerrit_host = codereview_host
1135 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001136
1137 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001138 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001139
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001140 The return value is a string suitable for passing to git cl with the --cc
1141 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001142 """
1143 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001144 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001145 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001146 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1147 return self.cc
1148
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001149 def GetCCListWithoutDefault(self):
1150 """Return the users cc'd on this CL excluding default ones."""
1151 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001152 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001153 return self.cc
1154
Daniel Cheng7227d212017-11-17 08:12:37 -08001155 def ExtendCC(self, more_cc):
1156 """Extends the list of users to cc on this CL based on the changed files."""
1157 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001158
1159 def GetBranch(self):
1160 """Returns the short branch name, e.g. 'master'."""
1161 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001162 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001163 if not branchref:
1164 return None
1165 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001166 self.branch = ShortBranchName(self.branchref)
1167 return self.branch
1168
1169 def GetBranchRef(self):
1170 """Returns the full branch name, e.g. 'refs/heads/master'."""
1171 self.GetBranch() # Poke the lazy loader.
1172 return self.branchref
1173
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001174 def ClearBranch(self):
1175 """Clears cached branch data of this object."""
1176 self.branch = self.branchref = None
1177
tandrii5d48c322016-08-18 16:19:37 -07001178 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1179 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1180 kwargs['branch'] = self.GetBranch()
1181 return _git_get_branch_config_value(key, default, **kwargs)
1182
1183 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1184 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1185 assert self.GetBranch(), (
1186 'this CL must have an associated branch to %sset %s%s' %
1187 ('un' if value is None else '',
1188 key,
1189 '' if value is None else ' to %r' % value))
1190 kwargs['branch'] = self.GetBranch()
1191 return _git_set_branch_config_value(key, value, **kwargs)
1192
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 @staticmethod
1194 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001195 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001196 e.g. 'origin', 'refs/heads/master'
1197 """
1198 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001199 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1200
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001201 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001202 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001203 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001204 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1205 error_ok=True).strip()
1206 if upstream_branch:
1207 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001208 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001209 # Else, try to guess the origin remote.
1210 remote_branches = RunGit(['branch', '-r']).split()
1211 if 'origin/master' in remote_branches:
1212 # Fall back on origin/master if it exits.
1213 remote = 'origin'
1214 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001216 DieWithError(
1217 'Unable to determine default branch to diff against.\n'
1218 'Either pass complete "git diff"-style arguments, like\n'
1219 ' git cl upload origin/master\n'
1220 'or verify this branch is set up to track another \n'
1221 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222
1223 return remote, upstream_branch
1224
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001225 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001226 upstream_branch = self.GetUpstreamBranch()
1227 if not BranchExists(upstream_branch):
1228 DieWithError('The upstream for the current branch (%s) does not exist '
1229 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001230 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001231 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001232
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001233 def GetUpstreamBranch(self):
1234 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001235 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001236 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001237 upstream_branch = upstream_branch.replace('refs/heads/',
1238 'refs/remotes/%s/' % remote)
1239 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1240 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001241 self.upstream_branch = upstream_branch
1242 return self.upstream_branch
1243
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001244 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001245 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001246 remote, branch = None, self.GetBranch()
1247 seen_branches = set()
1248 while branch not in seen_branches:
1249 seen_branches.add(branch)
1250 remote, branch = self.FetchUpstreamTuple(branch)
1251 branch = ShortBranchName(branch)
1252 if remote != '.' or branch.startswith('refs/remotes'):
1253 break
1254 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001255 remotes = RunGit(['remote'], error_ok=True).split()
1256 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001257 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001258 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001259 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001260 logging.warn('Could not determine which remote this change is '
1261 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001262 else:
1263 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001264 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001265 branch = 'HEAD'
1266 if branch.startswith('refs/remotes'):
1267 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001268 elif branch.startswith('refs/branch-heads/'):
1269 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001270 else:
1271 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001272 return self._remote
1273
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001274 def GitSanityChecks(self, upstream_git_obj):
1275 """Checks git repo status and ensures diff is from local commits."""
1276
sbc@chromium.org79706062015-01-14 21:18:12 +00001277 if upstream_git_obj is None:
1278 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001279 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001280 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001281 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001282 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001283 return False
1284
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001285 # Verify the commit we're diffing against is in our current branch.
1286 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1287 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1288 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001289 print('ERROR: %s is not in the current branch. You may need to rebase '
1290 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001291 return False
1292
1293 # List the commits inside the diff, and verify they are all local.
1294 commits_in_diff = RunGit(
1295 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1296 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1297 remote_branch = remote_branch.strip()
1298 if code != 0:
1299 _, remote_branch = self.GetRemoteBranch()
1300
1301 commits_in_remote = RunGit(
1302 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1303
1304 common_commits = set(commits_in_diff) & set(commits_in_remote)
1305 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001306 print('ERROR: Your diff contains %d commits already in %s.\n'
1307 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1308 'the diff. If you are using a custom git flow, you can override'
1309 ' the reference used for this check with "git config '
1310 'gitcl.remotebranch <git-ref>".' % (
1311 len(common_commits), remote_branch, upstream_git_obj),
1312 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001313 return False
1314 return True
1315
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001316 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001317 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001318
1319 Returns None if it is not set.
1320 """
tandrii5d48c322016-08-18 16:19:37 -07001321 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001322
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001323 def GetRemoteUrl(self):
1324 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1325
1326 Returns None if there is no remote.
1327 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001328 is_cached, value = self._cached_remote_url
1329 if is_cached:
1330 return value
1331
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001332 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001333 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1334
Edward Lemur298f2cf2019-02-22 21:40:39 +00001335 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001336 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001337 if host:
1338 self._cached_remote_url = (True, url)
1339 return url
1340
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001341 # If it cannot be parsed as an url, assume it is a local directory,
1342 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001343 logging.warning('"%s" doesn\'t appear to point to a git host. '
1344 'Interpreting it as a local directory.', url)
1345 if not os.path.isdir(url):
1346 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001347 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1348 'but it doesn\'t exist.',
1349 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001350 return None
1351
1352 cache_path = url
1353 url = RunGit(['config', 'remote.%s.url' % remote],
1354 error_ok=True,
1355 cwd=url).strip()
1356
Edward Lemur79d4f992019-11-11 23:49:02 +00001357 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001358 if not host:
1359 logging.error(
1360 'Remote "%(remote)s" for branch "%(branch)s" points to '
1361 '"%(cache_path)s", but it is misconfigured.\n'
1362 '"%(cache_path)s" must be a git repo and must have a remote named '
1363 '"%(remote)s" pointing to the git host.', {
1364 'remote': remote,
1365 'cache_path': cache_path,
1366 'branch': self.GetBranch()})
1367 return None
1368
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001369 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001370 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001371
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001372 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001373 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001374 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001375 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001376 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001377 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001378 return self.issue
1379
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001380 def GetIssueURL(self):
1381 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001382 issue = self.GetIssue()
1383 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001384 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001385 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001386
Edward Lemur7f6dec02020-02-06 20:23:58 +00001387 def GetLocalDescription(self, upstream_branch):
1388 """Return the log messages of all commits up to the branch point."""
1389 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1390 return RunGitWithCode(args)[1].strip()
1391
Edward Lemur6c6827c2020-02-06 21:15:18 +00001392 def FetchDescription(self, pretty=False):
1393 assert self.GetIssue(), 'issue is required to query Gerrit'
1394
1395 if not self.has_description:
1396 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1397 current_rev = data['current_revision']
1398 self.description = data['revisions'][current_rev]['commit']['message']
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001399 self.has_description = True
Edward Lemur6c6827c2020-02-06 21:15:18 +00001400
1401 if not pretty:
1402 return self.description
1403
1404 # Set width to 72 columns + 2 space indent.
1405 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1406 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1407 lines = self.description.splitlines()
1408 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001409
1410 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001411 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001412 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001413 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001414 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001415 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001416 return self.patchset
1417
1418 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001419 """Set this branch's patchset. If patchset=0, clears the patchset."""
1420 assert self.GetBranch()
1421 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001422 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001423 else:
1424 self.patchset = int(patchset)
1425 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001426 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001427
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001428 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001429 """Set this branch's issue. If issue isn't given, clears the issue."""
1430 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001431 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001432 issue = int(issue)
1433 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001434 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001435 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001436 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001437 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001438 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001439 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001440 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001441 else:
tandrii5d48c322016-08-18 16:19:37 -07001442 # Reset all of these just to be clean.
1443 reset_suffixes = [
1444 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001445 self.IssueConfigKey(),
1446 self.PatchsetConfigKey(),
1447 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001448 ] + self._PostUnsetIssueProperties()
1449 for prop in reset_suffixes:
1450 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001451 msg = RunGit(['log', '-1', '--format=%B']).strip()
1452 if msg and git_footers.get_footer_change_id(msg):
1453 print('WARNING: The change patched into this branch has a Change-Id. '
1454 'Removing it.')
1455 RunGit(['commit', '--amend', '-m',
1456 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001457 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001458 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001459 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001460
Edward Lemur7f6dec02020-02-06 20:23:58 +00001461 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001462 if not self.GitSanityChecks(upstream_branch):
1463 DieWithError('\nGit sanity check failure')
1464
Edward Lemur7f6dec02020-02-06 20:23:58 +00001465 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001466 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001467 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001468 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001469 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001470 except subprocess2.CalledProcessError:
1471 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001472 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001473 'This branch probably doesn\'t exist anymore. To reset the\n'
1474 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001475 ' git branch --set-upstream-to origin/master %s\n'
1476 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001477 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001478
maruel@chromium.org52424302012-08-29 15:14:30 +00001479 issue = self.GetIssue()
1480 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001481 if issue:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001482 description = self.FetchDescription()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001483 else:
1484 # If the change was never uploaded, use the log messages of all commits
1485 # up to the branch point, as git cl upload will prefill the description
1486 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001487 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001488
Edward Lemur7f6dec02020-02-06 20:23:58 +00001489 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001490 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001491 name,
1492 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001493 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001494 files,
1495 issue,
1496 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001497 author,
1498 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001499
dsansomee2d6fd92016-09-08 00:10:47 -07001500 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001501 assert self.GetIssue(), 'issue is required to update description'
1502
1503 if gerrit_util.HasPendingChangeEdit(
1504 self._GetGerritHost(), self._GerritChangeIdentifier()):
1505 if not force:
1506 confirm_or_exit(
1507 'The description cannot be modified while the issue has a pending '
1508 'unpublished edit. Either publish the edit in the Gerrit web UI '
1509 'or delete it.\n\n', action='delete the unpublished edit')
1510
1511 gerrit_util.DeletePendingChangeEdit(
1512 self._GetGerritHost(), self._GerritChangeIdentifier())
1513 gerrit_util.SetCommitMessage(
1514 self._GetGerritHost(), self._GerritChangeIdentifier(),
1515 description, notify='NONE')
1516
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001517 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001518 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001519
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001520
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001521
Edward Lesmes8e282792018-04-03 18:50:29 -04001522 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001523 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1524 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001525 start = time_time()
1526 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001527 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1528 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001529 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001530 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001531 metrics.collector.add_repeated('sub_commands', {
1532 'command': 'presubmit',
1533 'execution_time': time_time() - start,
1534 'exit_code': 0 if result.should_continue() else 1,
1535 })
1536 return result
vapierfd77ac72016-06-16 08:33:57 -07001537 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001538 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001539
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001540 def CMDUpload(self, options, git_diff_args, orig_args):
1541 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001542 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001543 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001544 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001545 else:
1546 if self.GetBranch() is None:
1547 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1548
1549 # Default to diffing against common ancestor of upstream branch
1550 base_branch = self.GetCommonAncestorWithUpstream()
1551 git_diff_args = [base_branch, 'HEAD']
1552
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001553 # Fast best-effort checks to abort before running potentially expensive
1554 # hooks if uploading is likely to fail anyway. Passing these checks does
1555 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001556 self.EnsureAuthenticated(force=options.force)
1557 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001558
1559 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001560 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001561 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1562 files = [f.LocalPath() for f in change.AffectedFiles()]
1563 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001564 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001565
1566 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001567 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001568 # Set the reviewer list now so that presubmit checks can access it.
1569 change_description = ChangeDescription(change.FullDescriptionText())
1570 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001571 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001572 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001573 change)
1574 change.SetDescriptionText(change_description.description)
1575 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001576 may_prompt=not options.force,
1577 verbose=options.verbose,
1578 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001579 if not hook_results.should_continue():
1580 return 1
1581 if not options.reviewers and hook_results.reviewers:
1582 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001583 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001584
Aaron Gable13101a62018-02-09 13:20:41 -08001585 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001586 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001588 _git_set_branch_config_value('last-upload-hash',
1589 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 # Run post upload hooks, if specified.
1591 if settings.GetRunPostUploadHook():
1592 presubmit_support.DoPostUploadExecuter(
1593 change,
Edward Lemur016a0872020-02-04 22:13:28 +00001594 self.GetGerritObjForPresubmit(),
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001595 settings.GetRoot(),
1596 options.verbose,
1597 sys.stdout)
1598
1599 # Upload all dependencies if specified.
1600 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001601 print()
1602 print('--dependencies has been specified.')
1603 print('All dependent local branches will be re-uploaded.')
1604 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001605 # Remove the dependencies flag from args so that we do not end up in a
1606 # loop.
1607 orig_args.remove('--dependencies')
1608 ret = upload_branch_deps(self, orig_args)
1609 return ret
1610
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001611 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001612 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001613
1614 Issue must have been already uploaded and known.
1615 """
1616 assert new_state in _CQState.ALL_STATES
1617 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001618 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001619 vote_map = {
1620 _CQState.NONE: 0,
1621 _CQState.DRY_RUN: 1,
1622 _CQState.COMMIT: 2,
1623 }
1624 labels = {'Commit-Queue': vote_map[new_state]}
1625 notify = False if new_state == _CQState.DRY_RUN else None
1626 gerrit_util.SetReview(
1627 self._GetGerritHost(), self._GerritChangeIdentifier(),
1628 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001629 return 0
1630 except KeyboardInterrupt:
1631 raise
1632 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001633 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001634 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001635 ' * Your project has no CQ,\n'
1636 ' * You don\'t have permission to change the CQ state,\n'
1637 ' * There\'s a bug in this code (see stack trace below).\n'
1638 'Consider specifying which bots to trigger manually or asking your '
1639 'project owners for permissions or contacting Chrome Infra at:\n'
1640 'https://www.chromium.org/infra\n\n' %
1641 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001642 # Still raise exception so that stack trace is printed.
1643 raise
1644
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001645 def _GetGerritHost(self):
1646 # Lazy load of configs.
1647 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001648 if self._gerrit_host and '.' not in self._gerrit_host:
1649 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1650 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001651 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001652 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001653 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001654 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001655 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1656 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001657 return self._gerrit_host
1658
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001659 def _GetGitHost(self):
1660 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001661 remote_url = self.GetRemoteUrl()
1662 if not remote_url:
1663 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001664 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001665
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001666 def GetCodereviewServer(self):
1667 if not self._gerrit_server:
1668 # If we're on a branch then get the server potentially associated
1669 # with that branch.
1670 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001671 self._gerrit_server = self._GitGetBranchConfigValue(
1672 self.CodereviewServerConfigKey())
1673 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001674 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001675 if not self._gerrit_server:
1676 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1677 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001678 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001679 parts[0] = parts[0] + '-review'
1680 self._gerrit_host = '.'.join(parts)
1681 self._gerrit_server = 'https://%s' % self._gerrit_host
1682 return self._gerrit_server
1683
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001684 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001685 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001686 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001687 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001688 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001689 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001690 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001691 if project.endswith('.git'):
1692 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001693 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1694 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1695 # gitiles/git-over-https protocol. E.g.,
1696 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1697 # as
1698 # https://chromium.googlesource.com/v8/v8
1699 if project.startswith('a/'):
1700 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001701 return project
1702
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001703 def _GerritChangeIdentifier(self):
1704 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1705
1706 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001707 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001708 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001709 project = self._GetGerritProject()
1710 if project:
1711 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1712 # Fall back on still unique, but less efficient change number.
1713 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001714
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001715 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001716 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001717 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001718
tandrii5d48c322016-08-18 16:19:37 -07001719 @classmethod
1720 def PatchsetConfigKey(cls):
1721 return 'gerritpatchset'
1722
1723 @classmethod
1724 def CodereviewServerConfigKey(cls):
1725 return 'gerritserver'
1726
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001727 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001728 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001729 if settings.GetGerritSkipEnsureAuthenticated():
1730 # For projects with unusual authentication schemes.
1731 # See http://crbug.com/603378.
1732 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001733
1734 # Check presence of cookies only if using cookies-based auth method.
1735 cookie_auth = gerrit_util.Authenticator.get()
1736 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001737 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001738
Florian Mayerae510e82020-01-30 21:04:48 +00001739 remote_url = self.GetRemoteUrl()
1740 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001741 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001742 return
1743 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001744 logging.warning('Ignoring branch %(branch)s with non-https remote '
1745 '%(remote)s', {
1746 'branch': self.branch,
1747 'remote': self.GetRemoteUrl()
1748 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001749 return
1750
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001751 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001752 self.GetCodereviewServer()
1753 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001754 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001755
1756 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1757 git_auth = cookie_auth.get_auth_header(git_host)
1758 if gerrit_auth and git_auth:
1759 if gerrit_auth == git_auth:
1760 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001761 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001762 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001763 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001764 ' %s\n'
1765 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001766 ' Consider running the following command:\n'
1767 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001768 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001769 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001770 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001771 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001772 cookie_auth.get_new_password_message(git_host)))
1773 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001774 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001775 return
1776 else:
1777 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001778 ([] if gerrit_auth else [self._gerrit_host]) +
1779 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001780 DieWithError('Credentials for the following hosts are required:\n'
1781 ' %s\n'
1782 'These are read from %s (or legacy %s)\n'
1783 '%s' % (
1784 '\n '.join(missing),
1785 cookie_auth.get_gitcookies_path(),
1786 cookie_auth.get_netrc_path(),
1787 cookie_auth.get_new_password_message(git_host)))
1788
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001789 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001790 if not self.GetIssue():
1791 return
1792
1793 # Warm change details cache now to avoid RPCs later, reducing latency for
1794 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001795 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001796 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001797
1798 status = self._GetChangeDetail()['status']
1799 if status in ('MERGED', 'ABANDONED'):
1800 DieWithError('Change %s has been %s, new uploads are not allowed' %
1801 (self.GetIssueURL(),
1802 'submitted' if status == 'MERGED' else 'abandoned'))
1803
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001804 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1805 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1806 # Apparently this check is not very important? Otherwise get_auth_email
1807 # could have been added to other implementations of Authenticator.
1808 cookies_auth = gerrit_util.Authenticator.get()
1809 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001810 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001811
1812 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001813 if self.GetIssueOwner() == cookies_user:
1814 return
1815 logging.debug('change %s owner is %s, cookies user is %s',
1816 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001817 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001818 # so ask what Gerrit thinks of this user.
1819 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1820 if details['email'] == self.GetIssueOwner():
1821 return
1822 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001823 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001824 'as %s.\n'
1825 'Uploading may fail due to lack of permissions.' %
1826 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1827 confirm_or_exit(action='upload')
1828
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001829 def _PostUnsetIssueProperties(self):
1830 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001831 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001832
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001833 def GetGerritObjForPresubmit(self):
1834 return presubmit_support.GerritAccessor(self._GetGerritHost())
1835
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001837 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001838 or CQ status, assuming adherence to a common workflow.
1839
1840 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001841 * 'error' - error from review tool (including deleted issues)
1842 * 'unsent' - no reviewers added
1843 * 'waiting' - waiting for review
1844 * 'reply' - waiting for uploader to reply to review
1845 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001846 * 'dry-run' - dry-running in the CQ
1847 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001848 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001849 """
1850 if not self.GetIssue():
1851 return None
1852
1853 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001854 data = self._GetChangeDetail([
1855 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001856 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001857 return 'error'
1858
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001859 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001860 return 'closed'
1861
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001862 cq_label = data['labels'].get('Commit-Queue', {})
1863 max_cq_vote = 0
1864 for vote in cq_label.get('all', []):
1865 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1866 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001867 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001868 if max_cq_vote == 1:
1869 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001870
Aaron Gable9ab38c62017-04-06 14:36:33 -07001871 if data['labels'].get('Code-Review', {}).get('approved'):
1872 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001873
1874 if not data.get('reviewers', {}).get('REVIEWER', []):
1875 return 'unsent'
1876
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001877 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001878 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001879 last_message_author = messages.pop().get('author', {})
1880 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001881 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1882 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001883 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001884 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001885 if last_message_author.get('_account_id') == owner:
1886 # Most recent message was by owner.
1887 return 'waiting'
1888 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001889 # Some reply from non-owner.
1890 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001891
1892 # Somehow there are no messages even though there are reviewers.
1893 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001894
1895 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001896 if not self.GetIssue():
1897 return None
1898
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001899 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001900 patchset = data['revisions'][data['current_revision']]['_number']
1901 self.SetPatchset(patchset)
1902 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903
Aaron Gable636b13f2017-07-14 10:42:48 -07001904 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001905 gerrit_util.SetReview(
1906 self._GetGerritHost(), self._GerritChangeIdentifier(),
1907 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001908
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001909 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001910 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001911 # CURRENT_REVISION is included to get the latest patchset so that
1912 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001913 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001914 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1915 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001916 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001917 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001918 robot_file_comments = gerrit_util.GetChangeRobotComments(
1919 self._GetGerritHost(), self._GerritChangeIdentifier())
1920
1921 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001922 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001923 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001924 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001925 line_comments = file_comments.setdefault(path, [])
1926 line_comments.extend(
1927 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001928
1929 # Build dictionary of file comments for easy access and sorting later.
1930 # {author+date: {path: {patchset: {line: url+message}}}}
1931 comments = collections.defaultdict(
1932 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001933 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001934 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001935 tag = comment.get('tag', '')
1936 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001937 continue
1938 key = (comment['author']['email'], comment['updated'])
1939 if comment.get('side', 'REVISION') == 'PARENT':
1940 patchset = 'Base'
1941 else:
1942 patchset = 'PS%d' % comment['patch_set']
1943 line = comment.get('line', 0)
1944 url = ('https://%s/c/%s/%s/%s#%s%s' %
1945 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1946 'b' if comment.get('side') == 'PARENT' else '',
1947 str(line) if line else ''))
1948 comments[key][path][patchset][line] = (url, comment['message'])
1949
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001950 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001951 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001952 summary = self._BuildCommentSummary(msg, comments, readable)
1953 if summary:
1954 summaries.append(summary)
1955 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001956
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001957 @staticmethod
1958 def _BuildCommentSummary(msg, comments, readable):
1959 key = (msg['author']['email'], msg['date'])
1960 # Don't bother showing autogenerated messages that don't have associated
1961 # file or line comments. this will filter out most autogenerated
1962 # messages, but will keep robot comments like those from Tricium.
1963 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1964 if is_autogenerated and not comments.get(key):
1965 return None
1966 message = msg['message']
1967 # Gerrit spits out nanoseconds.
1968 assert len(msg['date'].split('.')[-1]) == 9
1969 date = datetime.datetime.strptime(msg['date'][:-3],
1970 '%Y-%m-%d %H:%M:%S.%f')
1971 if key in comments:
1972 message += '\n'
1973 for path, patchsets in sorted(comments.get(key, {}).items()):
1974 if readable:
1975 message += '\n%s' % path
1976 for patchset, lines in sorted(patchsets.items()):
1977 for line, (url, content) in sorted(lines.items()):
1978 if line:
1979 line_str = 'Line %d' % line
1980 path_str = '%s:%d:' % (path, line)
1981 else:
1982 line_str = 'File comment'
1983 path_str = '%s:0:' % path
1984 if readable:
1985 message += '\n %s, %s: %s' % (patchset, line_str, url)
1986 message += '\n %s\n' % content
1987 else:
1988 message += '\n%s ' % path_str
1989 message += '\n%s\n' % content
1990
1991 return _CommentSummary(
1992 date=date,
1993 message=message,
1994 sender=msg['author']['email'],
1995 autogenerated=is_autogenerated,
1996 # These could be inferred from the text messages and correlated with
1997 # Code-Review label maximum, however this is not reliable.
1998 # Leaving as is until the need arises.
1999 approval=False,
2000 disapproval=False,
2001 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002002
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002003 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002004 gerrit_util.AbandonChange(
2005 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002006
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002007 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002008 gerrit_util.SubmitChange(
2009 self._GetGerritHost(), self._GerritChangeIdentifier(),
2010 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002011
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002012 def _GetChangeDetail(self, options=None, no_cache=False):
2013 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002014
2015 If fresh data is needed, set no_cache=True which will clear cache and
2016 thus new data will be fetched from Gerrit.
2017 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002018 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002019 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002020
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002021 # Optimization to avoid multiple RPCs:
2022 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2023 'CURRENT_COMMIT' not in options):
2024 options.append('CURRENT_COMMIT')
2025
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002026 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002027 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002028 options = [o.upper() for o in options]
2029
2030 # Check in cache first unless no_cache is True.
2031 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002032 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002033 else:
2034 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002035 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002036 # Assumption: data fetched before with extra options is suitable
2037 # for return for a smaller set of options.
2038 # For example, if we cached data for
2039 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2040 # and request is for options=[CURRENT_REVISION],
2041 # THEN we can return prior cached data.
2042 if options_set.issubset(cached_options_set):
2043 return data
2044
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002045 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002046 data = gerrit_util.GetChangeDetail(
2047 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002048 except gerrit_util.GerritError as e:
2049 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002050 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002051 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002052
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002053 self._detail_cache.setdefault(cache_key, []).append(
2054 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002055 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002056
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002057 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002058 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002059 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002060 data = gerrit_util.GetChangeCommit(
2061 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002062 except gerrit_util.GerritError as e:
2063 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002064 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002065 raise
agable32978d92016-11-01 12:55:02 -07002066 return data
2067
Karen Qian40c19422019-03-13 21:28:29 +00002068 def _IsCqConfigured(self):
2069 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002070 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002071
Olivier Robin75ee7252018-04-13 10:02:56 +02002072 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002073 if git_common.is_dirty_git_tree('land'):
2074 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002075
tandriid60367b2016-06-22 05:25:12 -07002076 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002077 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002078 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002079 'which can test and land changes for you. '
2080 'Are you sure you wish to bypass it?\n',
2081 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002082 differs = True
tandriic4344b52016-08-29 06:04:54 -07002083 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002084 # Note: git diff outputs nothing if there is no diff.
2085 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002086 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002087 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002088 if detail['current_revision'] == last_upload:
2089 differs = False
2090 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002091 print('WARNING: Local branch contents differ from latest uploaded '
2092 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002093 if differs:
2094 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002095 confirm_or_exit(
2096 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2097 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002098 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002099 elif not bypass_hooks:
2100 hook_results = self.RunHook(
2101 committing=True,
2102 may_prompt=not force,
2103 verbose=verbose,
Edward Lemur7f6dec02020-02-06 20:23:58 +00002104 change=self.GetChange(self.GetCommonAncestorWithUpstream()),
Olivier Robin75ee7252018-04-13 10:02:56 +02002105 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002106 if not hook_results.should_continue():
2107 return 1
2108
2109 self.SubmitIssue(wait_for_merge=True)
2110 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002111 links = self._GetChangeCommit().get('web_links', [])
2112 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002113 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002114 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002115 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002116 return 0
2117
Edward Lemurf38bc172019-09-03 21:02:13 +00002118 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002119 assert parsed_issue_arg.valid
2120
Edward Lemur125d60a2019-09-13 18:25:41 +00002121 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002122
2123 if parsed_issue_arg.hostname:
2124 self._gerrit_host = parsed_issue_arg.hostname
2125 self._gerrit_server = 'https://%s' % self._gerrit_host
2126
tandriic2405f52016-10-10 08:13:15 -07002127 try:
2128 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002129 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002130 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002131
2132 if not parsed_issue_arg.patchset:
2133 # Use current revision by default.
2134 revision_info = detail['revisions'][detail['current_revision']]
2135 patchset = int(revision_info['_number'])
2136 else:
2137 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002138 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002139 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2140 break
2141 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002142 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002143 (parsed_issue_arg.patchset, self.GetIssue()))
2144
Edward Lemur125d60a2019-09-13 18:25:41 +00002145 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002146 if remote_url.endswith('.git'):
2147 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002148 remote_url = remote_url.rstrip('/')
2149
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002150 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002151 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002152
2153 if remote_url != fetch_info['url']:
2154 DieWithError('Trying to patch a change from %s but this repo appears '
2155 'to be %s.' % (fetch_info['url'], remote_url))
2156
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002157 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002158
Aaron Gable62619a32017-06-16 08:22:09 -07002159 if force:
2160 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2161 print('Checked out commit for change %i patchset %i locally' %
2162 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002163 elif nocommit:
2164 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2165 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002166 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002167 RunGit(['cherry-pick', 'FETCH_HEAD'])
2168 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002169 (parsed_issue_arg.issue, patchset))
2170 print('Note: this created a local commit which does not have '
2171 'the same hash as the one uploaded for review. This will make '
2172 'uploading changes based on top of this branch difficult.\n'
2173 'If you want to do that, use "git cl patch --force" instead.')
2174
Stefan Zagerd08043c2017-10-12 12:07:02 -07002175 if self.GetBranch():
2176 self.SetIssue(parsed_issue_arg.issue)
2177 self.SetPatchset(patchset)
2178 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2179 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2180 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2181 else:
2182 print('WARNING: You are in detached HEAD state.\n'
2183 'The patch has been applied to your checkout, but you will not be '
2184 'able to upload a new patch set to the gerrit issue.\n'
2185 'Try using the \'-b\' option if you would like to work on a '
2186 'branch and/or upload a new patch set.')
2187
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002188 return 0
2189
tandrii16e0b4e2016-06-07 10:34:28 -07002190 def _GerritCommitMsgHookCheck(self, offer_removal):
2191 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2192 if not os.path.exists(hook):
2193 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002194 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2195 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002196 data = gclient_utils.FileRead(hook)
2197 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2198 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002199 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002200 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002201 'and may interfere with it in subtle ways.\n'
2202 'We recommend you remove the commit-msg hook.')
2203 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002204 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002205 gclient_utils.rm_file_or_tree(hook)
2206 print('Gerrit commit-msg hook removed.')
2207 else:
2208 print('OK, will keep Gerrit commit-msg hook in place.')
2209
Edward Lemur1b52d872019-05-09 21:12:12 +00002210 def _CleanUpOldTraces(self):
2211 """Keep only the last |MAX_TRACES| traces."""
2212 try:
2213 traces = sorted([
2214 os.path.join(TRACES_DIR, f)
2215 for f in os.listdir(TRACES_DIR)
2216 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2217 and not f.startswith('tmp'))
2218 ])
2219 traces_to_delete = traces[:-MAX_TRACES]
2220 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002221 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002222 except OSError:
2223 print('WARNING: Failed to remove old git traces from\n'
2224 ' %s'
2225 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002226
Edward Lemur5737f022019-05-17 01:24:00 +00002227 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002228 """Zip and write the git push traces stored in traces_dir."""
2229 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002230 traces_zip = trace_name + '-traces'
2231 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002232 # Create a temporary dir to store git config and gitcookies in. It will be
2233 # compressed and stored next to the traces.
2234 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002235 git_info_zip = trace_name + '-git-info'
2236
Edward Lemur5737f022019-05-17 01:24:00 +00002237 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002238 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002239 git_push_metadata['now'] = git_push_metadata['now'].decode(
2240 sys.stdin.encoding)
2241
Edward Lemur1b52d872019-05-09 21:12:12 +00002242 git_push_metadata['trace_name'] = trace_name
2243 gclient_utils.FileWrite(
2244 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2245
2246 # Keep only the first 6 characters of the git hashes on the packet
2247 # trace. This greatly decreases size after compression.
2248 packet_traces = os.path.join(traces_dir, 'trace-packet')
2249 if os.path.isfile(packet_traces):
2250 contents = gclient_utils.FileRead(packet_traces)
2251 gclient_utils.FileWrite(
2252 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2253 shutil.make_archive(traces_zip, 'zip', traces_dir)
2254
2255 # Collect and compress the git config and gitcookies.
2256 git_config = RunGit(['config', '-l'])
2257 gclient_utils.FileWrite(
2258 os.path.join(git_info_dir, 'git-config'),
2259 git_config)
2260
2261 cookie_auth = gerrit_util.Authenticator.get()
2262 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2263 gitcookies_path = cookie_auth.get_gitcookies_path()
2264 if os.path.isfile(gitcookies_path):
2265 gitcookies = gclient_utils.FileRead(gitcookies_path)
2266 gclient_utils.FileWrite(
2267 os.path.join(git_info_dir, 'gitcookies'),
2268 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2269 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2270
Edward Lemur1b52d872019-05-09 21:12:12 +00002271 gclient_utils.rmtree(git_info_dir)
2272
2273 def _RunGitPushWithTraces(
2274 self, change_desc, refspec, refspec_opts, git_push_metadata):
2275 """Run git push and collect the traces resulting from the execution."""
2276 # Create a temporary directory to store traces in. Traces will be compressed
2277 # and stored in a 'traces' dir inside depot_tools.
2278 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002279 trace_name = os.path.join(
2280 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002281
2282 env = os.environ.copy()
2283 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2284 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002285 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002286 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2287 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2288 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2289
2290 try:
2291 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002292 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002293 before_push = time_time()
2294 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002295 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002296 env=env,
2297 print_stdout=True,
2298 # Flush after every line: useful for seeing progress when running as
2299 # recipe.
2300 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002301 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002302 except subprocess2.CalledProcessError as e:
2303 push_returncode = e.returncode
2304 DieWithError('Failed to create a change. Please examine output above '
2305 'for the reason of the failure.\n'
2306 'Hint: run command below to diagnose common Git/Gerrit '
2307 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002308 ' git cl creds-check\n'
2309 '\n'
2310 'If git-cl is not working correctly, file a bug under the '
2311 'Infra>SDK component including the files below.\n'
2312 'Review the files before upload, since they might contain '
2313 'sensitive information.\n'
2314 'Set the Restrict-View-Google label so that they are not '
2315 'publicly accessible.\n'
2316 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002317 change_desc)
2318 finally:
2319 execution_time = time_time() - before_push
2320 metrics.collector.add_repeated('sub_commands', {
2321 'command': 'git push',
2322 'execution_time': execution_time,
2323 'exit_code': push_returncode,
2324 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2325 })
2326
Edward Lemur1b52d872019-05-09 21:12:12 +00002327 git_push_metadata['execution_time'] = execution_time
2328 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002329 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002330
Edward Lemur1b52d872019-05-09 21:12:12 +00002331 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002332 gclient_utils.rmtree(traces_dir)
2333
2334 return push_stdout
2335
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002336 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002337 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002338 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002339 # Load default for user, repo, squash=true, in this order.
2340 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002341
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002342 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002343 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002344 # This may be None; default fallback value is determined in logic below.
2345 title = options.title
2346
Dominic Battre7d1c4842017-10-27 09:17:28 +02002347 # Extract bug number from branch name.
2348 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002349 fixed = options.fixed
2350 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2351 self.GetBranch())
2352 if not bug and not fixed and match:
2353 if match.group('type') == 'bug':
2354 bug = match.group('bugnum')
2355 else:
2356 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002357
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002358 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002359 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002360 if self.GetIssue():
2361 # Try to get the message from a previous upload.
Edward Lemur6c6827c2020-02-06 21:15:18 +00002362 message = self.FetchDescription()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002363 if not message:
2364 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002365 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002366 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002367 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002368 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002369 # When uploading a subsequent patchset, -m|--message is taken
2370 # as the patchset title if --title was not provided.
2371 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002372 else:
2373 default_title = RunGit(
2374 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002375 if options.force:
2376 title = default_title
2377 else:
2378 title = ask_for_data(
2379 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002380
2381 # User requested to change description
2382 if options.edit_description:
2383 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2384 change_desc.prompt()
2385 message = change_desc.description
2386
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002387 change_id = self._GetChangeDetail()['change_id']
2388 while True:
2389 footer_change_ids = git_footers.get_footer_change_id(message)
2390 if footer_change_ids == [change_id]:
2391 break
2392 if not footer_change_ids:
2393 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002394 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002395 continue
2396 # There is already a valid footer but with different or several ids.
2397 # Doing this automatically is non-trivial as we don't want to lose
2398 # existing other footers, yet we want to append just 1 desired
2399 # Change-Id. Thus, just create a new footer, but let user verify the
2400 # new description.
2401 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002402 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002404 print(
2405 'WARNING: change %s has Change-Id footer(s):\n'
2406 ' %s\n'
2407 'but change has Change-Id %s, according to Gerrit.\n'
2408 'Please, check the proposed correction to the description, '
2409 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2410 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2411 change_id))
2412 confirm_or_exit(action='edit')
2413 change_desc.prompt()
2414
2415 message = change_desc.description
2416 if not message:
2417 DieWithError("Description is empty. Aborting...")
2418
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002419 # Continue the while loop.
2420 # Sanity check of this code - we should end up with proper message
2421 # footer.
2422 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002423 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002424 else: # if not self.GetIssue()
2425 if options.message:
2426 message = options.message
2427 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002428 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002429 if options.title:
2430 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002431 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002432 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002433 change_desc.prompt()
2434
Aaron Gableb56ad332017-01-06 15:24:31 -08002435 # On first upload, patchset title is always this string, while
2436 # --title flag gets converted to first line of message.
2437 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002438 if not change_desc.description:
2439 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002440 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002441 if len(change_ids) > 1:
2442 DieWithError('too many Change-Id footers, at most 1 allowed.')
2443 if not change_ids:
2444 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002445 change_desc.set_description(git_footers.add_footer_change_id(
2446 change_desc.description,
2447 GenerateGerritChangeId(change_desc.description)))
2448 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002449 assert len(change_ids) == 1
2450 change_id = change_ids[0]
2451
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002452 if options.reviewers or options.tbrs or options.add_owners_to:
2453 change_desc.update_reviewers(options.reviewers, options.tbrs,
2454 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002455 if options.preserve_tryjobs:
2456 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002457
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002458 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002459 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2460 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002461 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lesmesf6a22322019-11-04 22:14:39 +00002462 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
Edward Lemur79d4f992019-11-11 23:49:02 +00002463 desc_tempfile.write(change_desc.description.encode('utf-8', 'replace'))
Aaron Gable9a03ae02017-11-03 11:31:07 -07002464 desc_tempfile.close()
2465 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2466 '-F', desc_tempfile.name]).strip()
2467 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002468 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002469 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002470 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002471 if not change_desc.description:
2472 DieWithError("Description is empty. Aborting...")
2473
2474 if not git_footers.get_footer_change_id(change_desc.description):
2475 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002476 change_desc.set_description(
2477 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002478 if options.reviewers or options.tbrs or options.add_owners_to:
2479 change_desc.update_reviewers(options.reviewers, options.tbrs,
2480 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002481 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002482 # For no-squash mode, we assume the remote called "origin" is the one we
2483 # want. It is not worthwhile to support different workflows for
2484 # no-squash mode.
2485 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002486 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2487
2488 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002489 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002490 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2491 ref_to_push)]).splitlines()
2492 if len(commits) > 1:
2493 print('WARNING: This will upload %d commits. Run the following command '
2494 'to see which commits will be uploaded: ' % len(commits))
2495 print('git log %s..%s' % (parent, ref_to_push))
2496 print('You can also use `git squash-branch` to squash these into a '
2497 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002498 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002499
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002500 if options.reviewers or options.tbrs or options.add_owners_to:
2501 change_desc.update_reviewers(options.reviewers, options.tbrs,
2502 options.add_owners_to, change)
2503
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002504 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002505 cc = []
2506 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2507 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2508 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002509 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002510 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002511 if options.cc:
2512 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002513 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002514 if change_desc.get_cced():
2515 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002516 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2517 valid_accounts = set(reviewers + cc)
2518 # TODO(crbug/877717): relax this for all hosts.
2519 else:
2520 valid_accounts = gerrit_util.ValidAccounts(
2521 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002522 logging.info('accounts %s are recognized, %s invalid',
2523 sorted(valid_accounts),
2524 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002525
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002526 # Extra options that can be specified at push time. Doc:
2527 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002528 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002529
Aaron Gable844cf292017-06-28 11:32:59 -07002530 # By default, new changes are started in WIP mode, and subsequent patchsets
2531 # don't send email. At any time, passing --send-mail will mark the change
2532 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002533 if options.send_mail:
2534 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002535 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002536 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002537 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002538 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002539 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002540
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002541 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002542 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002543
Aaron Gable9b713dd2016-12-14 16:04:21 -08002544 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002545 # Punctuation and whitespace in |title| must be percent-encoded.
2546 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002547
agablec6787972016-09-09 16:13:34 -07002548 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002549 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002550
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002551 for r in sorted(reviewers):
2552 if r in valid_accounts:
2553 refspec_opts.append('r=%s' % r)
2554 reviewers.remove(r)
2555 else:
2556 # TODO(tandrii): this should probably be a hard failure.
2557 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2558 % r)
2559 for c in sorted(cc):
2560 # refspec option will be rejected if cc doesn't correspond to an
2561 # account, even though REST call to add such arbitrary cc may succeed.
2562 if c in valid_accounts:
2563 refspec_opts.append('cc=%s' % c)
2564 cc.remove(c)
2565
rmistry9eadede2016-09-19 11:22:43 -07002566 if options.topic:
2567 # Documentation on Gerrit topics is here:
2568 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002569 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002570
Edward Lemur687ca902018-12-05 02:30:30 +00002571 if options.enable_auto_submit:
2572 refspec_opts.append('l=Auto-Submit+1')
2573 if options.use_commit_queue:
2574 refspec_opts.append('l=Commit-Queue+2')
2575 elif options.cq_dry_run:
2576 refspec_opts.append('l=Commit-Queue+1')
2577
2578 if change_desc.get_reviewers(tbr_only=True):
2579 score = gerrit_util.GetCodeReviewTbrScore(
2580 self._GetGerritHost(),
2581 self._GetGerritProject())
2582 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002583
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002584 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002585 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002586 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002587 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002588 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2589
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002590 refspec_suffix = ''
2591 if refspec_opts:
2592 refspec_suffix = '%' + ','.join(refspec_opts)
2593 assert ' ' not in refspec_suffix, (
2594 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2595 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2596
Edward Lemur1b52d872019-05-09 21:12:12 +00002597 git_push_metadata = {
2598 'gerrit_host': self._GetGerritHost(),
2599 'title': title or '<untitled>',
2600 'change_id': change_id,
2601 'description': change_desc.description,
2602 }
2603 push_stdout = self._RunGitPushWithTraces(
2604 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002605
2606 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002607 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002608 change_numbers = [m.group(1)
2609 for m in map(regex.match, push_stdout.splitlines())
2610 if m]
2611 if len(change_numbers) != 1:
2612 DieWithError(
2613 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002614 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002615 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002616 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002617
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002618 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002619 # GetIssue() is not set in case of non-squash uploads according to tests.
2620 # TODO(agable): non-squash uploads in git cl should be removed.
2621 gerrit_util.AddReviewers(
2622 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002623 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002624 reviewers, cc,
2625 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002626
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002627 return 0
2628
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002629 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2630 change_desc):
2631 """Computes parent of the generated commit to be uploaded to Gerrit.
2632
2633 Returns revision or a ref name.
2634 """
2635 if custom_cl_base:
2636 # Try to avoid creating additional unintended CLs when uploading, unless
2637 # user wants to take this risk.
2638 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2639 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2640 local_ref_of_target_remote])
2641 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002642 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002643 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2644 'If you proceed with upload, more than 1 CL may be created by '
2645 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2646 'If you are certain that specified base `%s` has already been '
2647 'uploaded to Gerrit as another CL, you may proceed.\n' %
2648 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2649 if not force:
2650 confirm_or_exit(
2651 'Do you take responsibility for cleaning up potential mess '
2652 'resulting from proceeding with upload?',
2653 action='upload')
2654 return custom_cl_base
2655
Aaron Gablef97e33d2017-03-30 15:44:27 -07002656 if remote != '.':
2657 return self.GetCommonAncestorWithUpstream()
2658
2659 # If our upstream branch is local, we base our squashed commit on its
2660 # squashed version.
2661 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2662
Aaron Gablef97e33d2017-03-30 15:44:27 -07002663 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002664 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002665
2666 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002667 # TODO(tandrii): consider checking parent change in Gerrit and using its
2668 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2669 # the tree hash of the parent branch. The upside is less likely bogus
2670 # requests to reupload parent change just because it's uploadhash is
2671 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002672 parent = RunGit(['config',
2673 'branch.%s.gerritsquashhash' % upstream_branch_name],
2674 error_ok=True).strip()
2675 # Verify that the upstream branch has been uploaded too, otherwise
2676 # Gerrit will create additional CLs when uploading.
2677 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2678 RunGitSilent(['rev-parse', parent + ':'])):
2679 DieWithError(
2680 '\nUpload upstream branch %s first.\n'
2681 'It is likely that this branch has been rebased since its last '
2682 'upload, so you just need to upload it again.\n'
2683 '(If you uploaded it with --no-squash, then branch dependencies '
2684 'are not supported, and you should reupload with --squash.)'
2685 % upstream_branch_name,
2686 change_desc)
2687 return parent
2688
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002689 def _AddChangeIdToCommitMessage(self, options, args):
2690 """Re-commits using the current message, assumes the commit hook is in
2691 place.
2692 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002693 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002694 git_command = ['commit', '--amend', '-m', log_desc]
2695 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002696 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002697 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002698 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002699 return new_log_desc
2700 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002701 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002702
tandriie113dfd2016-10-11 10:20:12 -07002703 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002704 try:
2705 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002706 except GerritChangeNotExists:
2707 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002708
2709 if data['status'] in ('ABANDONED', 'MERGED'):
2710 return 'CL %s is closed' % self.GetIssue()
2711
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002712 def GetGerritChange(self, patchset=None):
2713 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002714 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002715 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002716 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002717 data = self._GetChangeDetail(['ALL_REVISIONS'])
2718
2719 assert host and issue and patchset, 'CL must be uploaded first'
2720
2721 has_patchset = any(
2722 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002723 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002724 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002725 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002726 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002727
tandrii8c5a3532016-11-04 07:52:02 -07002728 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002729 'host': host,
2730 'change': issue,
2731 'project': data['project'],
2732 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002733 }
tandriie113dfd2016-10-11 10:20:12 -07002734
tandriide281ae2016-10-12 06:02:30 -07002735 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002736 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002737
Edward Lemur707d70b2018-02-07 00:50:14 +01002738 def GetReviewers(self):
2739 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002740 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002741
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002742
tandriif9aefb72016-07-01 09:06:51 -07002743def _get_bug_line_values(default_project, bugs):
2744 """Given default_project and comma separated list of bugs, yields bug line
2745 values.
2746
2747 Each bug can be either:
2748 * a number, which is combined with default_project
2749 * string, which is left as is.
2750
2751 This function may produce more than one line, because bugdroid expects one
2752 project per line.
2753
2754 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2755 ['v8:123', 'chromium:789']
2756 """
2757 default_bugs = []
2758 others = []
2759 for bug in bugs.split(','):
2760 bug = bug.strip()
2761 if bug:
2762 try:
2763 default_bugs.append(int(bug))
2764 except ValueError:
2765 others.append(bug)
2766
2767 if default_bugs:
2768 default_bugs = ','.join(map(str, default_bugs))
2769 if default_project:
2770 yield '%s:%s' % (default_project, default_bugs)
2771 else:
2772 yield default_bugs
2773 for other in sorted(others):
2774 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2775 yield other
2776
2777
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002778class ChangeDescription(object):
2779 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002780 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002781 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002782 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002783 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002784 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002785 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2786 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002787 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002788 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002789
Dan Beamd8b04ca2019-10-10 21:23:26 +00002790 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002791 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002792 if bug:
2793 regexp = re.compile(self.BUG_LINE)
2794 prefix = settings.GetBugPrefix()
2795 if not any((regexp.match(line) for line in self._description_lines)):
2796 values = list(_get_bug_line_values(prefix, bug))
2797 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002798 if fixed:
2799 regexp = re.compile(self.FIXED_LINE)
2800 prefix = settings.GetBugPrefix()
2801 if not any((regexp.match(line) for line in self._description_lines)):
2802 values = list(_get_bug_line_values(prefix, fixed))
2803 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002804
agable@chromium.org42c20792013-09-12 17:34:49 +00002805 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002806 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002807 return '\n'.join(self._description_lines)
2808
2809 def set_description(self, desc):
2810 if isinstance(desc, basestring):
2811 lines = desc.splitlines()
2812 else:
2813 lines = [line.rstrip() for line in desc]
2814 while lines and not lines[0]:
2815 lines.pop(0)
2816 while lines and not lines[-1]:
2817 lines.pop(-1)
2818 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002819
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002820 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2821 """Rewrites the R=/TBR= line(s) as a single line each.
2822
2823 Args:
2824 reviewers (list(str)) - list of additional emails to use for reviewers.
2825 tbrs (list(str)) - list of additional emails to use for TBRs.
2826 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2827 the change that are missing OWNER coverage. If this is not None, you
2828 must also pass a value for `change`.
2829 change (Change) - The Change that should be used for OWNERS lookups.
2830 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002831 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002832 assert isinstance(tbrs, list), tbrs
2833
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002834 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002835 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002836
2837 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002838 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002839
2840 reviewers = set(reviewers)
2841 tbrs = set(tbrs)
2842 LOOKUP = {
2843 'TBR': tbrs,
2844 'R': reviewers,
2845 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002846
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002847 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002848 regexp = re.compile(self.R_LINE)
2849 matches = [regexp.match(line) for line in self._description_lines]
2850 new_desc = [l for i, l in enumerate(self._description_lines)
2851 if not matches[i]]
2852 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002853
agable@chromium.org42c20792013-09-12 17:34:49 +00002854 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002855
2856 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002857 for match in matches:
2858 if not match:
2859 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002860 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2861
2862 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002863 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002864 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002865 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002866 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002867 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002868 LOOKUP[add_owners_to].update(
2869 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002870
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002871 # If any folks ended up in both groups, remove them from tbrs.
2872 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002873
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002874 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2875 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002876
2877 # Put the new lines in the description where the old first R= line was.
2878 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2879 if 0 <= line_loc < len(self._description_lines):
2880 if new_tbr_line:
2881 self._description_lines.insert(line_loc, new_tbr_line)
2882 if new_r_line:
2883 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002884 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002885 if new_r_line:
2886 self.append_footer(new_r_line)
2887 if new_tbr_line:
2888 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002889
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002890 def set_preserve_tryjobs(self):
2891 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2892 footers = git_footers.parse_footers(self.description)
2893 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2894 if v.lower() == 'true':
2895 return
2896 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2897
Anthony Polito8b955342019-09-24 19:01:36 +00002898 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002899 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002900 self.set_description([
2901 '# Enter a description of the change.',
2902 '# This will be displayed on the codereview site.',
2903 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002904 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002905 '--------------------',
2906 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002907 bug_regexp = re.compile(self.BUG_LINE)
2908 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002909 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002910 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2911 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002912 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002913
agable@chromium.org42c20792013-09-12 17:34:49 +00002914 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002915 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002916 if not content:
2917 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002918 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002919
Bruce Dawson2377b012018-01-11 16:46:49 -08002920 # Strip off comments and default inserted "Bug:" line.
2921 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002922 (line.startswith('#') or
2923 line.rstrip() == "Bug:" or
2924 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002925 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002926 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002927 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002928
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002929 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002930 """Adds a footer line to the description.
2931
2932 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2933 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2934 that Gerrit footers are always at the end.
2935 """
2936 parsed_footer_line = git_footers.parse_footer(line)
2937 if parsed_footer_line:
2938 # Line is a gerrit footer in the form: Footer-Key: any value.
2939 # Thus, must be appended observing Gerrit footer rules.
2940 self.set_description(
2941 git_footers.add_footer(self.description,
2942 key=parsed_footer_line[0],
2943 value=parsed_footer_line[1]))
2944 return
2945
2946 if not self._description_lines:
2947 self._description_lines.append(line)
2948 return
2949
2950 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2951 if gerrit_footers:
2952 # git_footers.split_footers ensures that there is an empty line before
2953 # actual (gerrit) footers, if any. We have to keep it that way.
2954 assert top_lines and top_lines[-1] == ''
2955 top_lines, separator = top_lines[:-1], top_lines[-1:]
2956 else:
2957 separator = [] # No need for separator if there are no gerrit_footers.
2958
2959 prev_line = top_lines[-1] if top_lines else ''
2960 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2961 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2962 top_lines.append('')
2963 top_lines.append(line)
2964 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002965
tandrii99a72f22016-08-17 14:33:24 -07002966 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002967 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002968 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002969 reviewers = [match.group(2).strip()
2970 for match in matches
2971 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002972 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002973
bradnelsond975b302016-10-23 12:20:23 -07002974 def get_cced(self):
2975 """Retrieves the list of reviewers."""
2976 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2977 cced = [match.group(2).strip() for match in matches if match]
2978 return cleanup_list(cced)
2979
Nodir Turakulov23b82142017-11-16 11:04:25 -08002980 def get_hash_tags(self):
2981 """Extracts and sanitizes a list of Gerrit hashtags."""
2982 subject = (self._description_lines or ('',))[0]
2983 subject = re.sub(
2984 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2985
2986 tags = []
2987 start = 0
2988 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2989 while True:
2990 m = bracket_exp.match(subject, start)
2991 if not m:
2992 break
2993 tags.append(self.sanitize_hash_tag(m.group(1)))
2994 start = m.end()
2995
2996 if not tags:
2997 # Try "Tag: " prefix.
2998 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2999 if m:
3000 tags.append(self.sanitize_hash_tag(m.group(1)))
3001 return tags
3002
3003 @classmethod
3004 def sanitize_hash_tag(cls, tag):
3005 """Returns a sanitized Gerrit hash tag.
3006
3007 A sanitized hashtag can be used as a git push refspec parameter value.
3008 """
3009 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3010
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003011 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3012 """Updates this commit description given the parent.
3013
3014 This is essentially what Gnumbd used to do.
3015 Consult https://goo.gl/WMmpDe for more details.
3016 """
3017 assert parent_msg # No, orphan branch creation isn't supported.
3018 assert parent_hash
3019 assert dest_ref
3020 parent_footer_map = git_footers.parse_footers(parent_msg)
3021 # This will also happily parse svn-position, which GnumbD is no longer
3022 # supporting. While we'd generate correct footers, the verifier plugin
3023 # installed in Gerrit will block such commit (ie git push below will fail).
3024 parent_position = git_footers.get_position(parent_footer_map)
3025
3026 # Cherry-picks may have last line obscuring their prior footers,
3027 # from git_footers perspective. This is also what Gnumbd did.
3028 cp_line = None
3029 if (self._description_lines and
3030 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3031 cp_line = self._description_lines.pop()
3032
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003033 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003034
3035 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3036 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003037 for i, line in enumerate(footer_lines):
3038 k, v = git_footers.parse_footer(line) or (None, None)
3039 if k and k.startswith('Cr-'):
3040 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003041
3042 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003043 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003044 if parent_position[0] == dest_ref:
3045 # Same branch as parent.
3046 number = int(parent_position[1]) + 1
3047 else:
3048 number = 1 # New branch, and extra lineage.
3049 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3050 int(parent_position[1])))
3051
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003052 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3053 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003054
3055 self._description_lines = top_lines
3056 if cp_line:
3057 self._description_lines.append(cp_line)
3058 if self._description_lines[-1] != '':
3059 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003060 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003061
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003062
Aaron Gablea1bab272017-04-11 16:38:18 -07003063def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003064 """Retrieves the reviewers that approved a CL from the issue properties with
3065 messages.
3066
3067 Note that the list may contain reviewers that are not committer, thus are not
3068 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003069
3070 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003071 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003072 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003073 return sorted(
3074 set(
3075 message['sender']
3076 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003077 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003078 )
3079 )
3080
3081
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003082def FindCodereviewSettingsFile(filename='codereview.settings'):
3083 """Finds the given file starting in the cwd and going up.
3084
3085 Only looks up to the top of the repository unless an
3086 'inherit-review-settings-ok' file exists in the root of the repository.
3087 """
3088 inherit_ok_file = 'inherit-review-settings-ok'
3089 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003090 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003091 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3092 root = '/'
3093 while True:
3094 if filename in os.listdir(cwd):
3095 if os.path.isfile(os.path.join(cwd, filename)):
3096 return open(os.path.join(cwd, filename))
3097 if cwd == root:
3098 break
3099 cwd = os.path.dirname(cwd)
3100
3101
3102def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003103 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003104 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003105
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003106 def SetProperty(name, setting, unset_error_ok=False):
3107 fullname = 'rietveld.' + name
3108 if setting in keyvals:
3109 RunGit(['config', fullname, keyvals[setting]])
3110 else:
3111 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3112
tandrii48df5812016-10-17 03:55:37 -07003113 if not keyvals.get('GERRIT_HOST', False):
3114 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003115 # Only server setting is required. Other settings can be absent.
3116 # In that case, we ignore errors raised during option deletion attempt.
3117 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3118 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3119 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003120 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003121 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3122 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003123 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3124 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003125 SetProperty(
3126 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003127
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003128 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003129 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003130
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003131 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003132 RunGit(['config', 'gerrit.squash-uploads',
3133 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003134
tandrii@chromium.org28253532016-04-14 13:46:56 +00003135 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003136 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003137 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3138
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003139 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003140 # should be of the form
3141 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3142 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003143 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3144 keyvals['ORIGIN_URL_CONFIG']])
3145
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003146
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003147def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003148 """Downloads a network object to a local file, like urllib.urlretrieve.
3149
3150 This is necessary because urllib is broken for SSL connections via a proxy.
3151 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003152 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003153 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003154
3155
ukai@chromium.org712d6102013-11-27 00:52:58 +00003156def hasSheBang(fname):
3157 """Checks fname is a #! script."""
3158 with open(fname) as f:
3159 return f.read(2).startswith('#!')
3160
3161
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003162# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3163def DownloadHooks(*args, **kwargs):
3164 pass
3165
3166
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003167def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003168 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003169
3170 Args:
3171 force: True to update hooks. False to install hooks if not present.
3172 """
3173 if not settings.GetIsGerrit():
3174 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003175 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003176 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3177 if not os.access(dst, os.X_OK):
3178 if os.path.exists(dst):
3179 if not force:
3180 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003181 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003182 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003183 if not hasSheBang(dst):
3184 DieWithError('Not a script: %s\n'
3185 'You need to download from\n%s\n'
3186 'into .git/hooks/commit-msg and '
3187 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003188 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3189 except Exception:
3190 if os.path.exists(dst):
3191 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003192 DieWithError('\nFailed to download hooks.\n'
3193 'You need to download from\n%s\n'
3194 'into .git/hooks/commit-msg and '
3195 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003196
3197
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003198class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003199 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003200
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003201 _GOOGLESOURCE = 'googlesource.com'
3202
3203 def __init__(self):
3204 # Cached list of [host, identity, source], where source is either
3205 # .gitcookies or .netrc.
3206 self._all_hosts = None
3207
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003208 def ensure_configured_gitcookies(self):
3209 """Runs checks and suggests fixes to make git use .gitcookies from default
3210 path."""
3211 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3212 configured_path = RunGitSilent(
3213 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003214 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003215 if configured_path:
3216 self._ensure_default_gitcookies_path(configured_path, default)
3217 else:
3218 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003219
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003220 @staticmethod
3221 def _ensure_default_gitcookies_path(configured_path, default_path):
3222 assert configured_path
3223 if configured_path == default_path:
3224 print('git is already configured to use your .gitcookies from %s' %
3225 configured_path)
3226 return
3227
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003228 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003229 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3230 (configured_path, default_path))
3231
3232 if not os.path.exists(configured_path):
3233 print('However, your configured .gitcookies file is missing.')
3234 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3235 action='reconfigure')
3236 RunGit(['config', '--global', 'http.cookiefile', default_path])
3237 return
3238
3239 if os.path.exists(default_path):
3240 print('WARNING: default .gitcookies file already exists %s' %
3241 default_path)
3242 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3243 default_path)
3244
3245 confirm_or_exit('Move existing .gitcookies to default location?',
3246 action='move')
3247 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003248 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003249 print('Moved and reconfigured git to use .gitcookies from %s' %
3250 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003251
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003252 @staticmethod
3253 def _configure_gitcookies_path(default_path):
3254 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3255 if os.path.exists(netrc_path):
3256 print('You seem to be using outdated .netrc for git credentials: %s' %
3257 netrc_path)
3258 print('This tool will guide you through setting up recommended '
3259 '.gitcookies store for git credentials.\n'
3260 '\n'
3261 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3262 ' git config --global --unset http.cookiefile\n'
3263 ' mv %s %s.backup\n\n' % (default_path, default_path))
3264 confirm_or_exit(action='setup .gitcookies')
3265 RunGit(['config', '--global', 'http.cookiefile', default_path])
3266 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003267
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003268 def get_hosts_with_creds(self, include_netrc=False):
3269 if self._all_hosts is None:
3270 a = gerrit_util.CookiesAuthenticator()
3271 self._all_hosts = [
3272 (h, u, s)
3273 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003274 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3275 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003276 )
3277 if h.endswith(self._GOOGLESOURCE)
3278 ]
3279
3280 if include_netrc:
3281 return self._all_hosts
3282 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3283
3284 def print_current_creds(self, include_netrc=False):
3285 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3286 if not hosts:
3287 print('No Git/Gerrit credentials found')
3288 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003289 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003290 header = [('Host', 'User', 'Which file'),
3291 ['=' * l for l in lengths]]
3292 for row in (header + hosts):
3293 print('\t'.join((('%%+%ds' % l) % s)
3294 for l, s in zip(lengths, row)))
3295
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003296 @staticmethod
3297 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003298 """Parses identity "git-<username>.domain" into <username> and domain."""
3299 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003300 # distinguishable from sub-domains. But we do know typical domains:
3301 if identity.endswith('.chromium.org'):
3302 domain = 'chromium.org'
3303 username = identity[:-len('.chromium.org')]
3304 else:
3305 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003306 if username.startswith('git-'):
3307 username = username[len('git-'):]
3308 return username, domain
3309
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003310 def _canonical_git_googlesource_host(self, host):
3311 """Normalizes Gerrit hosts (with '-review') to Git host."""
3312 assert host.endswith(self._GOOGLESOURCE)
3313 # Prefix doesn't include '.' at the end.
3314 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3315 if prefix.endswith('-review'):
3316 prefix = prefix[:-len('-review')]
3317 return prefix + '.' + self._GOOGLESOURCE
3318
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003319 def _canonical_gerrit_googlesource_host(self, host):
3320 git_host = self._canonical_git_googlesource_host(host)
3321 prefix = git_host.split('.', 1)[0]
3322 return prefix + '-review.' + self._GOOGLESOURCE
3323
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003324 def _get_counterpart_host(self, host):
3325 assert host.endswith(self._GOOGLESOURCE)
3326 git = self._canonical_git_googlesource_host(host)
3327 gerrit = self._canonical_gerrit_googlesource_host(git)
3328 return git if gerrit == host else gerrit
3329
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003330 def has_generic_host(self):
3331 """Returns whether generic .googlesource.com has been configured.
3332
3333 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3334 """
3335 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3336 if host == '.' + self._GOOGLESOURCE:
3337 return True
3338 return False
3339
3340 def _get_git_gerrit_identity_pairs(self):
3341 """Returns map from canonic host to pair of identities (Git, Gerrit).
3342
3343 One of identities might be None, meaning not configured.
3344 """
3345 host_to_identity_pairs = {}
3346 for host, identity, _ in self.get_hosts_with_creds():
3347 canonical = self._canonical_git_googlesource_host(host)
3348 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3349 idx = 0 if canonical == host else 1
3350 pair[idx] = identity
3351 return host_to_identity_pairs
3352
3353 def get_partially_configured_hosts(self):
3354 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003355 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003356 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003357 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003358
3359 def get_conflicting_hosts(self):
3360 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003361 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003362 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003363 if None not in (i1, i2) and i1 != i2)
3364
3365 def get_duplicated_hosts(self):
3366 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003367 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003368
3369 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3370 'chromium.googlesource.com': 'chromium.org',
3371 'chrome-internal.googlesource.com': 'google.com',
3372 }
3373
3374 def get_hosts_with_wrong_identities(self):
3375 """Finds hosts which **likely** reference wrong identities.
3376
3377 Note: skips hosts which have conflicting identities for Git and Gerrit.
3378 """
3379 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003380 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003381 pair = self._get_git_gerrit_identity_pairs().get(host)
3382 if pair and pair[0] == pair[1]:
3383 _, domain = self._parse_identity(pair[0])
3384 if domain != expected:
3385 hosts.add(host)
3386 return hosts
3387
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003388 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003389 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003390 hosts = sorted(hosts)
3391 assert hosts
3392 if extra_column_func is None:
3393 extras = [''] * len(hosts)
3394 else:
3395 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003396 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3397 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003398 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003399 lines.append(tmpl % he)
3400 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003401
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003402 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003403 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003404 yield ('.googlesource.com wildcard record detected',
3405 ['Chrome Infrastructure team recommends to list full host names '
3406 'explicitly.'],
3407 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003408
3409 dups = self.get_duplicated_hosts()
3410 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003411 yield ('The following hosts were defined twice',
3412 self._format_hosts(dups),
3413 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003414
3415 partial = self.get_partially_configured_hosts()
3416 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003417 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3418 'These hosts are missing',
3419 self._format_hosts(partial, lambda host: 'but %s defined' %
3420 self._get_counterpart_host(host)),
3421 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003422
3423 conflicting = self.get_conflicting_hosts()
3424 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003425 yield ('The following Git hosts have differing credentials from their '
3426 'Gerrit counterparts',
3427 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3428 tuple(self._get_git_gerrit_identity_pairs()[host])),
3429 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003430
3431 wrong = self.get_hosts_with_wrong_identities()
3432 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003433 yield ('These hosts likely use wrong identity',
3434 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3435 (self._get_git_gerrit_identity_pairs()[host][0],
3436 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3437 wrong)
3438
3439 def find_and_report_problems(self):
3440 """Returns True if there was at least one problem, else False."""
3441 found = False
3442 bad_hosts = set()
3443 for title, sublines, hosts in self._find_problems():
3444 if not found:
3445 found = True
3446 print('\n\n.gitcookies problem report:\n')
3447 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003448 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003449 if sublines:
3450 print()
3451 print(' %s' % '\n '.join(sublines))
3452 print()
3453
3454 if bad_hosts:
3455 assert found
3456 print(' You can manually remove corresponding lines in your %s file and '
3457 'visit the following URLs with correct account to generate '
3458 'correct credential lines:\n' %
3459 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3460 print(' %s' % '\n '.join(sorted(set(
3461 gerrit_util.CookiesAuthenticator().get_new_password_url(
3462 self._canonical_git_googlesource_host(host))
3463 for host in bad_hosts
3464 ))))
3465 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003466
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003467
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003468@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003469def CMDcreds_check(parser, args):
3470 """Checks credentials and suggests changes."""
3471 _, _ = parser.parse_args(args)
3472
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003473 # Code below checks .gitcookies. Abort if using something else.
3474 authn = gerrit_util.Authenticator.get()
3475 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3476 if isinstance(authn, gerrit_util.GceAuthenticator):
3477 DieWithError(
3478 'This command is not designed for GCE, are you on a bot?\n'
3479 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3480 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003481 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003482 'This command is not designed for bot environment. It checks '
3483 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003484
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003485 checker = _GitCookiesChecker()
3486 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003487
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003488 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003489 checker.print_current_creds(include_netrc=True)
3490
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003491 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003492 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003493 return 0
3494 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003495
3496
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003497@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003498def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003499 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003500 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3501 branch = ShortBranchName(branchref)
3502 _, args = parser.parse_args(args)
3503 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003504 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003505 return RunGit(['config', 'branch.%s.base-url' % branch],
3506 error_ok=False).strip()
3507 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003508 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003509 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3510 error_ok=False).strip()
3511
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003512
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003513def color_for_status(status):
3514 """Maps a Changelist status to color, for CMDstatus and other tools."""
3515 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003516 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003517 'waiting': Fore.BLUE,
3518 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003519 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003520 'lgtm': Fore.GREEN,
3521 'commit': Fore.MAGENTA,
3522 'closed': Fore.CYAN,
3523 'error': Fore.WHITE,
3524 }.get(status, Fore.WHITE)
3525
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003526
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003527def get_cl_statuses(changes, fine_grained, max_processes=None):
3528 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003529
3530 If fine_grained is true, this will fetch CL statuses from the server.
3531 Otherwise, simply indicate if there's a matching url for the given branches.
3532
3533 If max_processes is specified, it is used as the maximum number of processes
3534 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3535 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003536
3537 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003538 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003539 if not changes:
3540 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003541
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003542 if not fine_grained:
3543 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003544 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003545 for cl in changes:
3546 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003547 return
3548
3549 # First, sort out authentication issues.
3550 logging.debug('ensuring credentials exist')
3551 for cl in changes:
3552 cl.EnsureAuthenticated(force=False, refresh=True)
3553
3554 def fetch(cl):
3555 try:
3556 return (cl, cl.GetStatus())
3557 except:
3558 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003559 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003560 raise
3561
3562 threads_count = len(changes)
3563 if max_processes:
3564 threads_count = max(1, min(threads_count, max_processes))
3565 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3566
3567 pool = ThreadPool(threads_count)
3568 fetched_cls = set()
3569 try:
3570 it = pool.imap_unordered(fetch, changes).__iter__()
3571 while True:
3572 try:
3573 cl, status = it.next(timeout=5)
3574 except multiprocessing.TimeoutError:
3575 break
3576 fetched_cls.add(cl)
3577 yield cl, status
3578 finally:
3579 pool.close()
3580
3581 # Add any branches that failed to fetch.
3582 for cl in set(changes) - fetched_cls:
3583 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003584
rmistry@google.com2dd99862015-06-22 12:22:18 +00003585
3586def upload_branch_deps(cl, args):
3587 """Uploads CLs of local branches that are dependents of the current branch.
3588
3589 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003590
3591 test1 -> test2.1 -> test3.1
3592 -> test3.2
3593 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003594
3595 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3596 run on the dependent branches in this order:
3597 test2.1, test3.1, test3.2, test2.2, test3.3
3598
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003599 Note: This function does not rebase your local dependent branches. Use it
3600 when you make a change to the parent branch that will not conflict
3601 with its dependent branches, and you would like their dependencies
3602 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003603 """
3604 if git_common.is_dirty_git_tree('upload-branch-deps'):
3605 return 1
3606
3607 root_branch = cl.GetBranch()
3608 if root_branch is None:
3609 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3610 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003611 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003612 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3613 'patchset dependencies without an uploaded CL.')
3614
3615 branches = RunGit(['for-each-ref',
3616 '--format=%(refname:short) %(upstream:short)',
3617 'refs/heads'])
3618 if not branches:
3619 print('No local branches found.')
3620 return 0
3621
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003622 # Create a dictionary of all local branches to the branches that are
3623 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003624 tracked_to_dependents = collections.defaultdict(list)
3625 for b in branches.splitlines():
3626 tokens = b.split()
3627 if len(tokens) == 2:
3628 branch_name, tracked = tokens
3629 tracked_to_dependents[tracked].append(branch_name)
3630
vapiera7fbd5a2016-06-16 09:17:49 -07003631 print()
3632 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003633 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003634
rmistry@google.com2dd99862015-06-22 12:22:18 +00003635 def traverse_dependents_preorder(branch, padding=''):
3636 dependents_to_process = tracked_to_dependents.get(branch, [])
3637 padding += ' '
3638 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003639 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003640 dependents.append(dependent)
3641 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003642
rmistry@google.com2dd99862015-06-22 12:22:18 +00003643 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003644 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003645
3646 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003647 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003648 return 0
3649
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003650 confirm_or_exit('This command will checkout all dependent branches and run '
3651 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003652
rmistry@google.com2dd99862015-06-22 12:22:18 +00003653 # Record all dependents that failed to upload.
3654 failures = {}
3655 # Go through all dependents, checkout the branch and upload.
3656 try:
3657 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003658 print()
3659 print('--------------------------------------')
3660 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003661 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003662 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003663 try:
3664 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003665 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003666 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003667 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003668 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003669 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003670 finally:
3671 # Swap back to the original root branch.
3672 RunGit(['checkout', '-q', root_branch])
3673
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print()
3675 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003676 for dependent_branch in dependents:
3677 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003678 print(' %s : %s' % (dependent_branch, upload_status))
3679 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003680
3681 return 0
3682
3683
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003684def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3685 """Given a proposed tag name, returns a tag name that is guaranteed to be
3686 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3687 or 'foo-3', and so on."""
3688
3689 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3690 for suffix_num in itertools.count(1):
3691 if suffix_num == 1:
3692 to_check = proposed_tag
3693 else:
3694 to_check = '%s-%d' % (proposed_tag, suffix_num)
3695
3696 if to_check not in existing_tags:
3697 return to_check
3698
3699
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003700@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003701def CMDarchive(parser, args):
3702 """Archives and deletes branches associated with closed changelists."""
3703 parser.add_option(
3704 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003705 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003706 parser.add_option(
3707 '-f', '--force', action='store_true',
3708 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003709 parser.add_option(
3710 '-d', '--dry-run', action='store_true',
3711 help='Skip the branch tagging and removal steps.')
3712 parser.add_option(
3713 '-t', '--notags', action='store_true',
3714 help='Do not tag archived branches. '
3715 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003716
kmarshall3bff56b2016-06-06 18:31:47 -07003717 options, args = parser.parse_args(args)
3718 if args:
3719 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003720
3721 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3722 if not branches:
3723 return 0
3724
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003725 tags = RunGit(['for-each-ref', '--format=%(refname)',
3726 'refs/tags']).splitlines() or []
3727 tags = [t.split('/')[-1] for t in tags]
3728
vapiera7fbd5a2016-06-16 09:17:49 -07003729 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003730 changes = [Changelist(branchref=b)
3731 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003732 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3733 statuses = get_cl_statuses(changes,
3734 fine_grained=True,
3735 max_processes=options.maxjobs)
3736 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003737 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3738 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003739 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003740 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003741 proposal.sort()
3742
3743 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003744 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003745 return 0
3746
3747 current_branch = GetCurrentBranch()
3748
vapiera7fbd5a2016-06-16 09:17:49 -07003749 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003750 if options.notags:
3751 for next_item in proposal:
3752 print(' ' + next_item[0])
3753 else:
3754 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3755 for next_item in proposal:
3756 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003757
kmarshall9249e012016-08-23 12:02:16 -07003758 # Quit now on precondition failure or if instructed by the user, either
3759 # via an interactive prompt or by command line flags.
3760 if options.dry_run:
3761 print('\nNo changes were made (dry run).\n')
3762 return 0
3763 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003764 print('You are currently on a branch \'%s\' which is associated with a '
3765 'closed codereview issue, so archive cannot proceed. Please '
3766 'checkout another branch and run this command again.' %
3767 current_branch)
3768 return 1
kmarshall9249e012016-08-23 12:02:16 -07003769 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003770 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3771 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003772 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003773 return 1
3774
3775 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003776 if not options.notags:
3777 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003778
3779 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3780 # Clean up the tag if we failed to delete the branch.
3781 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003782
vapiera7fbd5a2016-06-16 09:17:49 -07003783 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003784
3785 return 0
3786
3787
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003788@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003789def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003790 """Show status of changelists.
3791
3792 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003793 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003794 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003795 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003796 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003797 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003798 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003799 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003800
3801 Also see 'git cl comments'.
3802 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003803 parser.add_option(
3804 '--no-branch-color',
3805 action='store_true',
3806 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003807 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003808 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003809 parser.add_option('-f', '--fast', action='store_true',
3810 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003811 parser.add_option(
3812 '-j', '--maxjobs', action='store', type=int,
3813 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003814 parser.add_option(
3815 '-i', '--issue', type=int,
3816 help='Operate on this issue instead of the current branch\'s implicit '
3817 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003818 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003819 if args:
3820 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003821
iannuccie53c9352016-08-17 14:40:40 -07003822 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003823 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003824
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003825 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003826 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003827 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003828 if cl.GetIssue():
3829 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003830 elif options.field == 'id':
3831 issueid = cl.GetIssue()
3832 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003833 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003834 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003835 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003836 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003837 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003838 elif options.field == 'status':
3839 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003840 elif options.field == 'url':
3841 url = cl.GetIssueURL()
3842 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003843 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003844 return 0
3845
3846 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3847 if not branches:
3848 print('No local branch found.')
3849 return 0
3850
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003851 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003852 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003853 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003854 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003855 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003856 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003857 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003858
Daniel McArdlea23bf592019-02-12 00:25:12 +00003859 current_branch = GetCurrentBranch()
3860
3861 def FormatBranchName(branch, colorize=False):
3862 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3863 an asterisk when it is the current branch."""
3864
3865 asterisk = ""
3866 color = Fore.RESET
3867 if branch == current_branch:
3868 asterisk = "* "
3869 color = Fore.GREEN
3870 branch_name = ShortBranchName(branch)
3871
3872 if colorize:
3873 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003874 return asterisk + branch_name
3875
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003876 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003877
3878 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003879 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3880 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003881 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003882 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003883 branch_statuses[c.GetBranch()] = status
3884 status = branch_statuses.pop(branch)
3885 url = cl.GetIssueURL()
3886 if url and (not status or status == 'error'):
3887 # The issue probably doesn't exist anymore.
3888 url += ' (broken)'
3889
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003890 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003891 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003892 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003893 color = ''
3894 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003895 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003896
Alan Cuttera3be9a52019-03-04 18:50:33 +00003897 branch_display = FormatBranchName(branch)
3898 padding = ' ' * (alignment - len(branch_display))
3899 if not options.no_branch_color:
3900 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003901
Alan Cuttera3be9a52019-03-04 18:50:33 +00003902 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3903 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003904
vapiera7fbd5a2016-06-16 09:17:49 -07003905 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003906 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003907 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003908 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003909 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003910 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003911 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003912 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003913 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003914 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003915 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003916 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003917 return 0
3918
3919
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003920def colorize_CMDstatus_doc():
3921 """To be called once in main() to add colors to git cl status help."""
3922 colors = [i for i in dir(Fore) if i[0].isupper()]
3923
3924 def colorize_line(line):
3925 for color in colors:
3926 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003927 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003928 indent = len(line) - len(line.lstrip(' ')) + 1
3929 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3930 return line
3931
3932 lines = CMDstatus.__doc__.splitlines()
3933 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3934
3935
phajdan.jre328cf92016-08-22 04:12:17 -07003936def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003937 if path == '-':
3938 json.dump(contents, sys.stdout)
3939 else:
3940 with open(path, 'w') as f:
3941 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003942
3943
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003944@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003945@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003946def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003947 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003948
3949 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003950 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003951 parser.add_option('-r', '--reverse', action='store_true',
3952 help='Lookup the branch(es) for the specified issues. If '
3953 'no issues are specified, all branches with mapped '
3954 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003955 parser.add_option('--json',
3956 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003957 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003958
dnj@chromium.org406c4402015-03-03 17:22:28 +00003959 if options.reverse:
3960 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003961 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003962 # Reverse issue lookup.
3963 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003964
3965 git_config = {}
3966 for config in RunGit(['config', '--get-regexp',
3967 r'branch\..*issue']).splitlines():
3968 name, _space, val = config.partition(' ')
3969 git_config[name] = val
3970
dnj@chromium.org406c4402015-03-03 17:22:28 +00003971 for branch in branches:
Edward Lemur52969c92020-02-06 18:15:28 +00003972 config_key = _git_branch_config_key(ShortBranchName(branch),
3973 Changelist.IssueConfigKey())
3974 issue = git_config.get(config_key)
3975 if issue:
3976 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003977 if not args:
3978 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003979 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003980 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003981 try:
3982 issue_num = int(issue)
3983 except ValueError:
3984 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003985 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003986 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003987 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003988 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003989 if options.json:
3990 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003991 return 0
3992
3993 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003994 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003995 if not issue.valid:
3996 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3997 'or no argument to list it.\n'
3998 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003999 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004000 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004001 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004002 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004003 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4004 if options.json:
4005 write_json(options.json, {
4006 'issue': cl.GetIssue(),
4007 'issue_url': cl.GetIssueURL(),
4008 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004009 return 0
4010
4011
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004012@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004013def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004014 """Shows or posts review comments for any changelist."""
4015 parser.add_option('-a', '--add-comment', dest='comment',
4016 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004017 parser.add_option('-p', '--publish', action='store_true',
4018 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004019 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004020 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004021 parser.add_option('-m', '--machine-readable', dest='readable',
4022 action='store_false', default=True,
4023 help='output comments in a format compatible with '
4024 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004025 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004026 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004027 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004028
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004029 issue = None
4030 if options.issue:
4031 try:
4032 issue = int(options.issue)
4033 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004034 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004035
Edward Lemur934836a2019-09-09 20:16:54 +00004036 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004037
4038 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004039 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004040 return 0
4041
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004042 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4043 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004044 for comment in summary:
4045 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004046 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004047 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004048 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004049 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004050 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004051 elif comment.autogenerated:
4052 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004053 else:
4054 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004055 print('\n%s%s %s%s\n%s' % (
4056 color,
4057 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4058 comment.sender,
4059 Fore.RESET,
4060 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4061
smut@google.comc85ac942015-09-15 16:34:43 +00004062 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004063 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004064 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004065 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4066 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004067 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004068 return 0
4069
4070
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004071@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004072@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004073def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004074 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004075 parser.add_option('-d', '--display', action='store_true',
4076 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004077 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004078 help='New description to set for this issue (- for stdin, '
4079 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004080 parser.add_option('-f', '--force', action='store_true',
4081 help='Delete any unpublished Gerrit edits for this issue '
4082 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004083
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004084 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004085
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004086 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004087 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004088 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004089 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004090 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004091
Edward Lemur934836a2019-09-09 20:16:54 +00004092 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004093 if target_issue_arg:
4094 kwargs['issue'] = target_issue_arg.issue
4095 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004096
4097 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004098 if not cl.GetIssue():
4099 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004100
Edward Lemur678a6842019-10-03 22:25:05 +00004101 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004102 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004103
Edward Lemur6c6827c2020-02-06 21:15:18 +00004104 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004105
smut@google.com34fb6b12015-07-13 20:03:26 +00004106 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004107 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004108 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004109
4110 if options.new_description:
4111 text = options.new_description
4112 if text == '-':
4113 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004114 elif text == '+':
4115 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004116 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004117
4118 description.set_description(text)
4119 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004120 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004121 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004122 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004123 return 0
4124
4125
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004126@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004127def CMDlint(parser, args):
4128 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004129 parser.add_option('--filter', action='append', metavar='-x,+y',
4130 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004131 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004132
4133 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004134 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004135 try:
4136 import cpplint
4137 import cpplint_chromium
4138 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004139 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004140 return 1
4141
4142 # Change the current working directory before calling lint so that it
4143 # shows the correct base.
4144 previous_cwd = os.getcwd()
4145 os.chdir(settings.GetRoot())
4146 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004147 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004148 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004149 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004150 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004151 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004152 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004153
4154 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004155 command = args + files
4156 if options.filter:
4157 command = ['--filter=' + ','.join(options.filter)] + command
4158 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004159
4160 white_regex = re.compile(settings.GetLintRegex())
4161 black_regex = re.compile(settings.GetLintIgnoreRegex())
4162 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4163 for filename in filenames:
4164 if white_regex.match(filename):
4165 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004166 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004167 else:
4168 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4169 extra_check_functions)
4170 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004171 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004172 finally:
4173 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004174 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004175 if cpplint._cpplint_state.error_count != 0:
4176 return 1
4177 return 0
4178
4179
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004180@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004181def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004182 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004183 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004184 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004185 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004186 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004187 parser.add_option('--all', action='store_true',
4188 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004189 parser.add_option('--parallel', action='store_true',
4190 help='Run all tests specified by input_api.RunTests in all '
4191 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004192 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004193
sbc@chromium.org71437c02015-04-09 19:29:40 +00004194 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004195 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004196 return 1
4197
Edward Lemur934836a2019-09-09 20:16:54 +00004198 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004199 if args:
4200 base_branch = args[0]
4201 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004202 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004203 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004204
Aaron Gable8076c282017-11-29 14:39:41 -08004205 if options.all:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004206 base_change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004207 files = [('M', f) for f in base_change.AllFiles()]
4208 change = presubmit_support.GitChange(
4209 base_change.Name(),
4210 base_change.FullDescriptionText(),
4211 base_change.RepositoryRoot(),
4212 files,
4213 base_change.issue,
4214 base_change.patchset,
4215 base_change.author_email,
4216 base_change._upstream)
4217 else:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004218 change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004219
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004220 cl.RunHook(
4221 committing=not options.upload,
4222 may_prompt=False,
4223 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004224 change=change,
4225 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004226 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004227
4228
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004229def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004230 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004231
4232 Works the same way as
4233 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4234 but can be called on demand on all platforms.
4235
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004236 The basic idea is to generate git hash of a state of the tree, original
4237 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004238 """
4239 lines = []
4240 tree_hash = RunGitSilent(['write-tree'])
4241 lines.append('tree %s' % tree_hash.strip())
4242 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4243 if code == 0:
4244 lines.append('parent %s' % parent.strip())
4245 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4246 lines.append('author %s' % author.strip())
4247 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4248 lines.append('committer %s' % committer.strip())
4249 lines.append('')
4250 # Note: Gerrit's commit-hook actually cleans message of some lines and
4251 # whitespace. This code is not doing this, but it clearly won't decrease
4252 # entropy.
4253 lines.append(message)
4254 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004255 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004256 return 'I%s' % change_hash.strip()
4257
4258
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004259def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004260 """Computes the remote branch ref to use for the CL.
4261
4262 Args:
4263 remote (str): The git remote for the CL.
4264 remote_branch (str): The git remote branch for the CL.
4265 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004266 """
4267 if not (remote and remote_branch):
4268 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004269
wittman@chromium.org455dc922015-01-26 20:15:50 +00004270 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004271 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004272 # refs, which are then translated into the remote full symbolic refs
4273 # below.
4274 if '/' not in target_branch:
4275 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4276 else:
4277 prefix_replacements = (
4278 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4279 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4280 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4281 )
4282 match = None
4283 for regex, replacement in prefix_replacements:
4284 match = re.search(regex, target_branch)
4285 if match:
4286 remote_branch = target_branch.replace(match.group(0), replacement)
4287 break
4288 if not match:
4289 # This is a branch path but not one we recognize; use as-is.
4290 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004291 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4292 # Handle the refs that need to land in different refs.
4293 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004294
wittman@chromium.org455dc922015-01-26 20:15:50 +00004295 # Create the true path to the remote branch.
4296 # Does the following translation:
4297 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4298 # * refs/remotes/origin/master -> refs/heads/master
4299 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4300 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4301 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4302 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4303 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4304 'refs/heads/')
4305 elif remote_branch.startswith('refs/remotes/branch-heads'):
4306 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004307
wittman@chromium.org455dc922015-01-26 20:15:50 +00004308 return remote_branch
4309
4310
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004311def cleanup_list(l):
4312 """Fixes a list so that comma separated items are put as individual items.
4313
4314 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4315 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4316 """
4317 items = sum((i.split(',') for i in l), [])
4318 stripped_items = (i.strip() for i in items)
4319 return sorted(filter(None, stripped_items))
4320
4321
Aaron Gable4db38df2017-11-03 14:59:07 -07004322@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004323@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004324def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004325 """Uploads the current changelist to codereview.
4326
4327 Can skip dependency patchset uploads for a branch by running:
4328 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004329 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004330 git config --unset branch.branch_name.skip-deps-uploads
4331 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004332
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004333 If the name of the checked out branch starts with "bug-" or "fix-" followed
4334 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004335 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004336
4337 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004338 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004339 [git-cl] add support for hashtags
4340 Foo bar: implement foo
4341 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004342 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004343 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4344 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004345 parser.add_option('--bypass-watchlists', action='store_true',
4346 dest='bypass_watchlists',
4347 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004348 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004349 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004350 parser.add_option('--message', '-m', dest='message',
4351 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004352 parser.add_option('-b', '--bug',
4353 help='pre-populate the bug number(s) for this issue. '
4354 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004355 parser.add_option('--message-file', dest='message_file',
4356 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004357 parser.add_option('--title', '-t', dest='title',
4358 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004359 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004360 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004361 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004362 parser.add_option('--tbrs',
4363 action='append', default=[],
4364 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004365 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004366 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004367 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004368 parser.add_option('--hashtag', dest='hashtags',
4369 action='append', default=[],
4370 help=('Gerrit hashtag for new CL; '
4371 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004372 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004373 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004374 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004375 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004376 metavar='TARGET',
4377 help='Apply CL to remote ref TARGET. ' +
4378 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004379 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004380 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004381 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004382 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004383 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004384 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004385 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4386 const='TBR', help='add a set of OWNERS to TBR')
4387 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4388 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004389 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004390 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004391 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004392 'implies --send-mail')
4393 parser.add_option('-d', '--cq-dry-run',
4394 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004395 help='Send the patchset to do a CQ dry run right after '
4396 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004397 parser.add_option('--preserve-tryjobs', action='store_true',
4398 help='instruct the CQ to let tryjobs running even after '
4399 'new patchsets are uploaded instead of canceling '
4400 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004401 parser.add_option('--dependencies', action='store_true',
4402 help='Uploads CLs of all the local branches that depend on '
4403 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004404 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4405 help='Sends your change to the CQ after an approval. Only '
4406 'works on repos that have the Auto-Submit label '
4407 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004408 parser.add_option('--parallel', action='store_true',
4409 help='Run all tests specified by input_api.RunTests in all '
4410 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004411 parser.add_option('--no-autocc', action='store_true',
4412 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004413 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004414 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004415 parser.add_option('-R', '--retry-failed', action='store_true',
4416 help='Retry failed tryjobs from old patchset immediately '
4417 'after uploading new patchset. Cannot be used with '
4418 '--use-commit-queue or --cq-dry-run.')
4419 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4420 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004421 parser.add_option('--fixed', '-x',
4422 help='List of bugs that will be commented on and marked '
4423 'fixed (pre-populates "Fixed:" tag). Same format as '
4424 '-b option / "Bug:" tag. If fixing several issues, '
4425 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004426 parser.add_option('--edit-description', action='store_true', default=False,
4427 help='Modify description before upload. Cannot be used '
4428 'with --force. It is a noop when --no-squash is set '
4429 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004430
rmistry@google.com2dd99862015-06-22 12:22:18 +00004431 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004432 (options, args) = parser.parse_args(args)
4433
sbc@chromium.org71437c02015-04-09 19:29:40 +00004434 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004435 return 1
4436
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004437 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004438 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004439 options.cc = cleanup_list(options.cc)
4440
Josipe827b0f2020-01-30 00:07:20 +00004441 if options.edit_description and options.force:
4442 parser.error('Only one of --force and --edit-description allowed')
4443
tandriib80458a2016-06-23 12:20:07 -07004444 if options.message_file:
4445 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004446 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004447 options.message = gclient_utils.FileRead(options.message_file)
4448 options.message_file = None
4449
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004450 if ([options.cq_dry_run,
4451 options.use_commit_queue,
4452 options.retry_failed].count(True) > 1):
4453 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4454 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004455
Aaron Gableedbc4132017-09-11 13:22:28 -07004456 if options.use_commit_queue:
4457 options.send_mail = True
4458
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004459 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4460 settings.GetIsGerrit()
4461
Edward Lemur934836a2019-09-09 20:16:54 +00004462 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004463 if options.retry_failed and not cl.GetIssue():
4464 print('No previous patchsets, so --retry-failed has no effect.')
4465 options.retry_failed = False
4466 # cl.GetMostRecentPatchset uses cached information, and can return the last
4467 # patchset before upload. Calling it here makes it clear that it's the
4468 # last patchset before upload. Note that GetMostRecentPatchset will fail
4469 # if no CL has been uploaded yet.
4470 if options.retry_failed:
4471 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004472
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004473 ret = cl.CMDUpload(options, args, orig_args)
4474
4475 if options.retry_failed:
4476 if ret != 0:
4477 print('Upload failed, so --retry-failed has no effect.')
4478 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004479 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004480 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004481 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004482 if len(buckets) == 0:
4483 print('No failed tryjobs, so --retry-failed has no effect.')
4484 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004485 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004486
4487 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004488
4489
Francois Dorayd42c6812017-05-30 15:10:20 -04004490@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004491@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004492def CMDsplit(parser, args):
4493 """Splits a branch into smaller branches and uploads CLs.
4494
4495 Creates a branch and uploads a CL for each group of files modified in the
4496 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004497 comment, '$directory' is replaced with the directory containing the changes
4498 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4499 sending out, and '$num_cls' is replaced with the total number of CLs that
4500 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004501 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004502 parser.add_option('-d', '--description', dest='description_file',
4503 help='A text file containing a CL description in which '
4504 '$directory will be replaced by each CL\'s directory.')
4505 parser.add_option('-c', '--comment', dest='comment_file',
4506 help='A text file containing a CL comment.')
4507 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004508 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004509 help='List the files and reviewers for each CL that would '
4510 'be created, but don\'t create branches or CLs.')
4511 parser.add_option('--cq-dry-run', action='store_true',
4512 help='If set, will do a cq dry run for each uploaded CL. '
4513 'Please be careful when doing this; more than ~10 CLs '
4514 'has the potential to overload our build '
4515 'infrastructure. Try to upload these not during high '
4516 'load times (usually 11-3 Mountain View time). Email '
4517 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004518 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4519 default=True,
4520 help='Sends your change to the CQ after an approval. Only '
4521 'works on repos that have the Auto-Submit label '
4522 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004523 options, _ = parser.parse_args(args)
4524
4525 if not options.description_file:
4526 parser.error('No --description flag specified.')
4527
4528 def WrappedCMDupload(args):
4529 return CMDupload(OptionParser(), args)
4530
4531 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004532 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004533 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004534
4535
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004536@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004537@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004538def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004539 """DEPRECATED: Used to commit the current changelist via git-svn."""
4540 message = ('git-cl no longer supports committing to SVN repositories via '
4541 'git-svn. You probably want to use `git cl land` instead.')
4542 print(message)
4543 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004544
4545
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004546@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004547@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004548def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004549 """Commits the current changelist via git.
4550
4551 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4552 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004553 """
4554 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4555 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004556 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004557 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004558 parser.add_option('--parallel', action='store_true',
4559 help='Run all tests specified by input_api.RunTests in all '
4560 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004561 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004562
Edward Lemur934836a2019-09-09 20:16:54 +00004563 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004564
Robert Iannucci2e73d432018-03-14 01:10:47 -07004565 if not cl.GetIssue():
4566 DieWithError('You must upload the change first to Gerrit.\n'
4567 ' If you would rather have `git cl land` upload '
4568 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004569 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004570 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004571
4572
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004573@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004574@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004575def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004576 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004577 parser.add_option('-b', dest='newbranch',
4578 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004579 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004580 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004581 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004582 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004583
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004584 group = optparse.OptionGroup(
4585 parser,
4586 'Options for continuing work on the current issue uploaded from a '
4587 'different clone (e.g. different machine). Must be used independently '
4588 'from the other options. No issue number should be specified, and the '
4589 'branch must have an issue number associated with it')
4590 group.add_option('--reapply', action='store_true', dest='reapply',
4591 help='Reset the branch and reapply the issue.\n'
4592 'CAUTION: This will undo any local changes in this '
4593 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004594
4595 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004596 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004597 parser.add_option_group(group)
4598
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004599 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004600
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004601 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004602 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004603 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004604 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004605 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004606
Edward Lemur934836a2019-09-09 20:16:54 +00004607 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004608 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004609 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004610
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004611 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004612 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004613 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004614
4615 RunGit(['reset', '--hard', upstream])
4616 if options.pull:
4617 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004618
Edward Lemur678a6842019-10-03 22:25:05 +00004619 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4620 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004621
4622 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004623 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004624
Edward Lemurf38bc172019-09-03 21:02:13 +00004625 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004626 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004627 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004628
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004629 # We don't want uncommitted changes mixed up with the patch.
4630 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004631 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004632
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004633 if options.newbranch:
4634 if options.force:
4635 RunGit(['branch', '-D', options.newbranch],
4636 stderr=subprocess2.PIPE, error_ok=True)
4637 RunGit(['new-branch', options.newbranch])
4638
Edward Lemur678a6842019-10-03 22:25:05 +00004639 cl = Changelist(
4640 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004641
Edward Lemur678a6842019-10-03 22:25:05 +00004642 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004643 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004644
Edward Lemurf38bc172019-09-03 21:02:13 +00004645 return cl.CMDPatchWithParsedIssue(
4646 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004647
4648
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004649def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004650 """Fetches the tree status and returns either 'open', 'closed',
4651 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004652 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004653 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004654 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004655 if status.find('closed') != -1 or status == '0':
4656 return 'closed'
4657 elif status.find('open') != -1 or status == '1':
4658 return 'open'
4659 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004660 return 'unset'
4661
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004662
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004663def GetTreeStatusReason():
4664 """Fetches the tree status from a json url and returns the message
4665 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004666 url = settings.GetTreeStatusUrl()
4667 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004668 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004669 status = json.loads(connection.read())
4670 connection.close()
4671 return status['message']
4672
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004673
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004674@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004675def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004676 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004677 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004678 status = GetTreeStatus()
4679 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004680 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004681 return 2
4682
vapiera7fbd5a2016-06-16 09:17:49 -07004683 print('The tree is %s' % status)
4684 print()
4685 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004686 if status != 'open':
4687 return 1
4688 return 0
4689
4690
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004691@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004692def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004693 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4694 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004695 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004696 '-b', '--bot', action='append',
4697 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4698 'times to specify multiple builders. ex: '
4699 '"-b win_rel -b win_layout". See '
4700 'the try server waterfall for the builders name and the tests '
4701 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004702 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004703 '-B', '--bucket', default='',
4704 help=('Buildbucket bucket to send the try requests.'))
4705 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004706 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004707 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004708 'be determined by the try recipe that builder runs, which usually '
4709 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004710 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004711 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004712 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004713 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004714 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004715 '--category', default='git_cl_try', help='Specify custom build category.')
4716 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004717 '--project',
4718 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004719 'in recipe to determine to which repository or directory to '
4720 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004721 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004722 '-p', '--property', dest='properties', action='append', default=[],
4723 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004724 'key2=value2 etc. The value will be treated as '
4725 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004726 'NOTE: using this may make your tryjob not usable for CQ, '
4727 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004728 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004729 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4730 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004731 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004732 parser.add_option(
4733 '-R', '--retry-failed', action='store_true', default=False,
4734 help='Retry failed jobs from the latest set of tryjobs. '
4735 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004736 parser.add_option(
4737 '-i', '--issue', type=int,
4738 help='Operate on this issue instead of the current branch\'s implicit '
4739 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004740 options, args = parser.parse_args(args)
4741
machenbach@chromium.org45453142015-09-15 08:45:22 +00004742 # Make sure that all properties are prop=value pairs.
4743 bad_params = [x for x in options.properties if '=' not in x]
4744 if bad_params:
4745 parser.error('Got properties with missing "=": %s' % bad_params)
4746
maruel@chromium.org15192402012-09-06 12:38:29 +00004747 if args:
4748 parser.error('Unknown arguments: %s' % args)
4749
Edward Lemur934836a2019-09-09 20:16:54 +00004750 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004751 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004752 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004753
Edward Lemurf38bc172019-09-03 21:02:13 +00004754 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004755 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004756
tandriie113dfd2016-10-11 10:20:12 -07004757 error_message = cl.CannotTriggerTryJobReason()
4758 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004759 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004760
Quinten Yearsley983111f2019-09-26 17:18:48 +00004761 if options.retry_failed:
4762 if options.bot or options.bucket:
4763 print('ERROR: The option --retry-failed is not compatible with '
4764 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4765 return 1
4766 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004767 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004768 if options.verbose:
4769 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004770 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004771 if not buckets:
4772 print('There are no failed jobs in the latest set of jobs '
4773 '(patchset #%d), doing nothing.' % patchset)
4774 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004775 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004776 if num_builders > 10:
4777 confirm_or_exit('There are %d builders with failed builds.'
4778 % num_builders, action='continue')
4779 else:
4780 buckets = _get_bucket_map(cl, options, parser)
4781 if buckets and any(b.startswith('master.') for b in buckets):
4782 print('ERROR: Buildbot masters are not supported.')
4783 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004784
qyearsleydd49f942016-10-28 11:57:22 -07004785 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4786 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004787 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004788 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004789 print('git cl try with no bots now defaults to CQ dry run.')
4790 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4791 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004792
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004793 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004794 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004795 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004796 'of bot requires an initial job from a parent (usually a builder). '
4797 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004798 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004799 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004800
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004801 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004802 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004803 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004804 except BuildbucketResponseException as ex:
4805 print('ERROR: %s' % ex)
4806 return 1
4807 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004808
4809
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004810@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004811def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004812 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004813 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004814 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004815 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004816 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004817 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004818 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004819 '--color', action='store_true', default=setup_color.IS_TTY,
4820 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004821 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004822 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4823 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004824 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004825 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004826 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004827 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004828 parser.add_option(
4829 '-i', '--issue', type=int,
4830 help='Operate on this issue instead of the current branch\'s implicit '
4831 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004832 options, args = parser.parse_args(args)
4833 if args:
4834 parser.error('Unrecognized args: %s' % ' '.join(args))
4835
Edward Lemur934836a2019-09-09 20:16:54 +00004836 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004837 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004838 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004839
tandrii221ab252016-10-06 08:12:04 -07004840 patchset = options.patchset
4841 if not patchset:
4842 patchset = cl.GetMostRecentPatchset()
4843 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004844 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004845 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004846 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004847 cl.GetIssue())
4848
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004849 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004850 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004851 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004852 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004853 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004854 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004855 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004856 else:
4857 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004858 return 0
4859
4860
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004861@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004862@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004863def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004864 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004865 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004866 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004867 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004868
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004869 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004870 if args:
4871 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004872 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004873 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004874 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004875 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004876
4877 # Clear configured merge-base, if there is one.
4878 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004879 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004880 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004881 return 0
4882
4883
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004884@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004885def CMDweb(parser, args):
4886 """Opens the current CL in the web browser."""
4887 _, args = parser.parse_args(args)
4888 if args:
4889 parser.error('Unrecognized args: %s' % ' '.join(args))
4890
4891 issue_url = Changelist().GetIssueURL()
4892 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004893 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004894 return 1
4895
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004896 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004897 # allows us to hide the "Created new window in existing browser session."
4898 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004899 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004900 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004901 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004902 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004903 os.open(os.devnull, os.O_RDWR)
4904 try:
4905 webbrowser.open(issue_url)
4906 finally:
4907 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004908 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004909 return 0
4910
4911
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004912@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004913def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004914 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004915 parser.add_option('-d', '--dry-run', action='store_true',
4916 help='trigger in dry run mode')
4917 parser.add_option('-c', '--clear', action='store_true',
4918 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004919 parser.add_option(
4920 '-i', '--issue', type=int,
4921 help='Operate on this issue instead of the current branch\'s implicit '
4922 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004923 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004924 if args:
4925 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004926 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004927 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004928
Edward Lemur934836a2019-09-09 20:16:54 +00004929 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004930 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004931 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004932 elif options.dry_run:
4933 state = _CQState.DRY_RUN
4934 else:
4935 state = _CQState.COMMIT
4936 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004937 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004938 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004939 return 0
4940
4941
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004942@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004943def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004944 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004945 parser.add_option(
4946 '-i', '--issue', type=int,
4947 help='Operate on this issue instead of the current branch\'s implicit '
4948 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004949 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004950 if args:
4951 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004952 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004953 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004954 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004955 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004956 cl.CloseIssue()
4957 return 0
4958
4959
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004960@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004961def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004962 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004963 parser.add_option(
4964 '--stat',
4965 action='store_true',
4966 dest='stat',
4967 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004968 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004969 if args:
4970 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004971
Edward Lemur934836a2019-09-09 20:16:54 +00004972 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004973 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004974 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004975 if not issue:
4976 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004977
Aaron Gablea718c3e2017-08-28 17:47:28 -07004978 base = cl._GitGetBranchConfigValue('last-upload-hash')
4979 if not base:
4980 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4981 if not base:
4982 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4983 revision_info = detail['revisions'][detail['current_revision']]
4984 fetch_info = revision_info['fetch']['http']
4985 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4986 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004987
Aaron Gablea718c3e2017-08-28 17:47:28 -07004988 cmd = ['git', 'diff']
4989 if options.stat:
4990 cmd.append('--stat')
4991 cmd.append(base)
4992 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004993
4994 return 0
4995
4996
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004997@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004998def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004999 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005000 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005001 '--ignore-current',
5002 action='store_true',
5003 help='Ignore the CL\'s current reviewers and start from scratch.')
5004 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005005 '--ignore-self',
5006 action='store_true',
5007 help='Do not consider CL\'s author as an owners.')
5008 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005009 '--no-color',
5010 action='store_true',
5011 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005012 parser.add_option(
5013 '--batch',
5014 action='store_true',
5015 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005016 # TODO: Consider moving this to another command, since other
5017 # git-cl owners commands deal with owners for a given CL.
5018 parser.add_option(
5019 '--show-all',
5020 action='store_true',
5021 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005022 options, args = parser.parse_args(args)
5023
5024 author = RunGit(['config', 'user.email']).strip() or None
5025
Edward Lemur934836a2019-09-09 20:16:54 +00005026 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005027
Yang Guo6e269a02019-06-26 11:17:02 +00005028 if options.show_all:
5029 for arg in args:
5030 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00005031 database = owners.Database(settings.GetRoot(), file, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00005032 database.load_data_needed_for([arg])
5033 print('Owners for %s:' % arg)
5034 for owner in sorted(database.all_possible_owners([arg], None)):
5035 print(' - %s' % owner)
5036 return 0
5037
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005038 if args:
5039 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005040 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005041 base_branch = args[0]
5042 else:
5043 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005044 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005045
Edward Lemur7f6dec02020-02-06 20:23:58 +00005046 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005047 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5048
5049 if options.batch:
5050 db = owners.Database(change.RepositoryRoot(), file, os.path)
5051 print('\n'.join(db.reviewers_for(affected_files, author)))
5052 return 0
5053
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005054 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005055 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005056 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005057 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005058 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005059 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005060 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005061 override_files=change.OriginalOwnersFiles(),
5062 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005063
5064
Aiden Bennerc08566e2018-10-03 17:52:42 +00005065def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005066 """Generates a diff command."""
5067 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005068 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5069
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005070 if allow_prefix:
5071 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5072 # case that diff.noprefix is set in the user's git config.
5073 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5074 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005075 diff_cmd += ['--no-prefix']
5076
5077 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005078
5079 if args:
5080 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005081 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005082 diff_cmd.append(arg)
5083 else:
5084 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005085
5086 return diff_cmd
5087
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005088
Jamie Madill5e96ad12020-01-13 16:08:35 +00005089def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5090 """Runs clang-format-diff and sets a return value if necessary."""
5091
5092 if not clang_diff_files:
5093 return 0
5094
5095 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5096 # formatted. This is used to block during the presubmit.
5097 return_value = 0
5098
5099 # Locate the clang-format binary in the checkout
5100 try:
5101 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5102 except clang_format.NotFoundError as e:
5103 DieWithError(e)
5104
5105 if opts.full or settings.GetFormatFullByDefault():
5106 cmd = [clang_format_tool]
5107 if not opts.dry_run and not opts.diff:
5108 cmd.append('-i')
5109 if opts.dry_run:
5110 for diff_file in clang_diff_files:
5111 with open(diff_file, 'r') as myfile:
5112 code = myfile.read().replace('\r\n', '\n')
5113 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5114 stdout = stdout.replace('\r\n', '\n')
5115 if opts.diff:
5116 sys.stdout.write(stdout)
5117 if code != stdout:
5118 return_value = 2
5119 else:
5120 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5121 if opts.diff:
5122 sys.stdout.write(stdout)
5123 else:
5124 env = os.environ.copy()
5125 env['PATH'] = str(os.path.dirname(clang_format_tool))
5126 try:
5127 script = clang_format.FindClangFormatScriptInChromiumTree(
5128 'clang-format-diff.py')
5129 except clang_format.NotFoundError as e:
5130 DieWithError(e)
5131
5132 cmd = [sys.executable, script, '-p0']
5133 if not opts.dry_run and not opts.diff:
5134 cmd.append('-i')
5135
5136 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5137 diff_output = RunGit(diff_cmd)
5138
5139 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5140 if opts.diff:
5141 sys.stdout.write(stdout)
5142 if opts.dry_run and len(stdout) > 0:
5143 return_value = 2
5144
5145 return return_value
5146
5147
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005148def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005149 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005150 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005151
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005152
enne@chromium.org555cfe42014-01-29 18:21:39 +00005153@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005154@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005155def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005156 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005157 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005158 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005159 parser.add_option('--full', action='store_true',
5160 help='Reformat the full content of all touched files')
5161 parser.add_option('--dry-run', action='store_true',
5162 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005163 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005164 '--no-clang-format',
5165 dest='clang_format',
5166 action='store_false',
5167 default=True,
5168 help='Disables formatting of various file types using clang-format.')
5169 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005170 '--python',
5171 action='store_true',
5172 default=None,
5173 help='Enables python formatting on all python files.')
5174 parser.add_option(
5175 '--no-python',
5176 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005177 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005178 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005179 'If neither --python or --no-python are set, python files that have a '
5180 '.style.yapf file in an ancestor directory will be formatted. '
5181 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005182 parser.add_option(
5183 '--js',
5184 action='store_true',
5185 help='Format javascript code with clang-format. '
5186 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005187 parser.add_option('--diff', action='store_true',
5188 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005189 parser.add_option('--presubmit', action='store_true',
5190 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005191 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005192
Garrett Beaty91a6f332020-01-06 16:57:24 +00005193 if opts.python is not None and opts.no_python:
5194 raise parser.error('Cannot set both --python and --no-python')
5195 if opts.no_python:
5196 opts.python = False
5197
Daniel Chengc55eecf2016-12-30 03:11:02 -08005198 # Normalize any remaining args against the current path, so paths relative to
5199 # the current directory are still resolved as expected.
5200 args = [os.path.join(os.getcwd(), arg) for arg in args]
5201
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005202 # git diff generates paths against the root of the repository. Change
5203 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005204 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005205 if rel_base_path:
5206 os.chdir(rel_base_path)
5207
digit@chromium.org29e47272013-05-17 17:01:46 +00005208 # Grab the merge-base commit, i.e. the upstream commit of the current
5209 # branch when it was created or the last time it was rebased. This is
5210 # to cover the case where the user may have called "git fetch origin",
5211 # moving the origin branch to a newer commit, but hasn't rebased yet.
5212 upstream_commit = None
5213 cl = Changelist()
5214 upstream_branch = cl.GetUpstreamBranch()
5215 if upstream_branch:
5216 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5217 upstream_commit = upstream_commit.strip()
5218
5219 if not upstream_commit:
5220 DieWithError('Could not find base commit for this branch. '
5221 'Are you in detached state?')
5222
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005223 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5224 diff_output = RunGit(changed_files_cmd)
5225 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005226 # Filter out files deleted by this CL
5227 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005228
Andreas Haas417d89c2020-02-06 10:24:27 +00005229 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005230 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005231
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005232 clang_diff_files = []
5233 if opts.clang_format:
5234 clang_diff_files = [
5235 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5236 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005237 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5238 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005239 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005240
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005241 top_dir = os.path.normpath(
5242 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5243
Jamie Madill5e96ad12020-01-13 16:08:35 +00005244 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5245 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005246
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005247 # Similar code to above, but using yapf on .py files rather than clang-format
5248 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005249 py_explicitly_disabled = opts.python is not None and not opts.python
5250 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005251 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5252 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5253 if sys.platform.startswith('win'):
5254 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005255
Aiden Bennerc08566e2018-10-03 17:52:42 +00005256 # Used for caching.
5257 yapf_configs = {}
5258 for f in python_diff_files:
5259 # Find the yapf style config for the current file, defaults to depot
5260 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005261 _FindYapfConfigFile(f, yapf_configs, top_dir)
5262
5263 # Turn on python formatting by default if a yapf config is specified.
5264 # This breaks in the case of this repo though since the specified
5265 # style file is also the global default.
5266 if opts.python is None:
5267 filtered_py_files = []
5268 for f in python_diff_files:
5269 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5270 filtered_py_files.append(f)
5271 else:
5272 filtered_py_files = python_diff_files
5273
5274 # Note: yapf still seems to fix indentation of the entire file
5275 # even if line ranges are specified.
5276 # See https://github.com/google/yapf/issues/499
5277 if not opts.full and filtered_py_files:
5278 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5279
Brian Sheedyb4307d52019-12-02 19:18:17 +00005280 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5281 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5282 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005283
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005284 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005285 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5286 # Default to pep8 if not .style.yapf is found.
5287 if not yapf_style:
5288 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005289
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005290 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005291
5292 has_formattable_lines = False
5293 if not opts.full:
5294 # Only run yapf over changed line ranges.
5295 for diff_start, diff_len in py_line_diffs[f]:
5296 diff_end = diff_start + diff_len - 1
5297 # Yapf errors out if diff_end < diff_start but this
5298 # is a valid line range diff for a removal.
5299 if diff_end >= diff_start:
5300 has_formattable_lines = True
5301 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5302 # If all line diffs were removals we have nothing to format.
5303 if not has_formattable_lines:
5304 continue
5305
5306 if opts.diff or opts.dry_run:
5307 cmd += ['--diff']
5308 # Will return non-zero exit code if non-empty diff.
5309 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5310 if opts.diff:
5311 sys.stdout.write(stdout)
5312 elif len(stdout) > 0:
5313 return_value = 2
5314 else:
5315 cmd += ['-i']
5316 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005317
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005318 # Dart's formatter does not have the nice property of only operating on
5319 # modified chunks, so hard code full.
5320 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005321 try:
5322 command = [dart_format.FindDartFmtToolInChromiumTree()]
5323 if not opts.dry_run and not opts.diff:
5324 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005325 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005326
ppi@chromium.org6593d932016-03-03 15:41:15 +00005327 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005328 if opts.dry_run and stdout:
5329 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005330 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005331 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5332 'found in this checkout. Files in other languages are still '
5333 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005334
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005335 # Format GN build files. Always run on full build files for canonical form.
5336 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005337 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005338 if opts.dry_run or opts.diff:
5339 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005340 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005341 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5342 shell=sys.platform == 'win32',
5343 cwd=top_dir)
5344 if opts.dry_run and gn_ret == 2:
5345 return_value = 2 # Not formatted.
5346 elif opts.diff and gn_ret == 2:
5347 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005348 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005349 elif gn_ret != 0:
5350 # For non-dry run cases (and non-2 return values for dry-run), a
5351 # nonzero error code indicates a failure, probably because the file
5352 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005353 DieWithError('gn format failed on ' + gn_diff_file +
5354 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005355
Ilya Shermane081cbe2017-08-15 17:51:04 -07005356 # Skip the metrics formatting from the global presubmit hook. These files have
5357 # a separate presubmit hook that issues an error if the files need formatting,
5358 # whereas the top-level presubmit script merely issues a warning. Formatting
5359 # these files is somewhat slow, so it's important not to duplicate the work.
5360 if not opts.presubmit:
5361 for xml_dir in GetDirtyMetricsDirs(diff_files):
5362 tool_dir = os.path.join(top_dir, xml_dir)
5363 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5364 if opts.dry_run or opts.diff:
5365 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005366 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005367 if opts.diff:
5368 sys.stdout.write(stdout)
5369 if opts.dry_run and stdout:
5370 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005371
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005372 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005373
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005374
Steven Holte2e664bf2017-04-21 13:10:47 -07005375def GetDirtyMetricsDirs(diff_files):
5376 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5377 metrics_xml_dirs = [
5378 os.path.join('tools', 'metrics', 'actions'),
5379 os.path.join('tools', 'metrics', 'histograms'),
5380 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005381 os.path.join('tools', 'metrics', 'ukm'),
5382 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005383 for xml_dir in metrics_xml_dirs:
5384 if any(file.startswith(xml_dir) for file in xml_diff_files):
5385 yield xml_dir
5386
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005387
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005388@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005389@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005390def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005391 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005392 _, args = parser.parse_args(args)
5393
5394 if len(args) != 1:
5395 parser.print_help()
5396 return 1
5397
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005398 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005399 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005400 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005401
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005402 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005403
Edward Lemur52969c92020-02-06 18:15:28 +00005404 issueprefix = Changelist.IssueConfigKey()
5405 output = RunGit(['config', '--local', '--get-regexp',
5406 r'branch\..*\.%s' % issueprefix],
5407 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005408
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005409 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005410 for key, issue in [x.split() for x in output.splitlines()]:
5411 if issue == target_issue:
5412 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5413
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005414 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005415 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005416 return 1
5417 if len(branches) == 1:
5418 RunGit(['checkout', branches[0]])
5419 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005420 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005421 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005422 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005423 which = raw_input('Choose by index: ')
5424 try:
5425 RunGit(['checkout', branches[int(which)]])
5426 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005427 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005428 return 1
5429
5430 return 0
5431
5432
maruel@chromium.org29404b52014-09-08 22:58:00 +00005433def CMDlol(parser, args):
5434 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005435 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005436 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5437 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5438 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005439 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005440 return 0
5441
5442
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005443class OptionParser(optparse.OptionParser):
5444 """Creates the option parse and add --verbose support."""
5445 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005446 optparse.OptionParser.__init__(
5447 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005448 self.add_option(
5449 '-v', '--verbose', action='count', default=0,
5450 help='Use 2 times for more debugging info')
5451
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005452 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005453 try:
5454 return self._parse_args(args)
5455 finally:
5456 # Regardless of success or failure of args parsing, we want to report
5457 # metrics, but only after logging has been initialized (if parsing
5458 # succeeded).
5459 global settings
5460 settings = Settings()
5461
5462 if not metrics.DISABLE_METRICS_COLLECTION:
5463 # GetViewVCUrl ultimately calls logging method.
5464 project_url = settings.GetViewVCUrl().strip('/+')
5465 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5466 metrics.collector.add('project_urls', [project_url])
5467
5468 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005469 # Create an optparse.Values object that will store only the actual passed
5470 # options, without the defaults.
5471 actual_options = optparse.Values()
5472 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5473 # Create an optparse.Values object with the default options.
5474 options = optparse.Values(self.get_default_values().__dict__)
5475 # Update it with the options passed by the user.
5476 options._update_careful(actual_options.__dict__)
5477 # Store the options passed by the user in an _actual_options attribute.
5478 # We store only the keys, and not the values, since the values can contain
5479 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005480 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005481
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005482 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005483 logging.basicConfig(
5484 level=levels[min(options.verbose, len(levels) - 1)],
5485 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5486 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005487
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005488 return options, args
5489
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005490
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005491def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005492 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005493 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005494 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005495 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005496
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005497 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005498 dispatcher = subcommand.CommandDispatcher(__name__)
5499 try:
5500 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005501 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005502 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005503 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005504 if e.code != 500:
5505 raise
5506 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005507 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005508 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005509 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005510
5511
5512if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005513 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5514 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005515 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005516 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005517 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005518 sys.exit(main(sys.argv[1:]))