blob: 9466e2ce94254b9d21f1f8b7ff5e0bc06e6cb7ff [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
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001392 def GetDescription(self, pretty=False, force=False):
1393 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001395 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001396 self.has_description = True
1397 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001398 # Set width to 72 columns + 2 space indent.
1399 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001400 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001401 lines = self.description.splitlines()
1402 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001403 return self.description
1404
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001405 def GetDescriptionFooters(self):
1406 """Returns (non_footer_lines, footers) for the commit message.
1407
1408 Returns:
1409 non_footer_lines (list(str)) - Simple list of description lines without
1410 any footer. The lines do not contain newlines, nor does the list contain
1411 the empty line between the message and the footers.
1412 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1413 [("Change-Id", "Ideadbeef...."), ...]
1414 """
1415 raw_description = self.GetDescription()
1416 msg_lines, _, footers = git_footers.split_footers(raw_description)
1417 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001418 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001419 return msg_lines, footers
1420
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001422 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001423 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001424 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001425 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001426 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001427 return self.patchset
1428
1429 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001430 """Set this branch's patchset. If patchset=0, clears the patchset."""
1431 assert self.GetBranch()
1432 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001433 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001434 else:
1435 self.patchset = int(patchset)
1436 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001437 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001438
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001439 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001440 """Set this branch's issue. If issue isn't given, clears the issue."""
1441 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001442 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001443 issue = int(issue)
1444 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001445 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001446 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001447 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001448 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001449 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001450 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001451 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001452 else:
tandrii5d48c322016-08-18 16:19:37 -07001453 # Reset all of these just to be clean.
1454 reset_suffixes = [
1455 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001456 self.IssueConfigKey(),
1457 self.PatchsetConfigKey(),
1458 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001459 ] + self._PostUnsetIssueProperties()
1460 for prop in reset_suffixes:
1461 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001462 msg = RunGit(['log', '-1', '--format=%B']).strip()
1463 if msg and git_footers.get_footer_change_id(msg):
1464 print('WARNING: The change patched into this branch has a Change-Id. '
1465 'Removing it.')
1466 RunGit(['commit', '--amend', '-m',
1467 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001468 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001469 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001470 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001471
Edward Lemur7f6dec02020-02-06 20:23:58 +00001472 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001473 if not self.GitSanityChecks(upstream_branch):
1474 DieWithError('\nGit sanity check failure')
1475
Edward Lemur7f6dec02020-02-06 20:23:58 +00001476 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001477 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001478 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001479 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001480 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001481 except subprocess2.CalledProcessError:
1482 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001483 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001484 'This branch probably doesn\'t exist anymore. To reset the\n'
1485 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001486 ' git branch --set-upstream-to origin/master %s\n'
1487 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001488 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001489
maruel@chromium.org52424302012-08-29 15:14:30 +00001490 issue = self.GetIssue()
1491 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001492 if issue:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001493 description = self.GetDescription()
1494 else:
1495 # If the change was never uploaded, use the log messages of all commits
1496 # up to the branch point, as git cl upload will prefill the description
1497 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001498 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001499
Edward Lemur7f6dec02020-02-06 20:23:58 +00001500 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001501 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001502 name,
1503 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001504 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001505 files,
1506 issue,
1507 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001508 author,
1509 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001510
dsansomee2d6fd92016-09-08 00:10:47 -07001511 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001512 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001513 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001514 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001515
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001516 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1517 """Sets the description for this CL remotely.
1518
1519 You can get description_lines and footers with GetDescriptionFooters.
1520
1521 Args:
1522 description_lines (list(str)) - List of CL description lines without
1523 newline characters.
1524 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1525 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1526 `List-Of-Tokens`). It will be case-normalized so that each token is
1527 title-cased.
1528 """
1529 new_description = '\n'.join(description_lines)
1530 if footers:
1531 new_description += '\n'
1532 for k, v in footers:
1533 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1534 if not git_footers.FOOTER_PATTERN.match(foot):
1535 raise ValueError('Invalid footer %r' % foot)
1536 new_description += foot + '\n'
1537 self.UpdateDescription(new_description, force)
1538
Edward Lesmes8e282792018-04-03 18:50:29 -04001539 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001540 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1541 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001542 start = time_time()
1543 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001544 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1545 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001546 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001547 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001548 metrics.collector.add_repeated('sub_commands', {
1549 'command': 'presubmit',
1550 'execution_time': time_time() - start,
1551 'exit_code': 0 if result.should_continue() else 1,
1552 })
1553 return result
vapierfd77ac72016-06-16 08:33:57 -07001554 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001555 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001556
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001557 def CMDUpload(self, options, git_diff_args, orig_args):
1558 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001559 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001560 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001561 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001562 else:
1563 if self.GetBranch() is None:
1564 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1565
1566 # Default to diffing against common ancestor of upstream branch
1567 base_branch = self.GetCommonAncestorWithUpstream()
1568 git_diff_args = [base_branch, 'HEAD']
1569
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001570 # Fast best-effort checks to abort before running potentially expensive
1571 # hooks if uploading is likely to fail anyway. Passing these checks does
1572 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001573 self.EnsureAuthenticated(force=options.force)
1574 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001575
1576 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001577 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001578 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1579 files = [f.LocalPath() for f in change.AffectedFiles()]
1580 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001581 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001582
1583 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001584 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001585 # Set the reviewer list now so that presubmit checks can access it.
1586 change_description = ChangeDescription(change.FullDescriptionText())
1587 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001588 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001589 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 change)
1591 change.SetDescriptionText(change_description.description)
1592 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001593 may_prompt=not options.force,
1594 verbose=options.verbose,
1595 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001596 if not hook_results.should_continue():
1597 return 1
1598 if not options.reviewers and hook_results.reviewers:
1599 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001600 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001601
Aaron Gable13101a62018-02-09 13:20:41 -08001602 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001603 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001604 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001605 _git_set_branch_config_value('last-upload-hash',
1606 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001607 # Run post upload hooks, if specified.
1608 if settings.GetRunPostUploadHook():
1609 presubmit_support.DoPostUploadExecuter(
1610 change,
Edward Lemur016a0872020-02-04 22:13:28 +00001611 self.GetGerritObjForPresubmit(),
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001612 settings.GetRoot(),
1613 options.verbose,
1614 sys.stdout)
1615
1616 # Upload all dependencies if specified.
1617 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001618 print()
1619 print('--dependencies has been specified.')
1620 print('All dependent local branches will be re-uploaded.')
1621 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001622 # Remove the dependencies flag from args so that we do not end up in a
1623 # loop.
1624 orig_args.remove('--dependencies')
1625 ret = upload_branch_deps(self, orig_args)
1626 return ret
1627
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001628 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001629 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001630
1631 Issue must have been already uploaded and known.
1632 """
1633 assert new_state in _CQState.ALL_STATES
1634 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001635 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001636 vote_map = {
1637 _CQState.NONE: 0,
1638 _CQState.DRY_RUN: 1,
1639 _CQState.COMMIT: 2,
1640 }
1641 labels = {'Commit-Queue': vote_map[new_state]}
1642 notify = False if new_state == _CQState.DRY_RUN else None
1643 gerrit_util.SetReview(
1644 self._GetGerritHost(), self._GerritChangeIdentifier(),
1645 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001646 return 0
1647 except KeyboardInterrupt:
1648 raise
1649 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001650 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001651 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001652 ' * Your project has no CQ,\n'
1653 ' * You don\'t have permission to change the CQ state,\n'
1654 ' * There\'s a bug in this code (see stack trace below).\n'
1655 'Consider specifying which bots to trigger manually or asking your '
1656 'project owners for permissions or contacting Chrome Infra at:\n'
1657 'https://www.chromium.org/infra\n\n' %
1658 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001659 # Still raise exception so that stack trace is printed.
1660 raise
1661
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001662 def _GetGerritHost(self):
1663 # Lazy load of configs.
1664 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001665 if self._gerrit_host and '.' not in self._gerrit_host:
1666 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1667 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001668 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001669 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001670 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001671 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001672 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1673 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001674 return self._gerrit_host
1675
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001676 def _GetGitHost(self):
1677 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001678 remote_url = self.GetRemoteUrl()
1679 if not remote_url:
1680 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001681 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001682
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001683 def GetCodereviewServer(self):
1684 if not self._gerrit_server:
1685 # If we're on a branch then get the server potentially associated
1686 # with that branch.
1687 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001688 self._gerrit_server = self._GitGetBranchConfigValue(
1689 self.CodereviewServerConfigKey())
1690 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001691 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001692 if not self._gerrit_server:
1693 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1694 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001695 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001696 parts[0] = parts[0] + '-review'
1697 self._gerrit_host = '.'.join(parts)
1698 self._gerrit_server = 'https://%s' % self._gerrit_host
1699 return self._gerrit_server
1700
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001701 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001702 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001703 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001704 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001705 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001706 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001707 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001708 if project.endswith('.git'):
1709 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001710 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1711 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1712 # gitiles/git-over-https protocol. E.g.,
1713 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1714 # as
1715 # https://chromium.googlesource.com/v8/v8
1716 if project.startswith('a/'):
1717 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001718 return project
1719
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001720 def _GerritChangeIdentifier(self):
1721 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1722
1723 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001724 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001725 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001726 project = self._GetGerritProject()
1727 if project:
1728 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1729 # Fall back on still unique, but less efficient change number.
1730 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001731
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001732 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001733 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001734 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001735
tandrii5d48c322016-08-18 16:19:37 -07001736 @classmethod
1737 def PatchsetConfigKey(cls):
1738 return 'gerritpatchset'
1739
1740 @classmethod
1741 def CodereviewServerConfigKey(cls):
1742 return 'gerritserver'
1743
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001744 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001745 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001746 if settings.GetGerritSkipEnsureAuthenticated():
1747 # For projects with unusual authentication schemes.
1748 # See http://crbug.com/603378.
1749 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001750
1751 # Check presence of cookies only if using cookies-based auth method.
1752 cookie_auth = gerrit_util.Authenticator.get()
1753 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001754 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001755
Florian Mayerae510e82020-01-30 21:04:48 +00001756 remote_url = self.GetRemoteUrl()
1757 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001758 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001759 return
1760 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001761 logging.warning('Ignoring branch %(branch)s with non-https remote '
1762 '%(remote)s', {
1763 'branch': self.branch,
1764 'remote': self.GetRemoteUrl()
1765 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001766 return
1767
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001768 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001769 self.GetCodereviewServer()
1770 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001771 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001772
1773 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1774 git_auth = cookie_auth.get_auth_header(git_host)
1775 if gerrit_auth and git_auth:
1776 if gerrit_auth == git_auth:
1777 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001778 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001779 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001780 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001781 ' %s\n'
1782 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001783 ' Consider running the following command:\n'
1784 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001785 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001786 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001787 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001788 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001789 cookie_auth.get_new_password_message(git_host)))
1790 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001791 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001792 return
1793 else:
1794 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001795 ([] if gerrit_auth else [self._gerrit_host]) +
1796 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001797 DieWithError('Credentials for the following hosts are required:\n'
1798 ' %s\n'
1799 'These are read from %s (or legacy %s)\n'
1800 '%s' % (
1801 '\n '.join(missing),
1802 cookie_auth.get_gitcookies_path(),
1803 cookie_auth.get_netrc_path(),
1804 cookie_auth.get_new_password_message(git_host)))
1805
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001806 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001807 if not self.GetIssue():
1808 return
1809
1810 # Warm change details cache now to avoid RPCs later, reducing latency for
1811 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001812 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001813 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001814
1815 status = self._GetChangeDetail()['status']
1816 if status in ('MERGED', 'ABANDONED'):
1817 DieWithError('Change %s has been %s, new uploads are not allowed' %
1818 (self.GetIssueURL(),
1819 'submitted' if status == 'MERGED' else 'abandoned'))
1820
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001821 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1822 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1823 # Apparently this check is not very important? Otherwise get_auth_email
1824 # could have been added to other implementations of Authenticator.
1825 cookies_auth = gerrit_util.Authenticator.get()
1826 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001827 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001828
1829 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001830 if self.GetIssueOwner() == cookies_user:
1831 return
1832 logging.debug('change %s owner is %s, cookies user is %s',
1833 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001834 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001835 # so ask what Gerrit thinks of this user.
1836 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1837 if details['email'] == self.GetIssueOwner():
1838 return
1839 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001840 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001841 'as %s.\n'
1842 'Uploading may fail due to lack of permissions.' %
1843 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1844 confirm_or_exit(action='upload')
1845
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001846 def _PostUnsetIssueProperties(self):
1847 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001848 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001849
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001850 def GetGerritObjForPresubmit(self):
1851 return presubmit_support.GerritAccessor(self._GetGerritHost())
1852
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001853 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001854 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001855 or CQ status, assuming adherence to a common workflow.
1856
1857 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001858 * 'error' - error from review tool (including deleted issues)
1859 * 'unsent' - no reviewers added
1860 * 'waiting' - waiting for review
1861 * 'reply' - waiting for uploader to reply to review
1862 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001863 * 'dry-run' - dry-running in the CQ
1864 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001865 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001866 """
1867 if not self.GetIssue():
1868 return None
1869
1870 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001871 data = self._GetChangeDetail([
1872 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001873 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001874 return 'error'
1875
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001876 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001877 return 'closed'
1878
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001879 cq_label = data['labels'].get('Commit-Queue', {})
1880 max_cq_vote = 0
1881 for vote in cq_label.get('all', []):
1882 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1883 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001884 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001885 if max_cq_vote == 1:
1886 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001887
Aaron Gable9ab38c62017-04-06 14:36:33 -07001888 if data['labels'].get('Code-Review', {}).get('approved'):
1889 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001890
1891 if not data.get('reviewers', {}).get('REVIEWER', []):
1892 return 'unsent'
1893
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001894 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001895 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001896 last_message_author = messages.pop().get('author', {})
1897 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001898 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1899 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001900 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001901 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001902 if last_message_author.get('_account_id') == owner:
1903 # Most recent message was by owner.
1904 return 'waiting'
1905 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001906 # Some reply from non-owner.
1907 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001908
1909 # Somehow there are no messages even though there are reviewers.
1910 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911
1912 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001913 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001914 patchset = data['revisions'][data['current_revision']]['_number']
1915 self.SetPatchset(patchset)
1916 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001917
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001918 def FetchDescription(self, force=False):
1919 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1920 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001921 current_rev = data['current_revision']
Edward Lemur79d4f992019-11-11 23:49:02 +00001922 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001923
dsansomee2d6fd92016-09-08 00:10:47 -07001924 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001925 if gerrit_util.HasPendingChangeEdit(
1926 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001927 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001928 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001929 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001930 'unpublished edit. Either publish the edit in the Gerrit web UI '
1931 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001932
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001933 gerrit_util.DeletePendingChangeEdit(
1934 self._GetGerritHost(), self._GerritChangeIdentifier())
1935 gerrit_util.SetCommitMessage(
1936 self._GetGerritHost(), self._GerritChangeIdentifier(),
1937 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001938
Aaron Gable636b13f2017-07-14 10:42:48 -07001939 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001940 gerrit_util.SetReview(
1941 self._GetGerritHost(), self._GerritChangeIdentifier(),
1942 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001943
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001944 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001945 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001946 # CURRENT_REVISION is included to get the latest patchset so that
1947 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001948 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001949 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1950 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001951 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001952 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001953 robot_file_comments = gerrit_util.GetChangeRobotComments(
1954 self._GetGerritHost(), self._GerritChangeIdentifier())
1955
1956 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001957 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001958 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001959 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001960 line_comments = file_comments.setdefault(path, [])
1961 line_comments.extend(
1962 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001963
1964 # Build dictionary of file comments for easy access and sorting later.
1965 # {author+date: {path: {patchset: {line: url+message}}}}
1966 comments = collections.defaultdict(
1967 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001968 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001969 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001970 tag = comment.get('tag', '')
1971 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001972 continue
1973 key = (comment['author']['email'], comment['updated'])
1974 if comment.get('side', 'REVISION') == 'PARENT':
1975 patchset = 'Base'
1976 else:
1977 patchset = 'PS%d' % comment['patch_set']
1978 line = comment.get('line', 0)
1979 url = ('https://%s/c/%s/%s/%s#%s%s' %
1980 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1981 'b' if comment.get('side') == 'PARENT' else '',
1982 str(line) if line else ''))
1983 comments[key][path][patchset][line] = (url, comment['message'])
1984
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001985 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001986 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001987 summary = self._BuildCommentSummary(msg, comments, readable)
1988 if summary:
1989 summaries.append(summary)
1990 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001991
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001992 @staticmethod
1993 def _BuildCommentSummary(msg, comments, readable):
1994 key = (msg['author']['email'], msg['date'])
1995 # Don't bother showing autogenerated messages that don't have associated
1996 # file or line comments. this will filter out most autogenerated
1997 # messages, but will keep robot comments like those from Tricium.
1998 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1999 if is_autogenerated and not comments.get(key):
2000 return None
2001 message = msg['message']
2002 # Gerrit spits out nanoseconds.
2003 assert len(msg['date'].split('.')[-1]) == 9
2004 date = datetime.datetime.strptime(msg['date'][:-3],
2005 '%Y-%m-%d %H:%M:%S.%f')
2006 if key in comments:
2007 message += '\n'
2008 for path, patchsets in sorted(comments.get(key, {}).items()):
2009 if readable:
2010 message += '\n%s' % path
2011 for patchset, lines in sorted(patchsets.items()):
2012 for line, (url, content) in sorted(lines.items()):
2013 if line:
2014 line_str = 'Line %d' % line
2015 path_str = '%s:%d:' % (path, line)
2016 else:
2017 line_str = 'File comment'
2018 path_str = '%s:0:' % path
2019 if readable:
2020 message += '\n %s, %s: %s' % (patchset, line_str, url)
2021 message += '\n %s\n' % content
2022 else:
2023 message += '\n%s ' % path_str
2024 message += '\n%s\n' % content
2025
2026 return _CommentSummary(
2027 date=date,
2028 message=message,
2029 sender=msg['author']['email'],
2030 autogenerated=is_autogenerated,
2031 # These could be inferred from the text messages and correlated with
2032 # Code-Review label maximum, however this is not reliable.
2033 # Leaving as is until the need arises.
2034 approval=False,
2035 disapproval=False,
2036 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002037
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002038 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002039 gerrit_util.AbandonChange(
2040 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002041
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002042 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002043 gerrit_util.SubmitChange(
2044 self._GetGerritHost(), self._GerritChangeIdentifier(),
2045 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002046
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002047 def _GetChangeDetail(self, options=None, no_cache=False):
2048 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002049
2050 If fresh data is needed, set no_cache=True which will clear cache and
2051 thus new data will be fetched from Gerrit.
2052 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002053 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002054 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002055
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002056 # Optimization to avoid multiple RPCs:
2057 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2058 'CURRENT_COMMIT' not in options):
2059 options.append('CURRENT_COMMIT')
2060
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002061 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002062 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002063 options = [o.upper() for o in options]
2064
2065 # Check in cache first unless no_cache is True.
2066 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002067 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002068 else:
2069 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002070 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002071 # Assumption: data fetched before with extra options is suitable
2072 # for return for a smaller set of options.
2073 # For example, if we cached data for
2074 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2075 # and request is for options=[CURRENT_REVISION],
2076 # THEN we can return prior cached data.
2077 if options_set.issubset(cached_options_set):
2078 return data
2079
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002080 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002081 data = gerrit_util.GetChangeDetail(
2082 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002083 except gerrit_util.GerritError as e:
2084 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002085 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002086 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002087
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002088 self._detail_cache.setdefault(cache_key, []).append(
2089 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002090 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002091
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002092 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002093 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002094 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002095 data = gerrit_util.GetChangeCommit(
2096 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002097 except gerrit_util.GerritError as e:
2098 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002099 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002100 raise
agable32978d92016-11-01 12:55:02 -07002101 return data
2102
Karen Qian40c19422019-03-13 21:28:29 +00002103 def _IsCqConfigured(self):
2104 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002105 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002106
Olivier Robin75ee7252018-04-13 10:02:56 +02002107 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002108 if git_common.is_dirty_git_tree('land'):
2109 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002110
tandriid60367b2016-06-22 05:25:12 -07002111 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002112 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002113 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002114 'which can test and land changes for you. '
2115 'Are you sure you wish to bypass it?\n',
2116 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002117 differs = True
tandriic4344b52016-08-29 06:04:54 -07002118 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002119 # Note: git diff outputs nothing if there is no diff.
2120 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002121 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002122 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002123 if detail['current_revision'] == last_upload:
2124 differs = False
2125 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002126 print('WARNING: Local branch contents differ from latest uploaded '
2127 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002128 if differs:
2129 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002130 confirm_or_exit(
2131 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2132 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002133 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002134 elif not bypass_hooks:
2135 hook_results = self.RunHook(
2136 committing=True,
2137 may_prompt=not force,
2138 verbose=verbose,
Edward Lemur7f6dec02020-02-06 20:23:58 +00002139 change=self.GetChange(self.GetCommonAncestorWithUpstream()),
Olivier Robin75ee7252018-04-13 10:02:56 +02002140 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002141 if not hook_results.should_continue():
2142 return 1
2143
2144 self.SubmitIssue(wait_for_merge=True)
2145 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002146 links = self._GetChangeCommit().get('web_links', [])
2147 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002148 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002149 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002150 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002151 return 0
2152
Edward Lemurf38bc172019-09-03 21:02:13 +00002153 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 assert parsed_issue_arg.valid
2155
Edward Lemur125d60a2019-09-13 18:25:41 +00002156 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002157
2158 if parsed_issue_arg.hostname:
2159 self._gerrit_host = parsed_issue_arg.hostname
2160 self._gerrit_server = 'https://%s' % self._gerrit_host
2161
tandriic2405f52016-10-10 08:13:15 -07002162 try:
2163 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002164 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002165 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002166
2167 if not parsed_issue_arg.patchset:
2168 # Use current revision by default.
2169 revision_info = detail['revisions'][detail['current_revision']]
2170 patchset = int(revision_info['_number'])
2171 else:
2172 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002173 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002174 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2175 break
2176 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002177 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002178 (parsed_issue_arg.patchset, self.GetIssue()))
2179
Edward Lemur125d60a2019-09-13 18:25:41 +00002180 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002181 if remote_url.endswith('.git'):
2182 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002183 remote_url = remote_url.rstrip('/')
2184
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002185 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002186 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002187
2188 if remote_url != fetch_info['url']:
2189 DieWithError('Trying to patch a change from %s but this repo appears '
2190 'to be %s.' % (fetch_info['url'], remote_url))
2191
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002192 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002193
Aaron Gable62619a32017-06-16 08:22:09 -07002194 if force:
2195 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2196 print('Checked out commit for change %i patchset %i locally' %
2197 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002198 elif nocommit:
2199 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2200 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002201 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002202 RunGit(['cherry-pick', 'FETCH_HEAD'])
2203 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002204 (parsed_issue_arg.issue, patchset))
2205 print('Note: this created a local commit which does not have '
2206 'the same hash as the one uploaded for review. This will make '
2207 'uploading changes based on top of this branch difficult.\n'
2208 'If you want to do that, use "git cl patch --force" instead.')
2209
Stefan Zagerd08043c2017-10-12 12:07:02 -07002210 if self.GetBranch():
2211 self.SetIssue(parsed_issue_arg.issue)
2212 self.SetPatchset(patchset)
2213 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2214 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2215 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2216 else:
2217 print('WARNING: You are in detached HEAD state.\n'
2218 'The patch has been applied to your checkout, but you will not be '
2219 'able to upload a new patch set to the gerrit issue.\n'
2220 'Try using the \'-b\' option if you would like to work on a '
2221 'branch and/or upload a new patch set.')
2222
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002223 return 0
2224
tandrii16e0b4e2016-06-07 10:34:28 -07002225 def _GerritCommitMsgHookCheck(self, offer_removal):
2226 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2227 if not os.path.exists(hook):
2228 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002229 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2230 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002231 data = gclient_utils.FileRead(hook)
2232 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2233 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002234 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002235 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002236 'and may interfere with it in subtle ways.\n'
2237 'We recommend you remove the commit-msg hook.')
2238 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002239 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002240 gclient_utils.rm_file_or_tree(hook)
2241 print('Gerrit commit-msg hook removed.')
2242 else:
2243 print('OK, will keep Gerrit commit-msg hook in place.')
2244
Edward Lemur1b52d872019-05-09 21:12:12 +00002245 def _CleanUpOldTraces(self):
2246 """Keep only the last |MAX_TRACES| traces."""
2247 try:
2248 traces = sorted([
2249 os.path.join(TRACES_DIR, f)
2250 for f in os.listdir(TRACES_DIR)
2251 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2252 and not f.startswith('tmp'))
2253 ])
2254 traces_to_delete = traces[:-MAX_TRACES]
2255 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002256 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002257 except OSError:
2258 print('WARNING: Failed to remove old git traces from\n'
2259 ' %s'
2260 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002261
Edward Lemur5737f022019-05-17 01:24:00 +00002262 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002263 """Zip and write the git push traces stored in traces_dir."""
2264 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002265 traces_zip = trace_name + '-traces'
2266 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002267 # Create a temporary dir to store git config and gitcookies in. It will be
2268 # compressed and stored next to the traces.
2269 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002270 git_info_zip = trace_name + '-git-info'
2271
Edward Lemur5737f022019-05-17 01:24:00 +00002272 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002273 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002274 git_push_metadata['now'] = git_push_metadata['now'].decode(
2275 sys.stdin.encoding)
2276
Edward Lemur1b52d872019-05-09 21:12:12 +00002277 git_push_metadata['trace_name'] = trace_name
2278 gclient_utils.FileWrite(
2279 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2280
2281 # Keep only the first 6 characters of the git hashes on the packet
2282 # trace. This greatly decreases size after compression.
2283 packet_traces = os.path.join(traces_dir, 'trace-packet')
2284 if os.path.isfile(packet_traces):
2285 contents = gclient_utils.FileRead(packet_traces)
2286 gclient_utils.FileWrite(
2287 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2288 shutil.make_archive(traces_zip, 'zip', traces_dir)
2289
2290 # Collect and compress the git config and gitcookies.
2291 git_config = RunGit(['config', '-l'])
2292 gclient_utils.FileWrite(
2293 os.path.join(git_info_dir, 'git-config'),
2294 git_config)
2295
2296 cookie_auth = gerrit_util.Authenticator.get()
2297 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2298 gitcookies_path = cookie_auth.get_gitcookies_path()
2299 if os.path.isfile(gitcookies_path):
2300 gitcookies = gclient_utils.FileRead(gitcookies_path)
2301 gclient_utils.FileWrite(
2302 os.path.join(git_info_dir, 'gitcookies'),
2303 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2304 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2305
Edward Lemur1b52d872019-05-09 21:12:12 +00002306 gclient_utils.rmtree(git_info_dir)
2307
2308 def _RunGitPushWithTraces(
2309 self, change_desc, refspec, refspec_opts, git_push_metadata):
2310 """Run git push and collect the traces resulting from the execution."""
2311 # Create a temporary directory to store traces in. Traces will be compressed
2312 # and stored in a 'traces' dir inside depot_tools.
2313 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002314 trace_name = os.path.join(
2315 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002316
2317 env = os.environ.copy()
2318 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2319 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002320 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002321 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2322 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2323 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2324
2325 try:
2326 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002327 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002328 before_push = time_time()
2329 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002330 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002331 env=env,
2332 print_stdout=True,
2333 # Flush after every line: useful for seeing progress when running as
2334 # recipe.
2335 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002336 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002337 except subprocess2.CalledProcessError as e:
2338 push_returncode = e.returncode
2339 DieWithError('Failed to create a change. Please examine output above '
2340 'for the reason of the failure.\n'
2341 'Hint: run command below to diagnose common Git/Gerrit '
2342 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002343 ' git cl creds-check\n'
2344 '\n'
2345 'If git-cl is not working correctly, file a bug under the '
2346 'Infra>SDK component including the files below.\n'
2347 'Review the files before upload, since they might contain '
2348 'sensitive information.\n'
2349 'Set the Restrict-View-Google label so that they are not '
2350 'publicly accessible.\n'
2351 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002352 change_desc)
2353 finally:
2354 execution_time = time_time() - before_push
2355 metrics.collector.add_repeated('sub_commands', {
2356 'command': 'git push',
2357 'execution_time': execution_time,
2358 'exit_code': push_returncode,
2359 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2360 })
2361
Edward Lemur1b52d872019-05-09 21:12:12 +00002362 git_push_metadata['execution_time'] = execution_time
2363 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002364 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002365
Edward Lemur1b52d872019-05-09 21:12:12 +00002366 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002367 gclient_utils.rmtree(traces_dir)
2368
2369 return push_stdout
2370
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002371 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002372 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002373 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002374 # Load default for user, repo, squash=true, in this order.
2375 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002376
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002377 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002378 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002379 # This may be None; default fallback value is determined in logic below.
2380 title = options.title
2381
Dominic Battre7d1c4842017-10-27 09:17:28 +02002382 # Extract bug number from branch name.
2383 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002384 fixed = options.fixed
2385 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2386 self.GetBranch())
2387 if not bug and not fixed and match:
2388 if match.group('type') == 'bug':
2389 bug = match.group('bugnum')
2390 else:
2391 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002392
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002393 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002394 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002395 if self.GetIssue():
2396 # Try to get the message from a previous upload.
2397 message = self.GetDescription()
2398 if not message:
2399 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002400 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002401 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002402 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002403 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002404 # When uploading a subsequent patchset, -m|--message is taken
2405 # as the patchset title if --title was not provided.
2406 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002407 else:
2408 default_title = RunGit(
2409 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002410 if options.force:
2411 title = default_title
2412 else:
2413 title = ask_for_data(
2414 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002415
2416 # User requested to change description
2417 if options.edit_description:
2418 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2419 change_desc.prompt()
2420 message = change_desc.description
2421
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002422 change_id = self._GetChangeDetail()['change_id']
2423 while True:
2424 footer_change_ids = git_footers.get_footer_change_id(message)
2425 if footer_change_ids == [change_id]:
2426 break
2427 if not footer_change_ids:
2428 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002429 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002430 continue
2431 # There is already a valid footer but with different or several ids.
2432 # Doing this automatically is non-trivial as we don't want to lose
2433 # existing other footers, yet we want to append just 1 desired
2434 # Change-Id. Thus, just create a new footer, but let user verify the
2435 # new description.
2436 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002437 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002438 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002439 print(
2440 'WARNING: change %s has Change-Id footer(s):\n'
2441 ' %s\n'
2442 'but change has Change-Id %s, according to Gerrit.\n'
2443 'Please, check the proposed correction to the description, '
2444 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2445 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2446 change_id))
2447 confirm_or_exit(action='edit')
2448 change_desc.prompt()
2449
2450 message = change_desc.description
2451 if not message:
2452 DieWithError("Description is empty. Aborting...")
2453
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002454 # Continue the while loop.
2455 # Sanity check of this code - we should end up with proper message
2456 # footer.
2457 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002458 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002459 else: # if not self.GetIssue()
2460 if options.message:
2461 message = options.message
2462 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002463 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002464 if options.title:
2465 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002466 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002467 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002468 change_desc.prompt()
2469
Aaron Gableb56ad332017-01-06 15:24:31 -08002470 # On first upload, patchset title is always this string, while
2471 # --title flag gets converted to first line of message.
2472 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002473 if not change_desc.description:
2474 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002475 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002476 if len(change_ids) > 1:
2477 DieWithError('too many Change-Id footers, at most 1 allowed.')
2478 if not change_ids:
2479 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002480 change_desc.set_description(git_footers.add_footer_change_id(
2481 change_desc.description,
2482 GenerateGerritChangeId(change_desc.description)))
2483 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002484 assert len(change_ids) == 1
2485 change_id = change_ids[0]
2486
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002487 if options.reviewers or options.tbrs or options.add_owners_to:
2488 change_desc.update_reviewers(options.reviewers, options.tbrs,
2489 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002490 if options.preserve_tryjobs:
2491 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002492
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002493 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002494 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2495 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002496 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lesmesf6a22322019-11-04 22:14:39 +00002497 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
Edward Lemur79d4f992019-11-11 23:49:02 +00002498 desc_tempfile.write(change_desc.description.encode('utf-8', 'replace'))
Aaron Gable9a03ae02017-11-03 11:31:07 -07002499 desc_tempfile.close()
2500 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2501 '-F', desc_tempfile.name]).strip()
2502 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002503 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002504 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002505 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002506 if not change_desc.description:
2507 DieWithError("Description is empty. Aborting...")
2508
2509 if not git_footers.get_footer_change_id(change_desc.description):
2510 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002511 change_desc.set_description(
2512 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002513 if options.reviewers or options.tbrs or options.add_owners_to:
2514 change_desc.update_reviewers(options.reviewers, options.tbrs,
2515 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002516 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002517 # For no-squash mode, we assume the remote called "origin" is the one we
2518 # want. It is not worthwhile to support different workflows for
2519 # no-squash mode.
2520 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002521 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2522
2523 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002524 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002525 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2526 ref_to_push)]).splitlines()
2527 if len(commits) > 1:
2528 print('WARNING: This will upload %d commits. Run the following command '
2529 'to see which commits will be uploaded: ' % len(commits))
2530 print('git log %s..%s' % (parent, ref_to_push))
2531 print('You can also use `git squash-branch` to squash these into a '
2532 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002533 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002534
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002535 if options.reviewers or options.tbrs or options.add_owners_to:
2536 change_desc.update_reviewers(options.reviewers, options.tbrs,
2537 options.add_owners_to, change)
2538
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002539 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002540 cc = []
2541 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2542 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2543 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002544 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002545 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002546 if options.cc:
2547 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002548 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002549 if change_desc.get_cced():
2550 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002551 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2552 valid_accounts = set(reviewers + cc)
2553 # TODO(crbug/877717): relax this for all hosts.
2554 else:
2555 valid_accounts = gerrit_util.ValidAccounts(
2556 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002557 logging.info('accounts %s are recognized, %s invalid',
2558 sorted(valid_accounts),
2559 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002560
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002561 # Extra options that can be specified at push time. Doc:
2562 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002563 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002564
Aaron Gable844cf292017-06-28 11:32:59 -07002565 # By default, new changes are started in WIP mode, and subsequent patchsets
2566 # don't send email. At any time, passing --send-mail will mark the change
2567 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002568 if options.send_mail:
2569 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002570 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002571 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002572 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002573 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002574 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002575
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002576 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002577 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002578
Aaron Gable9b713dd2016-12-14 16:04:21 -08002579 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002580 # Punctuation and whitespace in |title| must be percent-encoded.
2581 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002582
agablec6787972016-09-09 16:13:34 -07002583 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002584 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002585
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002586 for r in sorted(reviewers):
2587 if r in valid_accounts:
2588 refspec_opts.append('r=%s' % r)
2589 reviewers.remove(r)
2590 else:
2591 # TODO(tandrii): this should probably be a hard failure.
2592 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2593 % r)
2594 for c in sorted(cc):
2595 # refspec option will be rejected if cc doesn't correspond to an
2596 # account, even though REST call to add such arbitrary cc may succeed.
2597 if c in valid_accounts:
2598 refspec_opts.append('cc=%s' % c)
2599 cc.remove(c)
2600
rmistry9eadede2016-09-19 11:22:43 -07002601 if options.topic:
2602 # Documentation on Gerrit topics is here:
2603 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002604 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002605
Edward Lemur687ca902018-12-05 02:30:30 +00002606 if options.enable_auto_submit:
2607 refspec_opts.append('l=Auto-Submit+1')
2608 if options.use_commit_queue:
2609 refspec_opts.append('l=Commit-Queue+2')
2610 elif options.cq_dry_run:
2611 refspec_opts.append('l=Commit-Queue+1')
2612
2613 if change_desc.get_reviewers(tbr_only=True):
2614 score = gerrit_util.GetCodeReviewTbrScore(
2615 self._GetGerritHost(),
2616 self._GetGerritProject())
2617 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002618
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002619 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002620 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002621 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002622 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002623 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2624
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002625 refspec_suffix = ''
2626 if refspec_opts:
2627 refspec_suffix = '%' + ','.join(refspec_opts)
2628 assert ' ' not in refspec_suffix, (
2629 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2630 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2631
Edward Lemur1b52d872019-05-09 21:12:12 +00002632 git_push_metadata = {
2633 'gerrit_host': self._GetGerritHost(),
2634 'title': title or '<untitled>',
2635 'change_id': change_id,
2636 'description': change_desc.description,
2637 }
2638 push_stdout = self._RunGitPushWithTraces(
2639 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002640
2641 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002642 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002643 change_numbers = [m.group(1)
2644 for m in map(regex.match, push_stdout.splitlines())
2645 if m]
2646 if len(change_numbers) != 1:
2647 DieWithError(
2648 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002649 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002650 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002651 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002652
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002653 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002654 # GetIssue() is not set in case of non-squash uploads according to tests.
2655 # TODO(agable): non-squash uploads in git cl should be removed.
2656 gerrit_util.AddReviewers(
2657 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002658 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002659 reviewers, cc,
2660 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002661
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002662 return 0
2663
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002664 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2665 change_desc):
2666 """Computes parent of the generated commit to be uploaded to Gerrit.
2667
2668 Returns revision or a ref name.
2669 """
2670 if custom_cl_base:
2671 # Try to avoid creating additional unintended CLs when uploading, unless
2672 # user wants to take this risk.
2673 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2674 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2675 local_ref_of_target_remote])
2676 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002677 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002678 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2679 'If you proceed with upload, more than 1 CL may be created by '
2680 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2681 'If you are certain that specified base `%s` has already been '
2682 'uploaded to Gerrit as another CL, you may proceed.\n' %
2683 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2684 if not force:
2685 confirm_or_exit(
2686 'Do you take responsibility for cleaning up potential mess '
2687 'resulting from proceeding with upload?',
2688 action='upload')
2689 return custom_cl_base
2690
Aaron Gablef97e33d2017-03-30 15:44:27 -07002691 if remote != '.':
2692 return self.GetCommonAncestorWithUpstream()
2693
2694 # If our upstream branch is local, we base our squashed commit on its
2695 # squashed version.
2696 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2697
Aaron Gablef97e33d2017-03-30 15:44:27 -07002698 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002699 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002700
2701 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002702 # TODO(tandrii): consider checking parent change in Gerrit and using its
2703 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2704 # the tree hash of the parent branch. The upside is less likely bogus
2705 # requests to reupload parent change just because it's uploadhash is
2706 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002707 parent = RunGit(['config',
2708 'branch.%s.gerritsquashhash' % upstream_branch_name],
2709 error_ok=True).strip()
2710 # Verify that the upstream branch has been uploaded too, otherwise
2711 # Gerrit will create additional CLs when uploading.
2712 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2713 RunGitSilent(['rev-parse', parent + ':'])):
2714 DieWithError(
2715 '\nUpload upstream branch %s first.\n'
2716 'It is likely that this branch has been rebased since its last '
2717 'upload, so you just need to upload it again.\n'
2718 '(If you uploaded it with --no-squash, then branch dependencies '
2719 'are not supported, and you should reupload with --squash.)'
2720 % upstream_branch_name,
2721 change_desc)
2722 return parent
2723
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002724 def _AddChangeIdToCommitMessage(self, options, args):
2725 """Re-commits using the current message, assumes the commit hook is in
2726 place.
2727 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002728 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002729 git_command = ['commit', '--amend', '-m', log_desc]
2730 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002731 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002732 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002733 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002734 return new_log_desc
2735 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002736 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002737
tandriie113dfd2016-10-11 10:20:12 -07002738 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002739 try:
2740 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002741 except GerritChangeNotExists:
2742 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002743
2744 if data['status'] in ('ABANDONED', 'MERGED'):
2745 return 'CL %s is closed' % self.GetIssue()
2746
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002747 def GetGerritChange(self, patchset=None):
2748 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002749 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002750 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002751 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002752 data = self._GetChangeDetail(['ALL_REVISIONS'])
2753
2754 assert host and issue and patchset, 'CL must be uploaded first'
2755
2756 has_patchset = any(
2757 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002758 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002759 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002760 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002761 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002762
tandrii8c5a3532016-11-04 07:52:02 -07002763 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002764 'host': host,
2765 'change': issue,
2766 'project': data['project'],
2767 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002768 }
tandriie113dfd2016-10-11 10:20:12 -07002769
tandriide281ae2016-10-12 06:02:30 -07002770 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002771 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002772
Edward Lemur707d70b2018-02-07 00:50:14 +01002773 def GetReviewers(self):
2774 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002775 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002776
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002777
tandriif9aefb72016-07-01 09:06:51 -07002778def _get_bug_line_values(default_project, bugs):
2779 """Given default_project and comma separated list of bugs, yields bug line
2780 values.
2781
2782 Each bug can be either:
2783 * a number, which is combined with default_project
2784 * string, which is left as is.
2785
2786 This function may produce more than one line, because bugdroid expects one
2787 project per line.
2788
2789 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2790 ['v8:123', 'chromium:789']
2791 """
2792 default_bugs = []
2793 others = []
2794 for bug in bugs.split(','):
2795 bug = bug.strip()
2796 if bug:
2797 try:
2798 default_bugs.append(int(bug))
2799 except ValueError:
2800 others.append(bug)
2801
2802 if default_bugs:
2803 default_bugs = ','.join(map(str, default_bugs))
2804 if default_project:
2805 yield '%s:%s' % (default_project, default_bugs)
2806 else:
2807 yield default_bugs
2808 for other in sorted(others):
2809 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2810 yield other
2811
2812
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002813class ChangeDescription(object):
2814 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002815 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002816 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002817 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002818 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002819 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002820 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2821 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002822 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002823 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002824
Dan Beamd8b04ca2019-10-10 21:23:26 +00002825 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002826 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002827 if bug:
2828 regexp = re.compile(self.BUG_LINE)
2829 prefix = settings.GetBugPrefix()
2830 if not any((regexp.match(line) for line in self._description_lines)):
2831 values = list(_get_bug_line_values(prefix, bug))
2832 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002833 if fixed:
2834 regexp = re.compile(self.FIXED_LINE)
2835 prefix = settings.GetBugPrefix()
2836 if not any((regexp.match(line) for line in self._description_lines)):
2837 values = list(_get_bug_line_values(prefix, fixed))
2838 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002839
agable@chromium.org42c20792013-09-12 17:34:49 +00002840 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002841 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002842 return '\n'.join(self._description_lines)
2843
2844 def set_description(self, desc):
2845 if isinstance(desc, basestring):
2846 lines = desc.splitlines()
2847 else:
2848 lines = [line.rstrip() for line in desc]
2849 while lines and not lines[0]:
2850 lines.pop(0)
2851 while lines and not lines[-1]:
2852 lines.pop(-1)
2853 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002854
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002855 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2856 """Rewrites the R=/TBR= line(s) as a single line each.
2857
2858 Args:
2859 reviewers (list(str)) - list of additional emails to use for reviewers.
2860 tbrs (list(str)) - list of additional emails to use for TBRs.
2861 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2862 the change that are missing OWNER coverage. If this is not None, you
2863 must also pass a value for `change`.
2864 change (Change) - The Change that should be used for OWNERS lookups.
2865 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002866 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002867 assert isinstance(tbrs, list), tbrs
2868
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002869 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002870 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002871
2872 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002873 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002874
2875 reviewers = set(reviewers)
2876 tbrs = set(tbrs)
2877 LOOKUP = {
2878 'TBR': tbrs,
2879 'R': reviewers,
2880 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002881
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002882 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002883 regexp = re.compile(self.R_LINE)
2884 matches = [regexp.match(line) for line in self._description_lines]
2885 new_desc = [l for i, l in enumerate(self._description_lines)
2886 if not matches[i]]
2887 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002888
agable@chromium.org42c20792013-09-12 17:34:49 +00002889 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002890
2891 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002892 for match in matches:
2893 if not match:
2894 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002895 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2896
2897 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002898 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002899 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002900 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002901 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002902 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002903 LOOKUP[add_owners_to].update(
2904 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002905
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002906 # If any folks ended up in both groups, remove them from tbrs.
2907 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002908
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002909 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2910 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002911
2912 # Put the new lines in the description where the old first R= line was.
2913 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2914 if 0 <= line_loc < len(self._description_lines):
2915 if new_tbr_line:
2916 self._description_lines.insert(line_loc, new_tbr_line)
2917 if new_r_line:
2918 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002919 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002920 if new_r_line:
2921 self.append_footer(new_r_line)
2922 if new_tbr_line:
2923 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002924
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002925 def set_preserve_tryjobs(self):
2926 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2927 footers = git_footers.parse_footers(self.description)
2928 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2929 if v.lower() == 'true':
2930 return
2931 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2932
Anthony Polito8b955342019-09-24 19:01:36 +00002933 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002934 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002935 self.set_description([
2936 '# Enter a description of the change.',
2937 '# This will be displayed on the codereview site.',
2938 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002939 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002940 '--------------------',
2941 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002942 bug_regexp = re.compile(self.BUG_LINE)
2943 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002944 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002945 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2946 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002947 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002948
agable@chromium.org42c20792013-09-12 17:34:49 +00002949 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002950 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002951 if not content:
2952 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002953 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002954
Bruce Dawson2377b012018-01-11 16:46:49 -08002955 # Strip off comments and default inserted "Bug:" line.
2956 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002957 (line.startswith('#') or
2958 line.rstrip() == "Bug:" or
2959 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002960 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002961 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002962 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002963
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002964 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002965 """Adds a footer line to the description.
2966
2967 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2968 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2969 that Gerrit footers are always at the end.
2970 """
2971 parsed_footer_line = git_footers.parse_footer(line)
2972 if parsed_footer_line:
2973 # Line is a gerrit footer in the form: Footer-Key: any value.
2974 # Thus, must be appended observing Gerrit footer rules.
2975 self.set_description(
2976 git_footers.add_footer(self.description,
2977 key=parsed_footer_line[0],
2978 value=parsed_footer_line[1]))
2979 return
2980
2981 if not self._description_lines:
2982 self._description_lines.append(line)
2983 return
2984
2985 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2986 if gerrit_footers:
2987 # git_footers.split_footers ensures that there is an empty line before
2988 # actual (gerrit) footers, if any. We have to keep it that way.
2989 assert top_lines and top_lines[-1] == ''
2990 top_lines, separator = top_lines[:-1], top_lines[-1:]
2991 else:
2992 separator = [] # No need for separator if there are no gerrit_footers.
2993
2994 prev_line = top_lines[-1] if top_lines else ''
2995 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2996 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2997 top_lines.append('')
2998 top_lines.append(line)
2999 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003000
tandrii99a72f22016-08-17 14:33:24 -07003001 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003002 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003003 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003004 reviewers = [match.group(2).strip()
3005 for match in matches
3006 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003007 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003008
bradnelsond975b302016-10-23 12:20:23 -07003009 def get_cced(self):
3010 """Retrieves the list of reviewers."""
3011 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3012 cced = [match.group(2).strip() for match in matches if match]
3013 return cleanup_list(cced)
3014
Nodir Turakulov23b82142017-11-16 11:04:25 -08003015 def get_hash_tags(self):
3016 """Extracts and sanitizes a list of Gerrit hashtags."""
3017 subject = (self._description_lines or ('',))[0]
3018 subject = re.sub(
3019 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3020
3021 tags = []
3022 start = 0
3023 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3024 while True:
3025 m = bracket_exp.match(subject, start)
3026 if not m:
3027 break
3028 tags.append(self.sanitize_hash_tag(m.group(1)))
3029 start = m.end()
3030
3031 if not tags:
3032 # Try "Tag: " prefix.
3033 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3034 if m:
3035 tags.append(self.sanitize_hash_tag(m.group(1)))
3036 return tags
3037
3038 @classmethod
3039 def sanitize_hash_tag(cls, tag):
3040 """Returns a sanitized Gerrit hash tag.
3041
3042 A sanitized hashtag can be used as a git push refspec parameter value.
3043 """
3044 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3045
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003046 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3047 """Updates this commit description given the parent.
3048
3049 This is essentially what Gnumbd used to do.
3050 Consult https://goo.gl/WMmpDe for more details.
3051 """
3052 assert parent_msg # No, orphan branch creation isn't supported.
3053 assert parent_hash
3054 assert dest_ref
3055 parent_footer_map = git_footers.parse_footers(parent_msg)
3056 # This will also happily parse svn-position, which GnumbD is no longer
3057 # supporting. While we'd generate correct footers, the verifier plugin
3058 # installed in Gerrit will block such commit (ie git push below will fail).
3059 parent_position = git_footers.get_position(parent_footer_map)
3060
3061 # Cherry-picks may have last line obscuring their prior footers,
3062 # from git_footers perspective. This is also what Gnumbd did.
3063 cp_line = None
3064 if (self._description_lines and
3065 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3066 cp_line = self._description_lines.pop()
3067
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003068 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003069
3070 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3071 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003072 for i, line in enumerate(footer_lines):
3073 k, v = git_footers.parse_footer(line) or (None, None)
3074 if k and k.startswith('Cr-'):
3075 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003076
3077 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003078 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003079 if parent_position[0] == dest_ref:
3080 # Same branch as parent.
3081 number = int(parent_position[1]) + 1
3082 else:
3083 number = 1 # New branch, and extra lineage.
3084 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3085 int(parent_position[1])))
3086
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003087 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3088 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003089
3090 self._description_lines = top_lines
3091 if cp_line:
3092 self._description_lines.append(cp_line)
3093 if self._description_lines[-1] != '':
3094 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003095 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003096
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003097
Aaron Gablea1bab272017-04-11 16:38:18 -07003098def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003099 """Retrieves the reviewers that approved a CL from the issue properties with
3100 messages.
3101
3102 Note that the list may contain reviewers that are not committer, thus are not
3103 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003104
3105 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003106 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003107 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003108 return sorted(
3109 set(
3110 message['sender']
3111 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003112 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003113 )
3114 )
3115
3116
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003117def FindCodereviewSettingsFile(filename='codereview.settings'):
3118 """Finds the given file starting in the cwd and going up.
3119
3120 Only looks up to the top of the repository unless an
3121 'inherit-review-settings-ok' file exists in the root of the repository.
3122 """
3123 inherit_ok_file = 'inherit-review-settings-ok'
3124 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003125 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003126 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3127 root = '/'
3128 while True:
3129 if filename in os.listdir(cwd):
3130 if os.path.isfile(os.path.join(cwd, filename)):
3131 return open(os.path.join(cwd, filename))
3132 if cwd == root:
3133 break
3134 cwd = os.path.dirname(cwd)
3135
3136
3137def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003138 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003139 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003140
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003141 def SetProperty(name, setting, unset_error_ok=False):
3142 fullname = 'rietveld.' + name
3143 if setting in keyvals:
3144 RunGit(['config', fullname, keyvals[setting]])
3145 else:
3146 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3147
tandrii48df5812016-10-17 03:55:37 -07003148 if not keyvals.get('GERRIT_HOST', False):
3149 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003150 # Only server setting is required. Other settings can be absent.
3151 # In that case, we ignore errors raised during option deletion attempt.
3152 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3153 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3154 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003155 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003156 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3157 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003158 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3159 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003160 SetProperty(
3161 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003162
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003163 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003164 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003165
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003166 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003167 RunGit(['config', 'gerrit.squash-uploads',
3168 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003169
tandrii@chromium.org28253532016-04-14 13:46:56 +00003170 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003171 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003172 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3173
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003174 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003175 # should be of the form
3176 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3177 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003178 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3179 keyvals['ORIGIN_URL_CONFIG']])
3180
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003181
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003182def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003183 """Downloads a network object to a local file, like urllib.urlretrieve.
3184
3185 This is necessary because urllib is broken for SSL connections via a proxy.
3186 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003187 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003188 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003189
3190
ukai@chromium.org712d6102013-11-27 00:52:58 +00003191def hasSheBang(fname):
3192 """Checks fname is a #! script."""
3193 with open(fname) as f:
3194 return f.read(2).startswith('#!')
3195
3196
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003197# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3198def DownloadHooks(*args, **kwargs):
3199 pass
3200
3201
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003202def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003203 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003204
3205 Args:
3206 force: True to update hooks. False to install hooks if not present.
3207 """
3208 if not settings.GetIsGerrit():
3209 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003210 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003211 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3212 if not os.access(dst, os.X_OK):
3213 if os.path.exists(dst):
3214 if not force:
3215 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003216 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003217 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003218 if not hasSheBang(dst):
3219 DieWithError('Not a script: %s\n'
3220 'You need to download from\n%s\n'
3221 'into .git/hooks/commit-msg and '
3222 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003223 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3224 except Exception:
3225 if os.path.exists(dst):
3226 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003227 DieWithError('\nFailed to download hooks.\n'
3228 'You need to download from\n%s\n'
3229 'into .git/hooks/commit-msg and '
3230 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003231
3232
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003233class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003234 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003235
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003236 _GOOGLESOURCE = 'googlesource.com'
3237
3238 def __init__(self):
3239 # Cached list of [host, identity, source], where source is either
3240 # .gitcookies or .netrc.
3241 self._all_hosts = None
3242
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003243 def ensure_configured_gitcookies(self):
3244 """Runs checks and suggests fixes to make git use .gitcookies from default
3245 path."""
3246 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3247 configured_path = RunGitSilent(
3248 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003249 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003250 if configured_path:
3251 self._ensure_default_gitcookies_path(configured_path, default)
3252 else:
3253 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003254
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003255 @staticmethod
3256 def _ensure_default_gitcookies_path(configured_path, default_path):
3257 assert configured_path
3258 if configured_path == default_path:
3259 print('git is already configured to use your .gitcookies from %s' %
3260 configured_path)
3261 return
3262
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003263 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003264 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3265 (configured_path, default_path))
3266
3267 if not os.path.exists(configured_path):
3268 print('However, your configured .gitcookies file is missing.')
3269 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3270 action='reconfigure')
3271 RunGit(['config', '--global', 'http.cookiefile', default_path])
3272 return
3273
3274 if os.path.exists(default_path):
3275 print('WARNING: default .gitcookies file already exists %s' %
3276 default_path)
3277 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3278 default_path)
3279
3280 confirm_or_exit('Move existing .gitcookies to default location?',
3281 action='move')
3282 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003283 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003284 print('Moved and reconfigured git to use .gitcookies from %s' %
3285 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003286
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003287 @staticmethod
3288 def _configure_gitcookies_path(default_path):
3289 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3290 if os.path.exists(netrc_path):
3291 print('You seem to be using outdated .netrc for git credentials: %s' %
3292 netrc_path)
3293 print('This tool will guide you through setting up recommended '
3294 '.gitcookies store for git credentials.\n'
3295 '\n'
3296 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3297 ' git config --global --unset http.cookiefile\n'
3298 ' mv %s %s.backup\n\n' % (default_path, default_path))
3299 confirm_or_exit(action='setup .gitcookies')
3300 RunGit(['config', '--global', 'http.cookiefile', default_path])
3301 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003302
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003303 def get_hosts_with_creds(self, include_netrc=False):
3304 if self._all_hosts is None:
3305 a = gerrit_util.CookiesAuthenticator()
3306 self._all_hosts = [
3307 (h, u, s)
3308 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003309 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3310 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003311 )
3312 if h.endswith(self._GOOGLESOURCE)
3313 ]
3314
3315 if include_netrc:
3316 return self._all_hosts
3317 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3318
3319 def print_current_creds(self, include_netrc=False):
3320 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3321 if not hosts:
3322 print('No Git/Gerrit credentials found')
3323 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003324 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003325 header = [('Host', 'User', 'Which file'),
3326 ['=' * l for l in lengths]]
3327 for row in (header + hosts):
3328 print('\t'.join((('%%+%ds' % l) % s)
3329 for l, s in zip(lengths, row)))
3330
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003331 @staticmethod
3332 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003333 """Parses identity "git-<username>.domain" into <username> and domain."""
3334 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003335 # distinguishable from sub-domains. But we do know typical domains:
3336 if identity.endswith('.chromium.org'):
3337 domain = 'chromium.org'
3338 username = identity[:-len('.chromium.org')]
3339 else:
3340 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003341 if username.startswith('git-'):
3342 username = username[len('git-'):]
3343 return username, domain
3344
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003345 def _canonical_git_googlesource_host(self, host):
3346 """Normalizes Gerrit hosts (with '-review') to Git host."""
3347 assert host.endswith(self._GOOGLESOURCE)
3348 # Prefix doesn't include '.' at the end.
3349 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3350 if prefix.endswith('-review'):
3351 prefix = prefix[:-len('-review')]
3352 return prefix + '.' + self._GOOGLESOURCE
3353
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003354 def _canonical_gerrit_googlesource_host(self, host):
3355 git_host = self._canonical_git_googlesource_host(host)
3356 prefix = git_host.split('.', 1)[0]
3357 return prefix + '-review.' + self._GOOGLESOURCE
3358
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003359 def _get_counterpart_host(self, host):
3360 assert host.endswith(self._GOOGLESOURCE)
3361 git = self._canonical_git_googlesource_host(host)
3362 gerrit = self._canonical_gerrit_googlesource_host(git)
3363 return git if gerrit == host else gerrit
3364
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003365 def has_generic_host(self):
3366 """Returns whether generic .googlesource.com has been configured.
3367
3368 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3369 """
3370 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3371 if host == '.' + self._GOOGLESOURCE:
3372 return True
3373 return False
3374
3375 def _get_git_gerrit_identity_pairs(self):
3376 """Returns map from canonic host to pair of identities (Git, Gerrit).
3377
3378 One of identities might be None, meaning not configured.
3379 """
3380 host_to_identity_pairs = {}
3381 for host, identity, _ in self.get_hosts_with_creds():
3382 canonical = self._canonical_git_googlesource_host(host)
3383 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3384 idx = 0 if canonical == host else 1
3385 pair[idx] = identity
3386 return host_to_identity_pairs
3387
3388 def get_partially_configured_hosts(self):
3389 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003390 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003391 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003392 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003393
3394 def get_conflicting_hosts(self):
3395 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003396 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003397 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003398 if None not in (i1, i2) and i1 != i2)
3399
3400 def get_duplicated_hosts(self):
3401 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003402 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003403
3404 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3405 'chromium.googlesource.com': 'chromium.org',
3406 'chrome-internal.googlesource.com': 'google.com',
3407 }
3408
3409 def get_hosts_with_wrong_identities(self):
3410 """Finds hosts which **likely** reference wrong identities.
3411
3412 Note: skips hosts which have conflicting identities for Git and Gerrit.
3413 """
3414 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003415 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003416 pair = self._get_git_gerrit_identity_pairs().get(host)
3417 if pair and pair[0] == pair[1]:
3418 _, domain = self._parse_identity(pair[0])
3419 if domain != expected:
3420 hosts.add(host)
3421 return hosts
3422
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003423 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003424 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003425 hosts = sorted(hosts)
3426 assert hosts
3427 if extra_column_func is None:
3428 extras = [''] * len(hosts)
3429 else:
3430 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003431 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3432 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003433 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003434 lines.append(tmpl % he)
3435 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003436
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003437 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003438 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003439 yield ('.googlesource.com wildcard record detected',
3440 ['Chrome Infrastructure team recommends to list full host names '
3441 'explicitly.'],
3442 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003443
3444 dups = self.get_duplicated_hosts()
3445 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003446 yield ('The following hosts were defined twice',
3447 self._format_hosts(dups),
3448 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003449
3450 partial = self.get_partially_configured_hosts()
3451 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003452 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3453 'These hosts are missing',
3454 self._format_hosts(partial, lambda host: 'but %s defined' %
3455 self._get_counterpart_host(host)),
3456 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003457
3458 conflicting = self.get_conflicting_hosts()
3459 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003460 yield ('The following Git hosts have differing credentials from their '
3461 'Gerrit counterparts',
3462 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3463 tuple(self._get_git_gerrit_identity_pairs()[host])),
3464 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003465
3466 wrong = self.get_hosts_with_wrong_identities()
3467 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003468 yield ('These hosts likely use wrong identity',
3469 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3470 (self._get_git_gerrit_identity_pairs()[host][0],
3471 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3472 wrong)
3473
3474 def find_and_report_problems(self):
3475 """Returns True if there was at least one problem, else False."""
3476 found = False
3477 bad_hosts = set()
3478 for title, sublines, hosts in self._find_problems():
3479 if not found:
3480 found = True
3481 print('\n\n.gitcookies problem report:\n')
3482 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003483 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003484 if sublines:
3485 print()
3486 print(' %s' % '\n '.join(sublines))
3487 print()
3488
3489 if bad_hosts:
3490 assert found
3491 print(' You can manually remove corresponding lines in your %s file and '
3492 'visit the following URLs with correct account to generate '
3493 'correct credential lines:\n' %
3494 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3495 print(' %s' % '\n '.join(sorted(set(
3496 gerrit_util.CookiesAuthenticator().get_new_password_url(
3497 self._canonical_git_googlesource_host(host))
3498 for host in bad_hosts
3499 ))))
3500 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003501
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003502
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003503@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003504def CMDcreds_check(parser, args):
3505 """Checks credentials and suggests changes."""
3506 _, _ = parser.parse_args(args)
3507
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003508 # Code below checks .gitcookies. Abort if using something else.
3509 authn = gerrit_util.Authenticator.get()
3510 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3511 if isinstance(authn, gerrit_util.GceAuthenticator):
3512 DieWithError(
3513 'This command is not designed for GCE, are you on a bot?\n'
3514 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3515 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003516 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003517 'This command is not designed for bot environment. It checks '
3518 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003519
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003520 checker = _GitCookiesChecker()
3521 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003522
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003523 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003524 checker.print_current_creds(include_netrc=True)
3525
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003526 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003527 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003528 return 0
3529 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003530
3531
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003532@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003533def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003534 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003535 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3536 branch = ShortBranchName(branchref)
3537 _, args = parser.parse_args(args)
3538 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003539 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003540 return RunGit(['config', 'branch.%s.base-url' % branch],
3541 error_ok=False).strip()
3542 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003543 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003544 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3545 error_ok=False).strip()
3546
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003547
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003548def color_for_status(status):
3549 """Maps a Changelist status to color, for CMDstatus and other tools."""
3550 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003551 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003552 'waiting': Fore.BLUE,
3553 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003554 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003555 'lgtm': Fore.GREEN,
3556 'commit': Fore.MAGENTA,
3557 'closed': Fore.CYAN,
3558 'error': Fore.WHITE,
3559 }.get(status, Fore.WHITE)
3560
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003561
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003562def get_cl_statuses(changes, fine_grained, max_processes=None):
3563 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003564
3565 If fine_grained is true, this will fetch CL statuses from the server.
3566 Otherwise, simply indicate if there's a matching url for the given branches.
3567
3568 If max_processes is specified, it is used as the maximum number of processes
3569 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3570 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003571
3572 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003573 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003574 if not changes:
3575 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003576
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003577 if not fine_grained:
3578 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003579 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003580 for cl in changes:
3581 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003582 return
3583
3584 # First, sort out authentication issues.
3585 logging.debug('ensuring credentials exist')
3586 for cl in changes:
3587 cl.EnsureAuthenticated(force=False, refresh=True)
3588
3589 def fetch(cl):
3590 try:
3591 return (cl, cl.GetStatus())
3592 except:
3593 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003594 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003595 raise
3596
3597 threads_count = len(changes)
3598 if max_processes:
3599 threads_count = max(1, min(threads_count, max_processes))
3600 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3601
3602 pool = ThreadPool(threads_count)
3603 fetched_cls = set()
3604 try:
3605 it = pool.imap_unordered(fetch, changes).__iter__()
3606 while True:
3607 try:
3608 cl, status = it.next(timeout=5)
3609 except multiprocessing.TimeoutError:
3610 break
3611 fetched_cls.add(cl)
3612 yield cl, status
3613 finally:
3614 pool.close()
3615
3616 # Add any branches that failed to fetch.
3617 for cl in set(changes) - fetched_cls:
3618 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003619
rmistry@google.com2dd99862015-06-22 12:22:18 +00003620
3621def upload_branch_deps(cl, args):
3622 """Uploads CLs of local branches that are dependents of the current branch.
3623
3624 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003625
3626 test1 -> test2.1 -> test3.1
3627 -> test3.2
3628 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003629
3630 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3631 run on the dependent branches in this order:
3632 test2.1, test3.1, test3.2, test2.2, test3.3
3633
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003634 Note: This function does not rebase your local dependent branches. Use it
3635 when you make a change to the parent branch that will not conflict
3636 with its dependent branches, and you would like their dependencies
3637 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003638 """
3639 if git_common.is_dirty_git_tree('upload-branch-deps'):
3640 return 1
3641
3642 root_branch = cl.GetBranch()
3643 if root_branch is None:
3644 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3645 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003646 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003647 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3648 'patchset dependencies without an uploaded CL.')
3649
3650 branches = RunGit(['for-each-ref',
3651 '--format=%(refname:short) %(upstream:short)',
3652 'refs/heads'])
3653 if not branches:
3654 print('No local branches found.')
3655 return 0
3656
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003657 # Create a dictionary of all local branches to the branches that are
3658 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003659 tracked_to_dependents = collections.defaultdict(list)
3660 for b in branches.splitlines():
3661 tokens = b.split()
3662 if len(tokens) == 2:
3663 branch_name, tracked = tokens
3664 tracked_to_dependents[tracked].append(branch_name)
3665
vapiera7fbd5a2016-06-16 09:17:49 -07003666 print()
3667 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003668 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003669
rmistry@google.com2dd99862015-06-22 12:22:18 +00003670 def traverse_dependents_preorder(branch, padding=''):
3671 dependents_to_process = tracked_to_dependents.get(branch, [])
3672 padding += ' '
3673 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003675 dependents.append(dependent)
3676 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003677
rmistry@google.com2dd99862015-06-22 12:22:18 +00003678 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003679 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003680
3681 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003682 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003683 return 0
3684
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003685 confirm_or_exit('This command will checkout all dependent branches and run '
3686 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003687
rmistry@google.com2dd99862015-06-22 12:22:18 +00003688 # Record all dependents that failed to upload.
3689 failures = {}
3690 # Go through all dependents, checkout the branch and upload.
3691 try:
3692 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003693 print()
3694 print('--------------------------------------')
3695 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003696 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003697 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003698 try:
3699 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003700 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003701 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003702 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003703 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003704 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003705 finally:
3706 # Swap back to the original root branch.
3707 RunGit(['checkout', '-q', root_branch])
3708
vapiera7fbd5a2016-06-16 09:17:49 -07003709 print()
3710 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003711 for dependent_branch in dependents:
3712 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003713 print(' %s : %s' % (dependent_branch, upload_status))
3714 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003715
3716 return 0
3717
3718
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003719def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3720 """Given a proposed tag name, returns a tag name that is guaranteed to be
3721 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3722 or 'foo-3', and so on."""
3723
3724 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3725 for suffix_num in itertools.count(1):
3726 if suffix_num == 1:
3727 to_check = proposed_tag
3728 else:
3729 to_check = '%s-%d' % (proposed_tag, suffix_num)
3730
3731 if to_check not in existing_tags:
3732 return to_check
3733
3734
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003735@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003736def CMDarchive(parser, args):
3737 """Archives and deletes branches associated with closed changelists."""
3738 parser.add_option(
3739 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003740 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003741 parser.add_option(
3742 '-f', '--force', action='store_true',
3743 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003744 parser.add_option(
3745 '-d', '--dry-run', action='store_true',
3746 help='Skip the branch tagging and removal steps.')
3747 parser.add_option(
3748 '-t', '--notags', action='store_true',
3749 help='Do not tag archived branches. '
3750 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003751
kmarshall3bff56b2016-06-06 18:31:47 -07003752 options, args = parser.parse_args(args)
3753 if args:
3754 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003755
3756 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3757 if not branches:
3758 return 0
3759
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003760 tags = RunGit(['for-each-ref', '--format=%(refname)',
3761 'refs/tags']).splitlines() or []
3762 tags = [t.split('/')[-1] for t in tags]
3763
vapiera7fbd5a2016-06-16 09:17:49 -07003764 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003765 changes = [Changelist(branchref=b)
3766 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003767 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3768 statuses = get_cl_statuses(changes,
3769 fine_grained=True,
3770 max_processes=options.maxjobs)
3771 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003772 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3773 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003774 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003775 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003776 proposal.sort()
3777
3778 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003779 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003780 return 0
3781
3782 current_branch = GetCurrentBranch()
3783
vapiera7fbd5a2016-06-16 09:17:49 -07003784 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003785 if options.notags:
3786 for next_item in proposal:
3787 print(' ' + next_item[0])
3788 else:
3789 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3790 for next_item in proposal:
3791 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003792
kmarshall9249e012016-08-23 12:02:16 -07003793 # Quit now on precondition failure or if instructed by the user, either
3794 # via an interactive prompt or by command line flags.
3795 if options.dry_run:
3796 print('\nNo changes were made (dry run).\n')
3797 return 0
3798 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003799 print('You are currently on a branch \'%s\' which is associated with a '
3800 'closed codereview issue, so archive cannot proceed. Please '
3801 'checkout another branch and run this command again.' %
3802 current_branch)
3803 return 1
kmarshall9249e012016-08-23 12:02:16 -07003804 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003805 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3806 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003807 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003808 return 1
3809
3810 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003811 if not options.notags:
3812 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003813
3814 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3815 # Clean up the tag if we failed to delete the branch.
3816 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003817
vapiera7fbd5a2016-06-16 09:17:49 -07003818 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003819
3820 return 0
3821
3822
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003823@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003824def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003825 """Show status of changelists.
3826
3827 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003828 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003829 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003830 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003831 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003832 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003833 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003834 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003835
3836 Also see 'git cl comments'.
3837 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003838 parser.add_option(
3839 '--no-branch-color',
3840 action='store_true',
3841 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003842 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003843 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003844 parser.add_option('-f', '--fast', action='store_true',
3845 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003846 parser.add_option(
3847 '-j', '--maxjobs', action='store', type=int,
3848 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003849 parser.add_option(
3850 '-i', '--issue', type=int,
3851 help='Operate on this issue instead of the current branch\'s implicit '
3852 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003853 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003854 if args:
3855 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003856
iannuccie53c9352016-08-17 14:40:40 -07003857 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003858 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003859
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003860 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003861 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003862 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003863 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003864 elif options.field == 'id':
3865 issueid = cl.GetIssue()
3866 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003867 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003868 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003869 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003870 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003871 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003872 elif options.field == 'status':
3873 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003874 elif options.field == 'url':
3875 url = cl.GetIssueURL()
3876 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003877 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003878 return 0
3879
3880 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3881 if not branches:
3882 print('No local branch found.')
3883 return 0
3884
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003885 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003886 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003887 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003888 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003889 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003890 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003891 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003892
Daniel McArdlea23bf592019-02-12 00:25:12 +00003893 current_branch = GetCurrentBranch()
3894
3895 def FormatBranchName(branch, colorize=False):
3896 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3897 an asterisk when it is the current branch."""
3898
3899 asterisk = ""
3900 color = Fore.RESET
3901 if branch == current_branch:
3902 asterisk = "* "
3903 color = Fore.GREEN
3904 branch_name = ShortBranchName(branch)
3905
3906 if colorize:
3907 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003908 return asterisk + branch_name
3909
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003910 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003911
3912 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003913 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3914 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003915 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003916 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003917 branch_statuses[c.GetBranch()] = status
3918 status = branch_statuses.pop(branch)
3919 url = cl.GetIssueURL()
3920 if url and (not status or status == 'error'):
3921 # The issue probably doesn't exist anymore.
3922 url += ' (broken)'
3923
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003924 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003925 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003926 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003927 color = ''
3928 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003929 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003930
Alan Cuttera3be9a52019-03-04 18:50:33 +00003931 branch_display = FormatBranchName(branch)
3932 padding = ' ' * (alignment - len(branch_display))
3933 if not options.no_branch_color:
3934 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003935
Alan Cuttera3be9a52019-03-04 18:50:33 +00003936 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3937 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003938
vapiera7fbd5a2016-06-16 09:17:49 -07003939 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003940 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003941 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003942 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003943 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003944 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003945 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003946 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003947 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003948 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003949 print('Issue description:')
3950 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003951 return 0
3952
3953
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003954def colorize_CMDstatus_doc():
3955 """To be called once in main() to add colors to git cl status help."""
3956 colors = [i for i in dir(Fore) if i[0].isupper()]
3957
3958 def colorize_line(line):
3959 for color in colors:
3960 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003961 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003962 indent = len(line) - len(line.lstrip(' ')) + 1
3963 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3964 return line
3965
3966 lines = CMDstatus.__doc__.splitlines()
3967 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3968
3969
phajdan.jre328cf92016-08-22 04:12:17 -07003970def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003971 if path == '-':
3972 json.dump(contents, sys.stdout)
3973 else:
3974 with open(path, 'w') as f:
3975 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003976
3977
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003978@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003979@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003980def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003981 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003982
3983 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003984 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003985 parser.add_option('-r', '--reverse', action='store_true',
3986 help='Lookup the branch(es) for the specified issues. If '
3987 'no issues are specified, all branches with mapped '
3988 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003989 parser.add_option('--json',
3990 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003991 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003992
dnj@chromium.org406c4402015-03-03 17:22:28 +00003993 if options.reverse:
3994 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003995 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003996 # Reverse issue lookup.
3997 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003998
3999 git_config = {}
4000 for config in RunGit(['config', '--get-regexp',
4001 r'branch\..*issue']).splitlines():
4002 name, _space, val = config.partition(' ')
4003 git_config[name] = val
4004
dnj@chromium.org406c4402015-03-03 17:22:28 +00004005 for branch in branches:
Edward Lemur52969c92020-02-06 18:15:28 +00004006 config_key = _git_branch_config_key(ShortBranchName(branch),
4007 Changelist.IssueConfigKey())
4008 issue = git_config.get(config_key)
4009 if issue:
4010 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004011 if not args:
4012 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004013 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004014 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004015 try:
4016 issue_num = int(issue)
4017 except ValueError:
4018 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004019 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004020 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004021 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004022 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004023 if options.json:
4024 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004025 return 0
4026
4027 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004028 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004029 if not issue.valid:
4030 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4031 'or no argument to list it.\n'
4032 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004033 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004034 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004035 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004036 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004037 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4038 if options.json:
4039 write_json(options.json, {
4040 'issue': cl.GetIssue(),
4041 'issue_url': cl.GetIssueURL(),
4042 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004043 return 0
4044
4045
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004046@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004047def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004048 """Shows or posts review comments for any changelist."""
4049 parser.add_option('-a', '--add-comment', dest='comment',
4050 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004051 parser.add_option('-p', '--publish', action='store_true',
4052 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004053 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004054 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004055 parser.add_option('-m', '--machine-readable', dest='readable',
4056 action='store_false', default=True,
4057 help='output comments in a format compatible with '
4058 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004059 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004060 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004061 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004062
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004063 issue = None
4064 if options.issue:
4065 try:
4066 issue = int(options.issue)
4067 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004068 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004069
Edward Lemur934836a2019-09-09 20:16:54 +00004070 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004071
4072 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004073 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004074 return 0
4075
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004076 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4077 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004078 for comment in summary:
4079 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004080 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004081 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004082 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004083 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004084 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004085 elif comment.autogenerated:
4086 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004087 else:
4088 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004089 print('\n%s%s %s%s\n%s' % (
4090 color,
4091 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4092 comment.sender,
4093 Fore.RESET,
4094 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4095
smut@google.comc85ac942015-09-15 16:34:43 +00004096 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004097 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004098 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004099 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4100 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004101 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004102 return 0
4103
4104
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004105@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004106@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004107def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004108 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004109 parser.add_option('-d', '--display', action='store_true',
4110 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004111 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004112 help='New description to set for this issue (- for stdin, '
4113 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004114 parser.add_option('-f', '--force', action='store_true',
4115 help='Delete any unpublished Gerrit edits for this issue '
4116 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004117
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004118 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004119
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004120 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004121 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004122 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004123 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004124 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004125
Edward Lemur934836a2019-09-09 20:16:54 +00004126 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004127 if target_issue_arg:
4128 kwargs['issue'] = target_issue_arg.issue
4129 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004130
4131 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004132 if not cl.GetIssue():
4133 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004134
Edward Lemur678a6842019-10-03 22:25:05 +00004135 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004136 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004137
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004138 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004139
smut@google.com34fb6b12015-07-13 20:03:26 +00004140 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004141 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004142 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004143
4144 if options.new_description:
4145 text = options.new_description
4146 if text == '-':
4147 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004148 elif text == '+':
4149 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004150 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004151
4152 description.set_description(text)
4153 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004154 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004155 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004156 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004157 return 0
4158
4159
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004160@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004161def CMDlint(parser, args):
4162 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004163 parser.add_option('--filter', action='append', metavar='-x,+y',
4164 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004165 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004166
4167 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004168 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004169 try:
4170 import cpplint
4171 import cpplint_chromium
4172 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004173 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004174 return 1
4175
4176 # Change the current working directory before calling lint so that it
4177 # shows the correct base.
4178 previous_cwd = os.getcwd()
4179 os.chdir(settings.GetRoot())
4180 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004181 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004182 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004183 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004184 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004185 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004186 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004187
4188 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004189 command = args + files
4190 if options.filter:
4191 command = ['--filter=' + ','.join(options.filter)] + command
4192 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004193
4194 white_regex = re.compile(settings.GetLintRegex())
4195 black_regex = re.compile(settings.GetLintIgnoreRegex())
4196 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4197 for filename in filenames:
4198 if white_regex.match(filename):
4199 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004200 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004201 else:
4202 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4203 extra_check_functions)
4204 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004205 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004206 finally:
4207 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004208 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004209 if cpplint._cpplint_state.error_count != 0:
4210 return 1
4211 return 0
4212
4213
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004214@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004215def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004216 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004217 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004218 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004219 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004220 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004221 parser.add_option('--all', action='store_true',
4222 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004223 parser.add_option('--parallel', action='store_true',
4224 help='Run all tests specified by input_api.RunTests in all '
4225 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004226 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004227
sbc@chromium.org71437c02015-04-09 19:29:40 +00004228 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004229 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004230 return 1
4231
Edward Lemur934836a2019-09-09 20:16:54 +00004232 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004233 if args:
4234 base_branch = args[0]
4235 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004236 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004237 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004238
Aaron Gable8076c282017-11-29 14:39:41 -08004239 if options.all:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004240 base_change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004241 files = [('M', f) for f in base_change.AllFiles()]
4242 change = presubmit_support.GitChange(
4243 base_change.Name(),
4244 base_change.FullDescriptionText(),
4245 base_change.RepositoryRoot(),
4246 files,
4247 base_change.issue,
4248 base_change.patchset,
4249 base_change.author_email,
4250 base_change._upstream)
4251 else:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004252 change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004253
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004254 cl.RunHook(
4255 committing=not options.upload,
4256 may_prompt=False,
4257 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004258 change=change,
4259 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004260 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004261
4262
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004263def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004264 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004265
4266 Works the same way as
4267 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4268 but can be called on demand on all platforms.
4269
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004270 The basic idea is to generate git hash of a state of the tree, original
4271 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004272 """
4273 lines = []
4274 tree_hash = RunGitSilent(['write-tree'])
4275 lines.append('tree %s' % tree_hash.strip())
4276 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4277 if code == 0:
4278 lines.append('parent %s' % parent.strip())
4279 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4280 lines.append('author %s' % author.strip())
4281 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4282 lines.append('committer %s' % committer.strip())
4283 lines.append('')
4284 # Note: Gerrit's commit-hook actually cleans message of some lines and
4285 # whitespace. This code is not doing this, but it clearly won't decrease
4286 # entropy.
4287 lines.append(message)
4288 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004289 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004290 return 'I%s' % change_hash.strip()
4291
4292
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004293def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004294 """Computes the remote branch ref to use for the CL.
4295
4296 Args:
4297 remote (str): The git remote for the CL.
4298 remote_branch (str): The git remote branch for the CL.
4299 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004300 """
4301 if not (remote and remote_branch):
4302 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004303
wittman@chromium.org455dc922015-01-26 20:15:50 +00004304 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004305 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004306 # refs, which are then translated into the remote full symbolic refs
4307 # below.
4308 if '/' not in target_branch:
4309 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4310 else:
4311 prefix_replacements = (
4312 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4313 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4314 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4315 )
4316 match = None
4317 for regex, replacement in prefix_replacements:
4318 match = re.search(regex, target_branch)
4319 if match:
4320 remote_branch = target_branch.replace(match.group(0), replacement)
4321 break
4322 if not match:
4323 # This is a branch path but not one we recognize; use as-is.
4324 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004325 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4326 # Handle the refs that need to land in different refs.
4327 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004328
wittman@chromium.org455dc922015-01-26 20:15:50 +00004329 # Create the true path to the remote branch.
4330 # Does the following translation:
4331 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4332 # * refs/remotes/origin/master -> refs/heads/master
4333 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4334 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4335 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4336 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4337 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4338 'refs/heads/')
4339 elif remote_branch.startswith('refs/remotes/branch-heads'):
4340 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004341
wittman@chromium.org455dc922015-01-26 20:15:50 +00004342 return remote_branch
4343
4344
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004345def cleanup_list(l):
4346 """Fixes a list so that comma separated items are put as individual items.
4347
4348 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4349 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4350 """
4351 items = sum((i.split(',') for i in l), [])
4352 stripped_items = (i.strip() for i in items)
4353 return sorted(filter(None, stripped_items))
4354
4355
Aaron Gable4db38df2017-11-03 14:59:07 -07004356@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004357@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004358def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004359 """Uploads the current changelist to codereview.
4360
4361 Can skip dependency patchset uploads for a branch by running:
4362 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004363 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004364 git config --unset branch.branch_name.skip-deps-uploads
4365 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004366
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004367 If the name of the checked out branch starts with "bug-" or "fix-" followed
4368 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004369 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004370
4371 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004372 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004373 [git-cl] add support for hashtags
4374 Foo bar: implement foo
4375 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004376 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004377 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4378 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004379 parser.add_option('--bypass-watchlists', action='store_true',
4380 dest='bypass_watchlists',
4381 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004382 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004383 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004384 parser.add_option('--message', '-m', dest='message',
4385 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004386 parser.add_option('-b', '--bug',
4387 help='pre-populate the bug number(s) for this issue. '
4388 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004389 parser.add_option('--message-file', dest='message_file',
4390 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004391 parser.add_option('--title', '-t', dest='title',
4392 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004393 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004394 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004395 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004396 parser.add_option('--tbrs',
4397 action='append', default=[],
4398 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004399 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004400 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004401 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004402 parser.add_option('--hashtag', dest='hashtags',
4403 action='append', default=[],
4404 help=('Gerrit hashtag for new CL; '
4405 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004406 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004407 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004408 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004409 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004410 metavar='TARGET',
4411 help='Apply CL to remote ref TARGET. ' +
4412 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004413 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004414 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004415 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004416 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004417 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004418 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004419 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4420 const='TBR', help='add a set of OWNERS to TBR')
4421 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4422 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004423 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004424 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004425 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004426 'implies --send-mail')
4427 parser.add_option('-d', '--cq-dry-run',
4428 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004429 help='Send the patchset to do a CQ dry run right after '
4430 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004431 parser.add_option('--preserve-tryjobs', action='store_true',
4432 help='instruct the CQ to let tryjobs running even after '
4433 'new patchsets are uploaded instead of canceling '
4434 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004435 parser.add_option('--dependencies', action='store_true',
4436 help='Uploads CLs of all the local branches that depend on '
4437 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004438 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4439 help='Sends your change to the CQ after an approval. Only '
4440 'works on repos that have the Auto-Submit label '
4441 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004442 parser.add_option('--parallel', action='store_true',
4443 help='Run all tests specified by input_api.RunTests in all '
4444 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004445 parser.add_option('--no-autocc', action='store_true',
4446 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004447 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004448 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004449 parser.add_option('-R', '--retry-failed', action='store_true',
4450 help='Retry failed tryjobs from old patchset immediately '
4451 'after uploading new patchset. Cannot be used with '
4452 '--use-commit-queue or --cq-dry-run.')
4453 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4454 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004455 parser.add_option('--fixed', '-x',
4456 help='List of bugs that will be commented on and marked '
4457 'fixed (pre-populates "Fixed:" tag). Same format as '
4458 '-b option / "Bug:" tag. If fixing several issues, '
4459 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004460 parser.add_option('--edit-description', action='store_true', default=False,
4461 help='Modify description before upload. Cannot be used '
4462 'with --force. It is a noop when --no-squash is set '
4463 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004464
rmistry@google.com2dd99862015-06-22 12:22:18 +00004465 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004466 (options, args) = parser.parse_args(args)
4467
sbc@chromium.org71437c02015-04-09 19:29:40 +00004468 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004469 return 1
4470
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004471 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004472 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004473 options.cc = cleanup_list(options.cc)
4474
Josipe827b0f2020-01-30 00:07:20 +00004475 if options.edit_description and options.force:
4476 parser.error('Only one of --force and --edit-description allowed')
4477
tandriib80458a2016-06-23 12:20:07 -07004478 if options.message_file:
4479 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004480 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004481 options.message = gclient_utils.FileRead(options.message_file)
4482 options.message_file = None
4483
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004484 if ([options.cq_dry_run,
4485 options.use_commit_queue,
4486 options.retry_failed].count(True) > 1):
4487 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4488 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004489
Aaron Gableedbc4132017-09-11 13:22:28 -07004490 if options.use_commit_queue:
4491 options.send_mail = True
4492
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004493 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4494 settings.GetIsGerrit()
4495
Edward Lemur934836a2019-09-09 20:16:54 +00004496 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004497 if options.retry_failed and not cl.GetIssue():
4498 print('No previous patchsets, so --retry-failed has no effect.')
4499 options.retry_failed = False
4500 # cl.GetMostRecentPatchset uses cached information, and can return the last
4501 # patchset before upload. Calling it here makes it clear that it's the
4502 # last patchset before upload. Note that GetMostRecentPatchset will fail
4503 # if no CL has been uploaded yet.
4504 if options.retry_failed:
4505 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004506
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004507 ret = cl.CMDUpload(options, args, orig_args)
4508
4509 if options.retry_failed:
4510 if ret != 0:
4511 print('Upload failed, so --retry-failed has no effect.')
4512 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004513 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004514 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004515 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004516 if len(buckets) == 0:
4517 print('No failed tryjobs, so --retry-failed has no effect.')
4518 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004519 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004520
4521 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004522
4523
Francois Dorayd42c6812017-05-30 15:10:20 -04004524@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004525@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004526def CMDsplit(parser, args):
4527 """Splits a branch into smaller branches and uploads CLs.
4528
4529 Creates a branch and uploads a CL for each group of files modified in the
4530 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004531 comment, '$directory' is replaced with the directory containing the changes
4532 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4533 sending out, and '$num_cls' is replaced with the total number of CLs that
4534 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004535 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004536 parser.add_option('-d', '--description', dest='description_file',
4537 help='A text file containing a CL description in which '
4538 '$directory will be replaced by each CL\'s directory.')
4539 parser.add_option('-c', '--comment', dest='comment_file',
4540 help='A text file containing a CL comment.')
4541 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004542 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004543 help='List the files and reviewers for each CL that would '
4544 'be created, but don\'t create branches or CLs.')
4545 parser.add_option('--cq-dry-run', action='store_true',
4546 help='If set, will do a cq dry run for each uploaded CL. '
4547 'Please be careful when doing this; more than ~10 CLs '
4548 'has the potential to overload our build '
4549 'infrastructure. Try to upload these not during high '
4550 'load times (usually 11-3 Mountain View time). Email '
4551 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004552 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4553 default=True,
4554 help='Sends your change to the CQ after an approval. Only '
4555 'works on repos that have the Auto-Submit label '
4556 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004557 options, _ = parser.parse_args(args)
4558
4559 if not options.description_file:
4560 parser.error('No --description flag specified.')
4561
4562 def WrappedCMDupload(args):
4563 return CMDupload(OptionParser(), args)
4564
4565 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004566 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004567 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004568
4569
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004570@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004571@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004572def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004573 """DEPRECATED: Used to commit the current changelist via git-svn."""
4574 message = ('git-cl no longer supports committing to SVN repositories via '
4575 'git-svn. You probably want to use `git cl land` instead.')
4576 print(message)
4577 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578
4579
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004580@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004581@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004582def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004583 """Commits the current changelist via git.
4584
4585 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4586 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004587 """
4588 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4589 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004590 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004591 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004592 parser.add_option('--parallel', action='store_true',
4593 help='Run all tests specified by input_api.RunTests in all '
4594 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004595 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004596
Edward Lemur934836a2019-09-09 20:16:54 +00004597 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004598
Robert Iannucci2e73d432018-03-14 01:10:47 -07004599 if not cl.GetIssue():
4600 DieWithError('You must upload the change first to Gerrit.\n'
4601 ' If you would rather have `git cl land` upload '
4602 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004603 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004604 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004605
4606
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004607@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004608@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004609def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004610 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004611 parser.add_option('-b', dest='newbranch',
4612 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004613 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004614 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004615 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004616 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004617
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004618 group = optparse.OptionGroup(
4619 parser,
4620 'Options for continuing work on the current issue uploaded from a '
4621 'different clone (e.g. different machine). Must be used independently '
4622 'from the other options. No issue number should be specified, and the '
4623 'branch must have an issue number associated with it')
4624 group.add_option('--reapply', action='store_true', dest='reapply',
4625 help='Reset the branch and reapply the issue.\n'
4626 'CAUTION: This will undo any local changes in this '
4627 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004628
4629 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004630 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004631 parser.add_option_group(group)
4632
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004633 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004634
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004635 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004636 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004637 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004638 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004639 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004640
Edward Lemur934836a2019-09-09 20:16:54 +00004641 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004642 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004643 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004644
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004645 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004646 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004647 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004648
4649 RunGit(['reset', '--hard', upstream])
4650 if options.pull:
4651 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004652
Edward Lemur678a6842019-10-03 22:25:05 +00004653 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4654 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004655
4656 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004657 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004658
Edward Lemurf38bc172019-09-03 21:02:13 +00004659 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004660 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004661 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004662
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004663 # We don't want uncommitted changes mixed up with the patch.
4664 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004665 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004666
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004667 if options.newbranch:
4668 if options.force:
4669 RunGit(['branch', '-D', options.newbranch],
4670 stderr=subprocess2.PIPE, error_ok=True)
4671 RunGit(['new-branch', options.newbranch])
4672
Edward Lemur678a6842019-10-03 22:25:05 +00004673 cl = Changelist(
4674 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004675
Edward Lemur678a6842019-10-03 22:25:05 +00004676 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004677 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004678
Edward Lemurf38bc172019-09-03 21:02:13 +00004679 return cl.CMDPatchWithParsedIssue(
4680 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004681
4682
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004683def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004684 """Fetches the tree status and returns either 'open', 'closed',
4685 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004686 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004687 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004688 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004689 if status.find('closed') != -1 or status == '0':
4690 return 'closed'
4691 elif status.find('open') != -1 or status == '1':
4692 return 'open'
4693 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004694 return 'unset'
4695
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004696
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004697def GetTreeStatusReason():
4698 """Fetches the tree status from a json url and returns the message
4699 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004700 url = settings.GetTreeStatusUrl()
4701 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004702 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004703 status = json.loads(connection.read())
4704 connection.close()
4705 return status['message']
4706
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004707
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004708@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004709def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004710 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004711 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004712 status = GetTreeStatus()
4713 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004714 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004715 return 2
4716
vapiera7fbd5a2016-06-16 09:17:49 -07004717 print('The tree is %s' % status)
4718 print()
4719 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004720 if status != 'open':
4721 return 1
4722 return 0
4723
4724
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004725@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004726def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004727 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4728 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004729 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004730 '-b', '--bot', action='append',
4731 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4732 'times to specify multiple builders. ex: '
4733 '"-b win_rel -b win_layout". See '
4734 'the try server waterfall for the builders name and the tests '
4735 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004736 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004737 '-B', '--bucket', default='',
4738 help=('Buildbucket bucket to send the try requests.'))
4739 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004740 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004741 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004742 'be determined by the try recipe that builder runs, which usually '
4743 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004744 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004745 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004746 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004747 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004748 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004749 '--category', default='git_cl_try', help='Specify custom build category.')
4750 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004751 '--project',
4752 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004753 'in recipe to determine to which repository or directory to '
4754 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004755 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004756 '-p', '--property', dest='properties', action='append', default=[],
4757 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004758 'key2=value2 etc. The value will be treated as '
4759 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004760 'NOTE: using this may make your tryjob not usable for CQ, '
4761 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004762 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004763 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4764 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004765 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004766 parser.add_option(
4767 '-R', '--retry-failed', action='store_true', default=False,
4768 help='Retry failed jobs from the latest set of tryjobs. '
4769 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004770 parser.add_option(
4771 '-i', '--issue', type=int,
4772 help='Operate on this issue instead of the current branch\'s implicit '
4773 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004774 options, args = parser.parse_args(args)
4775
machenbach@chromium.org45453142015-09-15 08:45:22 +00004776 # Make sure that all properties are prop=value pairs.
4777 bad_params = [x for x in options.properties if '=' not in x]
4778 if bad_params:
4779 parser.error('Got properties with missing "=": %s' % bad_params)
4780
maruel@chromium.org15192402012-09-06 12:38:29 +00004781 if args:
4782 parser.error('Unknown arguments: %s' % args)
4783
Edward Lemur934836a2019-09-09 20:16:54 +00004784 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004785 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004786 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004787
Edward Lemurf38bc172019-09-03 21:02:13 +00004788 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004789 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004790
tandriie113dfd2016-10-11 10:20:12 -07004791 error_message = cl.CannotTriggerTryJobReason()
4792 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004793 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004794
Quinten Yearsley983111f2019-09-26 17:18:48 +00004795 if options.retry_failed:
4796 if options.bot or options.bucket:
4797 print('ERROR: The option --retry-failed is not compatible with '
4798 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4799 return 1
4800 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004801 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004802 if options.verbose:
4803 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004804 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004805 if not buckets:
4806 print('There are no failed jobs in the latest set of jobs '
4807 '(patchset #%d), doing nothing.' % patchset)
4808 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004809 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004810 if num_builders > 10:
4811 confirm_or_exit('There are %d builders with failed builds.'
4812 % num_builders, action='continue')
4813 else:
4814 buckets = _get_bucket_map(cl, options, parser)
4815 if buckets and any(b.startswith('master.') for b in buckets):
4816 print('ERROR: Buildbot masters are not supported.')
4817 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004818
qyearsleydd49f942016-10-28 11:57:22 -07004819 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4820 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004821 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004822 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004823 print('git cl try with no bots now defaults to CQ dry run.')
4824 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4825 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004826
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004827 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004828 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004829 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004830 'of bot requires an initial job from a parent (usually a builder). '
4831 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004832 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004833 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004834
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004835 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004836 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004837 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004838 except BuildbucketResponseException as ex:
4839 print('ERROR: %s' % ex)
4840 return 1
4841 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004842
4843
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004844@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004845def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004846 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004847 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004848 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004849 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004850 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004851 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004852 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004853 '--color', action='store_true', default=setup_color.IS_TTY,
4854 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004855 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004856 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4857 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004858 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004859 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004860 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004861 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004862 parser.add_option(
4863 '-i', '--issue', type=int,
4864 help='Operate on this issue instead of the current branch\'s implicit '
4865 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004866 options, args = parser.parse_args(args)
4867 if args:
4868 parser.error('Unrecognized args: %s' % ' '.join(args))
4869
Edward Lemur934836a2019-09-09 20:16:54 +00004870 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004871 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004872 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004873
tandrii221ab252016-10-06 08:12:04 -07004874 patchset = options.patchset
4875 if not patchset:
4876 patchset = cl.GetMostRecentPatchset()
4877 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004878 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004879 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004880 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004881 cl.GetIssue())
4882
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004883 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004884 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004885 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004886 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004887 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004888 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004889 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004890 else:
4891 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004892 return 0
4893
4894
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004895@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004896@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004897def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004898 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004899 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004900 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004901 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004902
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004903 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004904 if args:
4905 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004906 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004907 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004908 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004909 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004910
4911 # Clear configured merge-base, if there is one.
4912 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004913 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004914 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004915 return 0
4916
4917
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004918@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004919def CMDweb(parser, args):
4920 """Opens the current CL in the web browser."""
4921 _, args = parser.parse_args(args)
4922 if args:
4923 parser.error('Unrecognized args: %s' % ' '.join(args))
4924
4925 issue_url = Changelist().GetIssueURL()
4926 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004927 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004928 return 1
4929
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004930 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004931 # allows us to hide the "Created new window in existing browser session."
4932 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004933 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004934 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004935 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004936 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004937 os.open(os.devnull, os.O_RDWR)
4938 try:
4939 webbrowser.open(issue_url)
4940 finally:
4941 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004942 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004943 return 0
4944
4945
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004946@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004947def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004948 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004949 parser.add_option('-d', '--dry-run', action='store_true',
4950 help='trigger in dry run mode')
4951 parser.add_option('-c', '--clear', action='store_true',
4952 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004953 parser.add_option(
4954 '-i', '--issue', type=int,
4955 help='Operate on this issue instead of the current branch\'s implicit '
4956 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004957 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004958 if args:
4959 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004960 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004961 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004962
Edward Lemur934836a2019-09-09 20:16:54 +00004963 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004964 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004965 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004966 elif options.dry_run:
4967 state = _CQState.DRY_RUN
4968 else:
4969 state = _CQState.COMMIT
4970 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004971 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004972 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004973 return 0
4974
4975
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004976@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004977def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004978 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004979 parser.add_option(
4980 '-i', '--issue', type=int,
4981 help='Operate on this issue instead of the current branch\'s implicit '
4982 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004983 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004984 if args:
4985 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004986 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004987 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004988 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004989 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004990 cl.CloseIssue()
4991 return 0
4992
4993
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004994@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004995def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004996 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004997 parser.add_option(
4998 '--stat',
4999 action='store_true',
5000 dest='stat',
5001 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005002 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005003 if args:
5004 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005005
Edward Lemur934836a2019-09-09 20:16:54 +00005006 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005007 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005008 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005009 if not issue:
5010 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005011
Aaron Gablea718c3e2017-08-28 17:47:28 -07005012 base = cl._GitGetBranchConfigValue('last-upload-hash')
5013 if not base:
5014 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5015 if not base:
5016 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5017 revision_info = detail['revisions'][detail['current_revision']]
5018 fetch_info = revision_info['fetch']['http']
5019 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5020 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005021
Aaron Gablea718c3e2017-08-28 17:47:28 -07005022 cmd = ['git', 'diff']
5023 if options.stat:
5024 cmd.append('--stat')
5025 cmd.append(base)
5026 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005027
5028 return 0
5029
5030
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005031@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005032def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005033 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005034 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005035 '--ignore-current',
5036 action='store_true',
5037 help='Ignore the CL\'s current reviewers and start from scratch.')
5038 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005039 '--ignore-self',
5040 action='store_true',
5041 help='Do not consider CL\'s author as an owners.')
5042 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005043 '--no-color',
5044 action='store_true',
5045 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005046 parser.add_option(
5047 '--batch',
5048 action='store_true',
5049 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005050 # TODO: Consider moving this to another command, since other
5051 # git-cl owners commands deal with owners for a given CL.
5052 parser.add_option(
5053 '--show-all',
5054 action='store_true',
5055 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005056 options, args = parser.parse_args(args)
5057
5058 author = RunGit(['config', 'user.email']).strip() or None
5059
Edward Lemur934836a2019-09-09 20:16:54 +00005060 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005061
Yang Guo6e269a02019-06-26 11:17:02 +00005062 if options.show_all:
5063 for arg in args:
5064 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00005065 database = owners.Database(settings.GetRoot(), file, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00005066 database.load_data_needed_for([arg])
5067 print('Owners for %s:' % arg)
5068 for owner in sorted(database.all_possible_owners([arg], None)):
5069 print(' - %s' % owner)
5070 return 0
5071
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005072 if args:
5073 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005074 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005075 base_branch = args[0]
5076 else:
5077 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005078 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005079
Edward Lemur7f6dec02020-02-06 20:23:58 +00005080 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005081 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5082
5083 if options.batch:
5084 db = owners.Database(change.RepositoryRoot(), file, os.path)
5085 print('\n'.join(db.reviewers_for(affected_files, author)))
5086 return 0
5087
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005088 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005089 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005090 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005091 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005092 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005093 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005094 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005095 override_files=change.OriginalOwnersFiles(),
5096 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005097
5098
Aiden Bennerc08566e2018-10-03 17:52:42 +00005099def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005100 """Generates a diff command."""
5101 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005102 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5103
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005104 if allow_prefix:
5105 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5106 # case that diff.noprefix is set in the user's git config.
5107 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5108 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005109 diff_cmd += ['--no-prefix']
5110
5111 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005112
5113 if args:
5114 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005115 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005116 diff_cmd.append(arg)
5117 else:
5118 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005119
5120 return diff_cmd
5121
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005122
Jamie Madill5e96ad12020-01-13 16:08:35 +00005123def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5124 """Runs clang-format-diff and sets a return value if necessary."""
5125
5126 if not clang_diff_files:
5127 return 0
5128
5129 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5130 # formatted. This is used to block during the presubmit.
5131 return_value = 0
5132
5133 # Locate the clang-format binary in the checkout
5134 try:
5135 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5136 except clang_format.NotFoundError as e:
5137 DieWithError(e)
5138
5139 if opts.full or settings.GetFormatFullByDefault():
5140 cmd = [clang_format_tool]
5141 if not opts.dry_run and not opts.diff:
5142 cmd.append('-i')
5143 if opts.dry_run:
5144 for diff_file in clang_diff_files:
5145 with open(diff_file, 'r') as myfile:
5146 code = myfile.read().replace('\r\n', '\n')
5147 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5148 stdout = stdout.replace('\r\n', '\n')
5149 if opts.diff:
5150 sys.stdout.write(stdout)
5151 if code != stdout:
5152 return_value = 2
5153 else:
5154 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5155 if opts.diff:
5156 sys.stdout.write(stdout)
5157 else:
5158 env = os.environ.copy()
5159 env['PATH'] = str(os.path.dirname(clang_format_tool))
5160 try:
5161 script = clang_format.FindClangFormatScriptInChromiumTree(
5162 'clang-format-diff.py')
5163 except clang_format.NotFoundError as e:
5164 DieWithError(e)
5165
5166 cmd = [sys.executable, script, '-p0']
5167 if not opts.dry_run and not opts.diff:
5168 cmd.append('-i')
5169
5170 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5171 diff_output = RunGit(diff_cmd)
5172
5173 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5174 if opts.diff:
5175 sys.stdout.write(stdout)
5176 if opts.dry_run and len(stdout) > 0:
5177 return_value = 2
5178
5179 return return_value
5180
5181
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005182def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005183 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005184 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005185
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005186
enne@chromium.org555cfe42014-01-29 18:21:39 +00005187@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005188@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005189def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005190 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005191 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005192 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005193 parser.add_option('--full', action='store_true',
5194 help='Reformat the full content of all touched files')
5195 parser.add_option('--dry-run', action='store_true',
5196 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005197 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005198 '--no-clang-format',
5199 dest='clang_format',
5200 action='store_false',
5201 default=True,
5202 help='Disables formatting of various file types using clang-format.')
5203 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005204 '--python',
5205 action='store_true',
5206 default=None,
5207 help='Enables python formatting on all python files.')
5208 parser.add_option(
5209 '--no-python',
5210 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005211 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005212 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005213 'If neither --python or --no-python are set, python files that have a '
5214 '.style.yapf file in an ancestor directory will be formatted. '
5215 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005216 parser.add_option(
5217 '--js',
5218 action='store_true',
5219 help='Format javascript code with clang-format. '
5220 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005221 parser.add_option('--diff', action='store_true',
5222 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005223 parser.add_option('--presubmit', action='store_true',
5224 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005225 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005226
Garrett Beaty91a6f332020-01-06 16:57:24 +00005227 if opts.python is not None and opts.no_python:
5228 raise parser.error('Cannot set both --python and --no-python')
5229 if opts.no_python:
5230 opts.python = False
5231
Daniel Chengc55eecf2016-12-30 03:11:02 -08005232 # Normalize any remaining args against the current path, so paths relative to
5233 # the current directory are still resolved as expected.
5234 args = [os.path.join(os.getcwd(), arg) for arg in args]
5235
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005236 # git diff generates paths against the root of the repository. Change
5237 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005238 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005239 if rel_base_path:
5240 os.chdir(rel_base_path)
5241
digit@chromium.org29e47272013-05-17 17:01:46 +00005242 # Grab the merge-base commit, i.e. the upstream commit of the current
5243 # branch when it was created or the last time it was rebased. This is
5244 # to cover the case where the user may have called "git fetch origin",
5245 # moving the origin branch to a newer commit, but hasn't rebased yet.
5246 upstream_commit = None
5247 cl = Changelist()
5248 upstream_branch = cl.GetUpstreamBranch()
5249 if upstream_branch:
5250 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5251 upstream_commit = upstream_commit.strip()
5252
5253 if not upstream_commit:
5254 DieWithError('Could not find base commit for this branch. '
5255 'Are you in detached state?')
5256
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005257 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5258 diff_output = RunGit(changed_files_cmd)
5259 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005260 # Filter out files deleted by this CL
5261 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005262
Andreas Haas417d89c2020-02-06 10:24:27 +00005263 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005264 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005265
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005266 clang_diff_files = []
5267 if opts.clang_format:
5268 clang_diff_files = [
5269 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5270 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005271 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5272 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005273 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005274
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005275 top_dir = os.path.normpath(
5276 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5277
Jamie Madill5e96ad12020-01-13 16:08:35 +00005278 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5279 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005280
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005281 # Similar code to above, but using yapf on .py files rather than clang-format
5282 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005283 py_explicitly_disabled = opts.python is not None and not opts.python
5284 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005285 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5286 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5287 if sys.platform.startswith('win'):
5288 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005289
Aiden Bennerc08566e2018-10-03 17:52:42 +00005290 # Used for caching.
5291 yapf_configs = {}
5292 for f in python_diff_files:
5293 # Find the yapf style config for the current file, defaults to depot
5294 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005295 _FindYapfConfigFile(f, yapf_configs, top_dir)
5296
5297 # Turn on python formatting by default if a yapf config is specified.
5298 # This breaks in the case of this repo though since the specified
5299 # style file is also the global default.
5300 if opts.python is None:
5301 filtered_py_files = []
5302 for f in python_diff_files:
5303 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5304 filtered_py_files.append(f)
5305 else:
5306 filtered_py_files = python_diff_files
5307
5308 # Note: yapf still seems to fix indentation of the entire file
5309 # even if line ranges are specified.
5310 # See https://github.com/google/yapf/issues/499
5311 if not opts.full and filtered_py_files:
5312 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5313
Brian Sheedyb4307d52019-12-02 19:18:17 +00005314 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5315 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5316 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005317
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005318 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005319 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5320 # Default to pep8 if not .style.yapf is found.
5321 if not yapf_style:
5322 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005323
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005324 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005325
5326 has_formattable_lines = False
5327 if not opts.full:
5328 # Only run yapf over changed line ranges.
5329 for diff_start, diff_len in py_line_diffs[f]:
5330 diff_end = diff_start + diff_len - 1
5331 # Yapf errors out if diff_end < diff_start but this
5332 # is a valid line range diff for a removal.
5333 if diff_end >= diff_start:
5334 has_formattable_lines = True
5335 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5336 # If all line diffs were removals we have nothing to format.
5337 if not has_formattable_lines:
5338 continue
5339
5340 if opts.diff or opts.dry_run:
5341 cmd += ['--diff']
5342 # Will return non-zero exit code if non-empty diff.
5343 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5344 if opts.diff:
5345 sys.stdout.write(stdout)
5346 elif len(stdout) > 0:
5347 return_value = 2
5348 else:
5349 cmd += ['-i']
5350 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005351
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005352 # Dart's formatter does not have the nice property of only operating on
5353 # modified chunks, so hard code full.
5354 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005355 try:
5356 command = [dart_format.FindDartFmtToolInChromiumTree()]
5357 if not opts.dry_run and not opts.diff:
5358 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005359 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005360
ppi@chromium.org6593d932016-03-03 15:41:15 +00005361 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005362 if opts.dry_run and stdout:
5363 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005364 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005365 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5366 'found in this checkout. Files in other languages are still '
5367 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005368
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005369 # Format GN build files. Always run on full build files for canonical form.
5370 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005371 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005372 if opts.dry_run or opts.diff:
5373 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005374 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005375 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5376 shell=sys.platform == 'win32',
5377 cwd=top_dir)
5378 if opts.dry_run and gn_ret == 2:
5379 return_value = 2 # Not formatted.
5380 elif opts.diff and gn_ret == 2:
5381 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005382 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005383 elif gn_ret != 0:
5384 # For non-dry run cases (and non-2 return values for dry-run), a
5385 # nonzero error code indicates a failure, probably because the file
5386 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005387 DieWithError('gn format failed on ' + gn_diff_file +
5388 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005389
Ilya Shermane081cbe2017-08-15 17:51:04 -07005390 # Skip the metrics formatting from the global presubmit hook. These files have
5391 # a separate presubmit hook that issues an error if the files need formatting,
5392 # whereas the top-level presubmit script merely issues a warning. Formatting
5393 # these files is somewhat slow, so it's important not to duplicate the work.
5394 if not opts.presubmit:
5395 for xml_dir in GetDirtyMetricsDirs(diff_files):
5396 tool_dir = os.path.join(top_dir, xml_dir)
5397 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5398 if opts.dry_run or opts.diff:
5399 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005400 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005401 if opts.diff:
5402 sys.stdout.write(stdout)
5403 if opts.dry_run and stdout:
5404 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005405
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005406 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005407
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005408
Steven Holte2e664bf2017-04-21 13:10:47 -07005409def GetDirtyMetricsDirs(diff_files):
5410 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5411 metrics_xml_dirs = [
5412 os.path.join('tools', 'metrics', 'actions'),
5413 os.path.join('tools', 'metrics', 'histograms'),
5414 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005415 os.path.join('tools', 'metrics', 'ukm'),
5416 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005417 for xml_dir in metrics_xml_dirs:
5418 if any(file.startswith(xml_dir) for file in xml_diff_files):
5419 yield xml_dir
5420
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005421
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005422@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005423@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005424def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005425 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005426 _, args = parser.parse_args(args)
5427
5428 if len(args) != 1:
5429 parser.print_help()
5430 return 1
5431
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005432 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005433 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005434 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005435
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005436 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005437
Edward Lemur52969c92020-02-06 18:15:28 +00005438 issueprefix = Changelist.IssueConfigKey()
5439 output = RunGit(['config', '--local', '--get-regexp',
5440 r'branch\..*\.%s' % issueprefix],
5441 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005442
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005443 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005444 for key, issue in [x.split() for x in output.splitlines()]:
5445 if issue == target_issue:
5446 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5447
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005448 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005449 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005450 return 1
5451 if len(branches) == 1:
5452 RunGit(['checkout', branches[0]])
5453 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005454 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005455 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005456 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005457 which = raw_input('Choose by index: ')
5458 try:
5459 RunGit(['checkout', branches[int(which)]])
5460 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005461 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005462 return 1
5463
5464 return 0
5465
5466
maruel@chromium.org29404b52014-09-08 22:58:00 +00005467def CMDlol(parser, args):
5468 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005469 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005470 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5471 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5472 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005473 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005474 return 0
5475
5476
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005477class OptionParser(optparse.OptionParser):
5478 """Creates the option parse and add --verbose support."""
5479 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005480 optparse.OptionParser.__init__(
5481 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005482 self.add_option(
5483 '-v', '--verbose', action='count', default=0,
5484 help='Use 2 times for more debugging info')
5485
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005486 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005487 try:
5488 return self._parse_args(args)
5489 finally:
5490 # Regardless of success or failure of args parsing, we want to report
5491 # metrics, but only after logging has been initialized (if parsing
5492 # succeeded).
5493 global settings
5494 settings = Settings()
5495
5496 if not metrics.DISABLE_METRICS_COLLECTION:
5497 # GetViewVCUrl ultimately calls logging method.
5498 project_url = settings.GetViewVCUrl().strip('/+')
5499 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5500 metrics.collector.add('project_urls', [project_url])
5501
5502 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005503 # Create an optparse.Values object that will store only the actual passed
5504 # options, without the defaults.
5505 actual_options = optparse.Values()
5506 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5507 # Create an optparse.Values object with the default options.
5508 options = optparse.Values(self.get_default_values().__dict__)
5509 # Update it with the options passed by the user.
5510 options._update_careful(actual_options.__dict__)
5511 # Store the options passed by the user in an _actual_options attribute.
5512 # We store only the keys, and not the values, since the values can contain
5513 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005514 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005515
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005516 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005517 logging.basicConfig(
5518 level=levels[min(options.verbose, len(levels) - 1)],
5519 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5520 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005521
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005522 return options, args
5523
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005524
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005525def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005526 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005527 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005528 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005529 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005530
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005531 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005532 dispatcher = subcommand.CommandDispatcher(__name__)
5533 try:
5534 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005535 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005536 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005537 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005538 if e.code != 500:
5539 raise
5540 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005541 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005542 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005543 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005544
5545
5546if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005547 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5548 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005549 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005550 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005551 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005552 sys.exit(main(sys.argv[1:]))