blob: 84f6d54d103baa3a8bebb7f38b7334197db58625 [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
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001387 def GetDescription(self, pretty=False, force=False):
1388 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001389 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001390 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001391 self.has_description = True
1392 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001393 # Set width to 72 columns + 2 space indent.
1394 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001395 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001396 lines = self.description.splitlines()
1397 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001398 return self.description
1399
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001400 def GetDescriptionFooters(self):
1401 """Returns (non_footer_lines, footers) for the commit message.
1402
1403 Returns:
1404 non_footer_lines (list(str)) - Simple list of description lines without
1405 any footer. The lines do not contain newlines, nor does the list contain
1406 the empty line between the message and the footers.
1407 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1408 [("Change-Id", "Ideadbeef...."), ...]
1409 """
1410 raw_description = self.GetDescription()
1411 msg_lines, _, footers = git_footers.split_footers(raw_description)
1412 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001413 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001414 return msg_lines, footers
1415
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001416 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001417 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001418 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001419 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001420 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001421 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001422 return self.patchset
1423
1424 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001425 """Set this branch's patchset. If patchset=0, clears the patchset."""
1426 assert self.GetBranch()
1427 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001428 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001429 else:
1430 self.patchset = int(patchset)
1431 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001432 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001433
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001434 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001435 """Set this branch's issue. If issue isn't given, clears the issue."""
1436 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001437 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001438 issue = int(issue)
1439 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001440 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001441 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001442 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001443 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001444 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001445 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001446 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001447 else:
tandrii5d48c322016-08-18 16:19:37 -07001448 # Reset all of these just to be clean.
1449 reset_suffixes = [
1450 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001451 self.IssueConfigKey(),
1452 self.PatchsetConfigKey(),
1453 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001454 ] + self._PostUnsetIssueProperties()
1455 for prop in reset_suffixes:
1456 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001457 msg = RunGit(['log', '-1', '--format=%B']).strip()
1458 if msg and git_footers.get_footer_change_id(msg):
1459 print('WARNING: The change patched into this branch has a Change-Id. '
1460 'Removing it.')
1461 RunGit(['commit', '--amend', '-m',
1462 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001463 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001464 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001465 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001466
dnjba1b0f32016-09-02 12:37:42 -07001467 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001468 if not self.GitSanityChecks(upstream_branch):
1469 DieWithError('\nGit sanity check failure')
1470
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001471 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001472 if not root:
1473 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001474 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001475
1476 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001477 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001478 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001479 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +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()
dnjba1b0f32016-09-02 12:37:42 -07001492 if issue and not local_description:
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.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001498 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1499 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001500
1501 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001502 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001503 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001504 name,
1505 description,
1506 absroot,
1507 files,
1508 issue,
1509 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001510 author,
1511 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001512
dsansomee2d6fd92016-09-08 00:10:47 -07001513 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001514 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001515 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001516 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001517
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001518 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1519 """Sets the description for this CL remotely.
1520
1521 You can get description_lines and footers with GetDescriptionFooters.
1522
1523 Args:
1524 description_lines (list(str)) - List of CL description lines without
1525 newline characters.
1526 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1527 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1528 `List-Of-Tokens`). It will be case-normalized so that each token is
1529 title-cased.
1530 """
1531 new_description = '\n'.join(description_lines)
1532 if footers:
1533 new_description += '\n'
1534 for k, v in footers:
1535 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1536 if not git_footers.FOOTER_PATTERN.match(foot):
1537 raise ValueError('Invalid footer %r' % foot)
1538 new_description += foot + '\n'
1539 self.UpdateDescription(new_description, force)
1540
Edward Lesmes8e282792018-04-03 18:50:29 -04001541 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001542 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1543 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001544 start = time_time()
1545 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001546 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1547 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001548 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001549 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001550 metrics.collector.add_repeated('sub_commands', {
1551 'command': 'presubmit',
1552 'execution_time': time_time() - start,
1553 'exit_code': 0 if result.should_continue() else 1,
1554 })
1555 return result
vapierfd77ac72016-06-16 08:33:57 -07001556 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001557 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001558
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001559 def CMDUpload(self, options, git_diff_args, orig_args):
1560 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001561 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001562 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001563 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001564 else:
1565 if self.GetBranch() is None:
1566 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1567
1568 # Default to diffing against common ancestor of upstream branch
1569 base_branch = self.GetCommonAncestorWithUpstream()
1570 git_diff_args = [base_branch, 'HEAD']
1571
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001572 # Fast best-effort checks to abort before running potentially expensive
1573 # hooks if uploading is likely to fail anyway. Passing these checks does
1574 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001575 self.EnsureAuthenticated(force=options.force)
1576 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001577
1578 # Apply watchlists on upload.
1579 change = self.GetChange(base_branch, None)
1580 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1581 files = [f.LocalPath() for f in change.AffectedFiles()]
1582 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001583 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001584
1585 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001586 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587 # Set the reviewer list now so that presubmit checks can access it.
1588 change_description = ChangeDescription(change.FullDescriptionText())
1589 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001590 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001591 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001592 change)
1593 change.SetDescriptionText(change_description.description)
1594 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001595 may_prompt=not options.force,
1596 verbose=options.verbose,
1597 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001598 if not hook_results.should_continue():
1599 return 1
1600 if not options.reviewers and hook_results.reviewers:
1601 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001602 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001603
Aaron Gable13101a62018-02-09 13:20:41 -08001604 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001605 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001606 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001607 _git_set_branch_config_value('last-upload-hash',
1608 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001609 # Run post upload hooks, if specified.
1610 if settings.GetRunPostUploadHook():
1611 presubmit_support.DoPostUploadExecuter(
1612 change,
1613 self,
1614 settings.GetRoot(),
1615 options.verbose,
1616 sys.stdout)
1617
1618 # Upload all dependencies if specified.
1619 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001620 print()
1621 print('--dependencies has been specified.')
1622 print('All dependent local branches will be re-uploaded.')
1623 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001624 # Remove the dependencies flag from args so that we do not end up in a
1625 # loop.
1626 orig_args.remove('--dependencies')
1627 ret = upload_branch_deps(self, orig_args)
1628 return ret
1629
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001630 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001631 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001632
1633 Issue must have been already uploaded and known.
1634 """
1635 assert new_state in _CQState.ALL_STATES
1636 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001637 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001638 vote_map = {
1639 _CQState.NONE: 0,
1640 _CQState.DRY_RUN: 1,
1641 _CQState.COMMIT: 2,
1642 }
1643 labels = {'Commit-Queue': vote_map[new_state]}
1644 notify = False if new_state == _CQState.DRY_RUN else None
1645 gerrit_util.SetReview(
1646 self._GetGerritHost(), self._GerritChangeIdentifier(),
1647 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001648 return 0
1649 except KeyboardInterrupt:
1650 raise
1651 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001652 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001653 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001654 ' * Your project has no CQ,\n'
1655 ' * You don\'t have permission to change the CQ state,\n'
1656 ' * There\'s a bug in this code (see stack trace below).\n'
1657 'Consider specifying which bots to trigger manually or asking your '
1658 'project owners for permissions or contacting Chrome Infra at:\n'
1659 'https://www.chromium.org/infra\n\n' %
1660 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001661 # Still raise exception so that stack trace is printed.
1662 raise
1663
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001664 def _GetGerritHost(self):
1665 # Lazy load of configs.
1666 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001667 if self._gerrit_host and '.' not in self._gerrit_host:
1668 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1669 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001670 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001671 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001672 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001673 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001674 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1675 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001676 return self._gerrit_host
1677
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001678 def _GetGitHost(self):
1679 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001680 remote_url = self.GetRemoteUrl()
1681 if not remote_url:
1682 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001683 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001684
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001685 def GetCodereviewServer(self):
1686 if not self._gerrit_server:
1687 # If we're on a branch then get the server potentially associated
1688 # with that branch.
1689 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001690 self._gerrit_server = self._GitGetBranchConfigValue(
1691 self.CodereviewServerConfigKey())
1692 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001693 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001694 if not self._gerrit_server:
1695 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1696 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001697 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001698 parts[0] = parts[0] + '-review'
1699 self._gerrit_host = '.'.join(parts)
1700 self._gerrit_server = 'https://%s' % self._gerrit_host
1701 return self._gerrit_server
1702
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001703 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001704 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001705 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001706 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001707 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001708 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001709 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001710 if project.endswith('.git'):
1711 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001712 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1713 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1714 # gitiles/git-over-https protocol. E.g.,
1715 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1716 # as
1717 # https://chromium.googlesource.com/v8/v8
1718 if project.startswith('a/'):
1719 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001720 return project
1721
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001722 def _GerritChangeIdentifier(self):
1723 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1724
1725 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001726 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001727 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001728 project = self._GetGerritProject()
1729 if project:
1730 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1731 # Fall back on still unique, but less efficient change number.
1732 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001733
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001734 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001735 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001736 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001737
tandrii5d48c322016-08-18 16:19:37 -07001738 @classmethod
1739 def PatchsetConfigKey(cls):
1740 return 'gerritpatchset'
1741
1742 @classmethod
1743 def CodereviewServerConfigKey(cls):
1744 return 'gerritserver'
1745
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001746 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001747 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001748 if settings.GetGerritSkipEnsureAuthenticated():
1749 # For projects with unusual authentication schemes.
1750 # See http://crbug.com/603378.
1751 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001752
1753 # Check presence of cookies only if using cookies-based auth method.
1754 cookie_auth = gerrit_util.Authenticator.get()
1755 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001756 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001757
Florian Mayerae510e82020-01-30 21:04:48 +00001758 remote_url = self.GetRemoteUrl()
1759 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001760 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001761 return
1762 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001763 logging.warning('Ignoring branch %(branch)s with non-https remote '
1764 '%(remote)s', {
1765 'branch': self.branch,
1766 'remote': self.GetRemoteUrl()
1767 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001768 return
1769
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001770 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001771 self.GetCodereviewServer()
1772 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001773 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001774
1775 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1776 git_auth = cookie_auth.get_auth_header(git_host)
1777 if gerrit_auth and git_auth:
1778 if gerrit_auth == git_auth:
1779 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001780 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001781 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001782 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001783 ' %s\n'
1784 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001785 ' Consider running the following command:\n'
1786 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001787 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001788 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001789 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001790 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001791 cookie_auth.get_new_password_message(git_host)))
1792 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001793 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001794 return
1795 else:
1796 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001797 ([] if gerrit_auth else [self._gerrit_host]) +
1798 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001799 DieWithError('Credentials for the following hosts are required:\n'
1800 ' %s\n'
1801 'These are read from %s (or legacy %s)\n'
1802 '%s' % (
1803 '\n '.join(missing),
1804 cookie_auth.get_gitcookies_path(),
1805 cookie_auth.get_netrc_path(),
1806 cookie_auth.get_new_password_message(git_host)))
1807
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001808 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001809 if not self.GetIssue():
1810 return
1811
1812 # Warm change details cache now to avoid RPCs later, reducing latency for
1813 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001814 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001815 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001816
1817 status = self._GetChangeDetail()['status']
1818 if status in ('MERGED', 'ABANDONED'):
1819 DieWithError('Change %s has been %s, new uploads are not allowed' %
1820 (self.GetIssueURL(),
1821 'submitted' if status == 'MERGED' else 'abandoned'))
1822
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001823 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1824 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1825 # Apparently this check is not very important? Otherwise get_auth_email
1826 # could have been added to other implementations of Authenticator.
1827 cookies_auth = gerrit_util.Authenticator.get()
1828 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001829 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001830
1831 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001832 if self.GetIssueOwner() == cookies_user:
1833 return
1834 logging.debug('change %s owner is %s, cookies user is %s',
1835 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001836 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001837 # so ask what Gerrit thinks of this user.
1838 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1839 if details['email'] == self.GetIssueOwner():
1840 return
1841 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001842 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001843 'as %s.\n'
1844 'Uploading may fail due to lack of permissions.' %
1845 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1846 confirm_or_exit(action='upload')
1847
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001848 def _PostUnsetIssueProperties(self):
1849 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001850 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001851
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001852 def GetGerritObjForPresubmit(self):
1853 return presubmit_support.GerritAccessor(self._GetGerritHost())
1854
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001855 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001856 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001857 or CQ status, assuming adherence to a common workflow.
1858
1859 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001860 * 'error' - error from review tool (including deleted issues)
1861 * 'unsent' - no reviewers added
1862 * 'waiting' - waiting for review
1863 * 'reply' - waiting for uploader to reply to review
1864 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001865 * 'dry-run' - dry-running in the CQ
1866 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001867 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001868 """
1869 if not self.GetIssue():
1870 return None
1871
1872 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001873 data = self._GetChangeDetail([
1874 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001875 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001876 return 'error'
1877
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001878 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001879 return 'closed'
1880
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001881 cq_label = data['labels'].get('Commit-Queue', {})
1882 max_cq_vote = 0
1883 for vote in cq_label.get('all', []):
1884 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1885 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001886 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001887 if max_cq_vote == 1:
1888 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001889
Aaron Gable9ab38c62017-04-06 14:36:33 -07001890 if data['labels'].get('Code-Review', {}).get('approved'):
1891 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001892
1893 if not data.get('reviewers', {}).get('REVIEWER', []):
1894 return 'unsent'
1895
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001896 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001897 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001898 last_message_author = messages.pop().get('author', {})
1899 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001900 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1901 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001902 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001903 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001904 if last_message_author.get('_account_id') == owner:
1905 # Most recent message was by owner.
1906 return 'waiting'
1907 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001908 # Some reply from non-owner.
1909 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001910
1911 # Somehow there are no messages even though there are reviewers.
1912 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001913
1914 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001915 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001916 patchset = data['revisions'][data['current_revision']]['_number']
1917 self.SetPatchset(patchset)
1918 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001919
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001920 def FetchDescription(self, force=False):
1921 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1922 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001923 current_rev = data['current_revision']
Edward Lemur79d4f992019-11-11 23:49:02 +00001924 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001925
dsansomee2d6fd92016-09-08 00:10:47 -07001926 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001927 if gerrit_util.HasPendingChangeEdit(
1928 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001929 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001930 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001931 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001932 'unpublished edit. Either publish the edit in the Gerrit web UI '
1933 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001934
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001935 gerrit_util.DeletePendingChangeEdit(
1936 self._GetGerritHost(), self._GerritChangeIdentifier())
1937 gerrit_util.SetCommitMessage(
1938 self._GetGerritHost(), self._GerritChangeIdentifier(),
1939 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001940
Aaron Gable636b13f2017-07-14 10:42:48 -07001941 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001942 gerrit_util.SetReview(
1943 self._GetGerritHost(), self._GerritChangeIdentifier(),
1944 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001945
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001946 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001947 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001948 # CURRENT_REVISION is included to get the latest patchset so that
1949 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001950 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001951 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1952 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001953 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001954 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001955 robot_file_comments = gerrit_util.GetChangeRobotComments(
1956 self._GetGerritHost(), self._GerritChangeIdentifier())
1957
1958 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001959 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001960 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001961 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001962 line_comments = file_comments.setdefault(path, [])
1963 line_comments.extend(
1964 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001965
1966 # Build dictionary of file comments for easy access and sorting later.
1967 # {author+date: {path: {patchset: {line: url+message}}}}
1968 comments = collections.defaultdict(
1969 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001970 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001971 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001972 tag = comment.get('tag', '')
1973 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001974 continue
1975 key = (comment['author']['email'], comment['updated'])
1976 if comment.get('side', 'REVISION') == 'PARENT':
1977 patchset = 'Base'
1978 else:
1979 patchset = 'PS%d' % comment['patch_set']
1980 line = comment.get('line', 0)
1981 url = ('https://%s/c/%s/%s/%s#%s%s' %
1982 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1983 'b' if comment.get('side') == 'PARENT' else '',
1984 str(line) if line else ''))
1985 comments[key][path][patchset][line] = (url, comment['message'])
1986
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001987 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001988 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001989 summary = self._BuildCommentSummary(msg, comments, readable)
1990 if summary:
1991 summaries.append(summary)
1992 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001993
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001994 @staticmethod
1995 def _BuildCommentSummary(msg, comments, readable):
1996 key = (msg['author']['email'], msg['date'])
1997 # Don't bother showing autogenerated messages that don't have associated
1998 # file or line comments. this will filter out most autogenerated
1999 # messages, but will keep robot comments like those from Tricium.
2000 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2001 if is_autogenerated and not comments.get(key):
2002 return None
2003 message = msg['message']
2004 # Gerrit spits out nanoseconds.
2005 assert len(msg['date'].split('.')[-1]) == 9
2006 date = datetime.datetime.strptime(msg['date'][:-3],
2007 '%Y-%m-%d %H:%M:%S.%f')
2008 if key in comments:
2009 message += '\n'
2010 for path, patchsets in sorted(comments.get(key, {}).items()):
2011 if readable:
2012 message += '\n%s' % path
2013 for patchset, lines in sorted(patchsets.items()):
2014 for line, (url, content) in sorted(lines.items()):
2015 if line:
2016 line_str = 'Line %d' % line
2017 path_str = '%s:%d:' % (path, line)
2018 else:
2019 line_str = 'File comment'
2020 path_str = '%s:0:' % path
2021 if readable:
2022 message += '\n %s, %s: %s' % (patchset, line_str, url)
2023 message += '\n %s\n' % content
2024 else:
2025 message += '\n%s ' % path_str
2026 message += '\n%s\n' % content
2027
2028 return _CommentSummary(
2029 date=date,
2030 message=message,
2031 sender=msg['author']['email'],
2032 autogenerated=is_autogenerated,
2033 # These could be inferred from the text messages and correlated with
2034 # Code-Review label maximum, however this is not reliable.
2035 # Leaving as is until the need arises.
2036 approval=False,
2037 disapproval=False,
2038 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002039
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002040 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002041 gerrit_util.AbandonChange(
2042 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002043
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002044 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002045 gerrit_util.SubmitChange(
2046 self._GetGerritHost(), self._GerritChangeIdentifier(),
2047 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002048
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002049 def _GetChangeDetail(self, options=None, no_cache=False):
2050 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002051
2052 If fresh data is needed, set no_cache=True which will clear cache and
2053 thus new data will be fetched from Gerrit.
2054 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002055 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002056 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002057
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002058 # Optimization to avoid multiple RPCs:
2059 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2060 'CURRENT_COMMIT' not in options):
2061 options.append('CURRENT_COMMIT')
2062
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002063 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002064 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002065 options = [o.upper() for o in options]
2066
2067 # Check in cache first unless no_cache is True.
2068 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002069 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002070 else:
2071 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002072 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002073 # Assumption: data fetched before with extra options is suitable
2074 # for return for a smaller set of options.
2075 # For example, if we cached data for
2076 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2077 # and request is for options=[CURRENT_REVISION],
2078 # THEN we can return prior cached data.
2079 if options_set.issubset(cached_options_set):
2080 return data
2081
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002082 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002083 data = gerrit_util.GetChangeDetail(
2084 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002085 except gerrit_util.GerritError as e:
2086 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002087 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002088 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002089
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002090 self._detail_cache.setdefault(cache_key, []).append(
2091 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002092 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002093
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002094 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002095 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002096 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002097 data = gerrit_util.GetChangeCommit(
2098 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002099 except gerrit_util.GerritError as e:
2100 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002101 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002102 raise
agable32978d92016-11-01 12:55:02 -07002103 return data
2104
Karen Qian40c19422019-03-13 21:28:29 +00002105 def _IsCqConfigured(self):
2106 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002107 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002108
Olivier Robin75ee7252018-04-13 10:02:56 +02002109 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002110 if git_common.is_dirty_git_tree('land'):
2111 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002112
tandriid60367b2016-06-22 05:25:12 -07002113 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002114 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002115 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002116 'which can test and land changes for you. '
2117 'Are you sure you wish to bypass it?\n',
2118 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002119 differs = True
tandriic4344b52016-08-29 06:04:54 -07002120 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002121 # Note: git diff outputs nothing if there is no diff.
2122 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002123 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002124 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002125 if detail['current_revision'] == last_upload:
2126 differs = False
2127 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002128 print('WARNING: Local branch contents differ from latest uploaded '
2129 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002130 if differs:
2131 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002132 confirm_or_exit(
2133 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2134 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002135 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002136 elif not bypass_hooks:
2137 hook_results = self.RunHook(
2138 committing=True,
2139 may_prompt=not force,
2140 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002141 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2142 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002143 if not hook_results.should_continue():
2144 return 1
2145
2146 self.SubmitIssue(wait_for_merge=True)
2147 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002148 links = self._GetChangeCommit().get('web_links', [])
2149 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002150 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002151 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002152 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002153 return 0
2154
Edward Lemurf38bc172019-09-03 21:02:13 +00002155 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002156 assert parsed_issue_arg.valid
2157
Edward Lemur125d60a2019-09-13 18:25:41 +00002158 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002159
2160 if parsed_issue_arg.hostname:
2161 self._gerrit_host = parsed_issue_arg.hostname
2162 self._gerrit_server = 'https://%s' % self._gerrit_host
2163
tandriic2405f52016-10-10 08:13:15 -07002164 try:
2165 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002166 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002167 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002168
2169 if not parsed_issue_arg.patchset:
2170 # Use current revision by default.
2171 revision_info = detail['revisions'][detail['current_revision']]
2172 patchset = int(revision_info['_number'])
2173 else:
2174 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002175 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2177 break
2178 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002179 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002180 (parsed_issue_arg.patchset, self.GetIssue()))
2181
Edward Lemur125d60a2019-09-13 18:25:41 +00002182 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002183 if remote_url.endswith('.git'):
2184 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002185 remote_url = remote_url.rstrip('/')
2186
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002187 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002188 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002189
2190 if remote_url != fetch_info['url']:
2191 DieWithError('Trying to patch a change from %s but this repo appears '
2192 'to be %s.' % (fetch_info['url'], remote_url))
2193
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002194 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002195
Aaron Gable62619a32017-06-16 08:22:09 -07002196 if force:
2197 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2198 print('Checked out commit for change %i patchset %i locally' %
2199 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002200 elif nocommit:
2201 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2202 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002203 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002204 RunGit(['cherry-pick', 'FETCH_HEAD'])
2205 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002206 (parsed_issue_arg.issue, patchset))
2207 print('Note: this created a local commit which does not have '
2208 'the same hash as the one uploaded for review. This will make '
2209 'uploading changes based on top of this branch difficult.\n'
2210 'If you want to do that, use "git cl patch --force" instead.')
2211
Stefan Zagerd08043c2017-10-12 12:07:02 -07002212 if self.GetBranch():
2213 self.SetIssue(parsed_issue_arg.issue)
2214 self.SetPatchset(patchset)
2215 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2216 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2217 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2218 else:
2219 print('WARNING: You are in detached HEAD state.\n'
2220 'The patch has been applied to your checkout, but you will not be '
2221 'able to upload a new patch set to the gerrit issue.\n'
2222 'Try using the \'-b\' option if you would like to work on a '
2223 'branch and/or upload a new patch set.')
2224
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002225 return 0
2226
tandrii16e0b4e2016-06-07 10:34:28 -07002227 def _GerritCommitMsgHookCheck(self, offer_removal):
2228 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2229 if not os.path.exists(hook):
2230 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002231 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2232 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002233 data = gclient_utils.FileRead(hook)
2234 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2235 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002236 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002237 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002238 'and may interfere with it in subtle ways.\n'
2239 'We recommend you remove the commit-msg hook.')
2240 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002241 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002242 gclient_utils.rm_file_or_tree(hook)
2243 print('Gerrit commit-msg hook removed.')
2244 else:
2245 print('OK, will keep Gerrit commit-msg hook in place.')
2246
Edward Lemur1b52d872019-05-09 21:12:12 +00002247 def _CleanUpOldTraces(self):
2248 """Keep only the last |MAX_TRACES| traces."""
2249 try:
2250 traces = sorted([
2251 os.path.join(TRACES_DIR, f)
2252 for f in os.listdir(TRACES_DIR)
2253 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2254 and not f.startswith('tmp'))
2255 ])
2256 traces_to_delete = traces[:-MAX_TRACES]
2257 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002258 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002259 except OSError:
2260 print('WARNING: Failed to remove old git traces from\n'
2261 ' %s'
2262 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002263
Edward Lemur5737f022019-05-17 01:24:00 +00002264 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002265 """Zip and write the git push traces stored in traces_dir."""
2266 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002267 traces_zip = trace_name + '-traces'
2268 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002269 # Create a temporary dir to store git config and gitcookies in. It will be
2270 # compressed and stored next to the traces.
2271 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002272 git_info_zip = trace_name + '-git-info'
2273
Edward Lemur5737f022019-05-17 01:24:00 +00002274 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002275 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002276 git_push_metadata['now'] = git_push_metadata['now'].decode(
2277 sys.stdin.encoding)
2278
Edward Lemur1b52d872019-05-09 21:12:12 +00002279 git_push_metadata['trace_name'] = trace_name
2280 gclient_utils.FileWrite(
2281 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2282
2283 # Keep only the first 6 characters of the git hashes on the packet
2284 # trace. This greatly decreases size after compression.
2285 packet_traces = os.path.join(traces_dir, 'trace-packet')
2286 if os.path.isfile(packet_traces):
2287 contents = gclient_utils.FileRead(packet_traces)
2288 gclient_utils.FileWrite(
2289 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2290 shutil.make_archive(traces_zip, 'zip', traces_dir)
2291
2292 # Collect and compress the git config and gitcookies.
2293 git_config = RunGit(['config', '-l'])
2294 gclient_utils.FileWrite(
2295 os.path.join(git_info_dir, 'git-config'),
2296 git_config)
2297
2298 cookie_auth = gerrit_util.Authenticator.get()
2299 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2300 gitcookies_path = cookie_auth.get_gitcookies_path()
2301 if os.path.isfile(gitcookies_path):
2302 gitcookies = gclient_utils.FileRead(gitcookies_path)
2303 gclient_utils.FileWrite(
2304 os.path.join(git_info_dir, 'gitcookies'),
2305 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2306 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2307
Edward Lemur1b52d872019-05-09 21:12:12 +00002308 gclient_utils.rmtree(git_info_dir)
2309
2310 def _RunGitPushWithTraces(
2311 self, change_desc, refspec, refspec_opts, git_push_metadata):
2312 """Run git push and collect the traces resulting from the execution."""
2313 # Create a temporary directory to store traces in. Traces will be compressed
2314 # and stored in a 'traces' dir inside depot_tools.
2315 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002316 trace_name = os.path.join(
2317 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002318
2319 env = os.environ.copy()
2320 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2321 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002322 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002323 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2324 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2325 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2326
2327 try:
2328 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002329 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002330 before_push = time_time()
2331 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002332 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002333 env=env,
2334 print_stdout=True,
2335 # Flush after every line: useful for seeing progress when running as
2336 # recipe.
2337 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002338 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002339 except subprocess2.CalledProcessError as e:
2340 push_returncode = e.returncode
2341 DieWithError('Failed to create a change. Please examine output above '
2342 'for the reason of the failure.\n'
2343 'Hint: run command below to diagnose common Git/Gerrit '
2344 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002345 ' git cl creds-check\n'
2346 '\n'
2347 'If git-cl is not working correctly, file a bug under the '
2348 'Infra>SDK component including the files below.\n'
2349 'Review the files before upload, since they might contain '
2350 'sensitive information.\n'
2351 'Set the Restrict-View-Google label so that they are not '
2352 'publicly accessible.\n'
2353 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002354 change_desc)
2355 finally:
2356 execution_time = time_time() - before_push
2357 metrics.collector.add_repeated('sub_commands', {
2358 'command': 'git push',
2359 'execution_time': execution_time,
2360 'exit_code': push_returncode,
2361 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2362 })
2363
Edward Lemur1b52d872019-05-09 21:12:12 +00002364 git_push_metadata['execution_time'] = execution_time
2365 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002366 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002367
Edward Lemur1b52d872019-05-09 21:12:12 +00002368 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002369 gclient_utils.rmtree(traces_dir)
2370
2371 return push_stdout
2372
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002373 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002374 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002375 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002376 # Load default for user, repo, squash=true, in this order.
2377 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002378
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002380 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002381 # This may be None; default fallback value is determined in logic below.
2382 title = options.title
2383
Dominic Battre7d1c4842017-10-27 09:17:28 +02002384 # Extract bug number from branch name.
2385 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002386 fixed = options.fixed
2387 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2388 self.GetBranch())
2389 if not bug and not fixed and match:
2390 if match.group('type') == 'bug':
2391 bug = match.group('bugnum')
2392 else:
2393 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002394
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002395 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002396 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002397 if self.GetIssue():
2398 # Try to get the message from a previous upload.
2399 message = self.GetDescription()
2400 if not message:
2401 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002402 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002404 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002405 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002406 # When uploading a subsequent patchset, -m|--message is taken
2407 # as the patchset title if --title was not provided.
2408 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002409 else:
2410 default_title = RunGit(
2411 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002412 if options.force:
2413 title = default_title
2414 else:
2415 title = ask_for_data(
2416 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002417
2418 # User requested to change description
2419 if options.edit_description:
2420 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2421 change_desc.prompt()
2422 message = change_desc.description
2423
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002424 change_id = self._GetChangeDetail()['change_id']
2425 while True:
2426 footer_change_ids = git_footers.get_footer_change_id(message)
2427 if footer_change_ids == [change_id]:
2428 break
2429 if not footer_change_ids:
2430 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002431 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002432 continue
2433 # There is already a valid footer but with different or several ids.
2434 # Doing this automatically is non-trivial as we don't want to lose
2435 # existing other footers, yet we want to append just 1 desired
2436 # Change-Id. Thus, just create a new footer, but let user verify the
2437 # new description.
2438 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002439 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002440 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002441 print(
2442 'WARNING: change %s has Change-Id footer(s):\n'
2443 ' %s\n'
2444 'but change has Change-Id %s, according to Gerrit.\n'
2445 'Please, check the proposed correction to the description, '
2446 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2447 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2448 change_id))
2449 confirm_or_exit(action='edit')
2450 change_desc.prompt()
2451
2452 message = change_desc.description
2453 if not message:
2454 DieWithError("Description is empty. Aborting...")
2455
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002456 # Continue the while loop.
2457 # Sanity check of this code - we should end up with proper message
2458 # footer.
2459 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002460 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002461 else: # if not self.GetIssue()
2462 if options.message:
2463 message = options.message
2464 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002465 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002466 if options.title:
2467 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002468 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002469 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002470 change_desc.prompt()
2471
Aaron Gableb56ad332017-01-06 15:24:31 -08002472 # On first upload, patchset title is always this string, while
2473 # --title flag gets converted to first line of message.
2474 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002475 if not change_desc.description:
2476 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002477 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002478 if len(change_ids) > 1:
2479 DieWithError('too many Change-Id footers, at most 1 allowed.')
2480 if not change_ids:
2481 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002482 change_desc.set_description(git_footers.add_footer_change_id(
2483 change_desc.description,
2484 GenerateGerritChangeId(change_desc.description)))
2485 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002486 assert len(change_ids) == 1
2487 change_id = change_ids[0]
2488
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002489 if options.reviewers or options.tbrs or options.add_owners_to:
2490 change_desc.update_reviewers(options.reviewers, options.tbrs,
2491 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002492 if options.preserve_tryjobs:
2493 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002494
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002495 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002496 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2497 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002498 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lesmesf6a22322019-11-04 22:14:39 +00002499 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
Edward Lemur79d4f992019-11-11 23:49:02 +00002500 desc_tempfile.write(change_desc.description.encode('utf-8', 'replace'))
Aaron Gable9a03ae02017-11-03 11:31:07 -07002501 desc_tempfile.close()
2502 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2503 '-F', desc_tempfile.name]).strip()
2504 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002505 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002506 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002507 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002508 if not change_desc.description:
2509 DieWithError("Description is empty. Aborting...")
2510
2511 if not git_footers.get_footer_change_id(change_desc.description):
2512 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002513 change_desc.set_description(
2514 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002515 if options.reviewers or options.tbrs or options.add_owners_to:
2516 change_desc.update_reviewers(options.reviewers, options.tbrs,
2517 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002518 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002519 # For no-squash mode, we assume the remote called "origin" is the one we
2520 # want. It is not worthwhile to support different workflows for
2521 # no-squash mode.
2522 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002523 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2524
2525 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002526 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002527 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2528 ref_to_push)]).splitlines()
2529 if len(commits) > 1:
2530 print('WARNING: This will upload %d commits. Run the following command '
2531 'to see which commits will be uploaded: ' % len(commits))
2532 print('git log %s..%s' % (parent, ref_to_push))
2533 print('You can also use `git squash-branch` to squash these into a '
2534 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002535 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002536
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002537 if options.reviewers or options.tbrs or options.add_owners_to:
2538 change_desc.update_reviewers(options.reviewers, options.tbrs,
2539 options.add_owners_to, change)
2540
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002541 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002542 cc = []
2543 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2544 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2545 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002546 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002547 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002548 if options.cc:
2549 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002550 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002551 if change_desc.get_cced():
2552 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002553 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2554 valid_accounts = set(reviewers + cc)
2555 # TODO(crbug/877717): relax this for all hosts.
2556 else:
2557 valid_accounts = gerrit_util.ValidAccounts(
2558 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002559 logging.info('accounts %s are recognized, %s invalid',
2560 sorted(valid_accounts),
2561 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002562
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002563 # Extra options that can be specified at push time. Doc:
2564 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002565 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002566
Aaron Gable844cf292017-06-28 11:32:59 -07002567 # By default, new changes are started in WIP mode, and subsequent patchsets
2568 # don't send email. At any time, passing --send-mail will mark the change
2569 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002570 if options.send_mail:
2571 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002572 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002573 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002574 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002575 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002576 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002577
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002578 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002579 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002580
Aaron Gable9b713dd2016-12-14 16:04:21 -08002581 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002582 # Punctuation and whitespace in |title| must be percent-encoded.
2583 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002584
agablec6787972016-09-09 16:13:34 -07002585 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002586 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002587
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002588 for r in sorted(reviewers):
2589 if r in valid_accounts:
2590 refspec_opts.append('r=%s' % r)
2591 reviewers.remove(r)
2592 else:
2593 # TODO(tandrii): this should probably be a hard failure.
2594 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2595 % r)
2596 for c in sorted(cc):
2597 # refspec option will be rejected if cc doesn't correspond to an
2598 # account, even though REST call to add such arbitrary cc may succeed.
2599 if c in valid_accounts:
2600 refspec_opts.append('cc=%s' % c)
2601 cc.remove(c)
2602
rmistry9eadede2016-09-19 11:22:43 -07002603 if options.topic:
2604 # Documentation on Gerrit topics is here:
2605 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002606 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002607
Edward Lemur687ca902018-12-05 02:30:30 +00002608 if options.enable_auto_submit:
2609 refspec_opts.append('l=Auto-Submit+1')
2610 if options.use_commit_queue:
2611 refspec_opts.append('l=Commit-Queue+2')
2612 elif options.cq_dry_run:
2613 refspec_opts.append('l=Commit-Queue+1')
2614
2615 if change_desc.get_reviewers(tbr_only=True):
2616 score = gerrit_util.GetCodeReviewTbrScore(
2617 self._GetGerritHost(),
2618 self._GetGerritProject())
2619 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002620
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002621 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002622 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002623 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002624 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002625 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2626
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002627 refspec_suffix = ''
2628 if refspec_opts:
2629 refspec_suffix = '%' + ','.join(refspec_opts)
2630 assert ' ' not in refspec_suffix, (
2631 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2632 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2633
Edward Lemur1b52d872019-05-09 21:12:12 +00002634 git_push_metadata = {
2635 'gerrit_host': self._GetGerritHost(),
2636 'title': title or '<untitled>',
2637 'change_id': change_id,
2638 'description': change_desc.description,
2639 }
2640 push_stdout = self._RunGitPushWithTraces(
2641 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002642
2643 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002644 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002645 change_numbers = [m.group(1)
2646 for m in map(regex.match, push_stdout.splitlines())
2647 if m]
2648 if len(change_numbers) != 1:
2649 DieWithError(
2650 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002651 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002652 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002653 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002654
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002655 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002656 # GetIssue() is not set in case of non-squash uploads according to tests.
2657 # TODO(agable): non-squash uploads in git cl should be removed.
2658 gerrit_util.AddReviewers(
2659 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002660 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002661 reviewers, cc,
2662 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002663
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002664 return 0
2665
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002666 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2667 change_desc):
2668 """Computes parent of the generated commit to be uploaded to Gerrit.
2669
2670 Returns revision or a ref name.
2671 """
2672 if custom_cl_base:
2673 # Try to avoid creating additional unintended CLs when uploading, unless
2674 # user wants to take this risk.
2675 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2676 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2677 local_ref_of_target_remote])
2678 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002679 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002680 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2681 'If you proceed with upload, more than 1 CL may be created by '
2682 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2683 'If you are certain that specified base `%s` has already been '
2684 'uploaded to Gerrit as another CL, you may proceed.\n' %
2685 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2686 if not force:
2687 confirm_or_exit(
2688 'Do you take responsibility for cleaning up potential mess '
2689 'resulting from proceeding with upload?',
2690 action='upload')
2691 return custom_cl_base
2692
Aaron Gablef97e33d2017-03-30 15:44:27 -07002693 if remote != '.':
2694 return self.GetCommonAncestorWithUpstream()
2695
2696 # If our upstream branch is local, we base our squashed commit on its
2697 # squashed version.
2698 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2699
Aaron Gablef97e33d2017-03-30 15:44:27 -07002700 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002701 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002702
2703 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002704 # TODO(tandrii): consider checking parent change in Gerrit and using its
2705 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2706 # the tree hash of the parent branch. The upside is less likely bogus
2707 # requests to reupload parent change just because it's uploadhash is
2708 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002709 parent = RunGit(['config',
2710 'branch.%s.gerritsquashhash' % upstream_branch_name],
2711 error_ok=True).strip()
2712 # Verify that the upstream branch has been uploaded too, otherwise
2713 # Gerrit will create additional CLs when uploading.
2714 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2715 RunGitSilent(['rev-parse', parent + ':'])):
2716 DieWithError(
2717 '\nUpload upstream branch %s first.\n'
2718 'It is likely that this branch has been rebased since its last '
2719 'upload, so you just need to upload it again.\n'
2720 '(If you uploaded it with --no-squash, then branch dependencies '
2721 'are not supported, and you should reupload with --squash.)'
2722 % upstream_branch_name,
2723 change_desc)
2724 return parent
2725
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002726 def _AddChangeIdToCommitMessage(self, options, args):
2727 """Re-commits using the current message, assumes the commit hook is in
2728 place.
2729 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002730 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002731 git_command = ['commit', '--amend', '-m', log_desc]
2732 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002733 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002734 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002735 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002736 return new_log_desc
2737 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002738 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002739
tandriie113dfd2016-10-11 10:20:12 -07002740 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002741 try:
2742 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002743 except GerritChangeNotExists:
2744 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002745
2746 if data['status'] in ('ABANDONED', 'MERGED'):
2747 return 'CL %s is closed' % self.GetIssue()
2748
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002749 def GetGerritChange(self, patchset=None):
2750 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002751 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002752 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002753 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002754 data = self._GetChangeDetail(['ALL_REVISIONS'])
2755
2756 assert host and issue and patchset, 'CL must be uploaded first'
2757
2758 has_patchset = any(
2759 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002760 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002761 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002762 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002763 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002764
tandrii8c5a3532016-11-04 07:52:02 -07002765 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002766 'host': host,
2767 'change': issue,
2768 'project': data['project'],
2769 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002770 }
tandriie113dfd2016-10-11 10:20:12 -07002771
tandriide281ae2016-10-12 06:02:30 -07002772 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002773 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002774
Edward Lemur707d70b2018-02-07 00:50:14 +01002775 def GetReviewers(self):
2776 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002777 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002778
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002779
2780_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002781 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002782}
2783
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002784
iannuccie53c9352016-08-17 14:40:40 -07002785def _add_codereview_issue_select_options(parser, extra=""):
2786 _add_codereview_select_options(parser)
2787
2788 text = ('Operate on this issue number instead of the current branch\'s '
2789 'implicit issue.')
2790 if extra:
2791 text += ' '+extra
2792 parser.add_option('-i', '--issue', type=int, help=text)
2793
2794
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002795def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002796 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002797 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002798 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002799 parser.add_option_group(parser.codereview_group)
2800 parser.codereview_group.add_option(
2801 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002802 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002803
2804
tandriif9aefb72016-07-01 09:06:51 -07002805def _get_bug_line_values(default_project, bugs):
2806 """Given default_project and comma separated list of bugs, yields bug line
2807 values.
2808
2809 Each bug can be either:
2810 * a number, which is combined with default_project
2811 * string, which is left as is.
2812
2813 This function may produce more than one line, because bugdroid expects one
2814 project per line.
2815
2816 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2817 ['v8:123', 'chromium:789']
2818 """
2819 default_bugs = []
2820 others = []
2821 for bug in bugs.split(','):
2822 bug = bug.strip()
2823 if bug:
2824 try:
2825 default_bugs.append(int(bug))
2826 except ValueError:
2827 others.append(bug)
2828
2829 if default_bugs:
2830 default_bugs = ','.join(map(str, default_bugs))
2831 if default_project:
2832 yield '%s:%s' % (default_project, default_bugs)
2833 else:
2834 yield default_bugs
2835 for other in sorted(others):
2836 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2837 yield other
2838
2839
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002840class ChangeDescription(object):
2841 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002842 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002843 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002844 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002845 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002846 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002847 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2848 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002849 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002850 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002851
Dan Beamd8b04ca2019-10-10 21:23:26 +00002852 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002853 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002854 if bug:
2855 regexp = re.compile(self.BUG_LINE)
2856 prefix = settings.GetBugPrefix()
2857 if not any((regexp.match(line) for line in self._description_lines)):
2858 values = list(_get_bug_line_values(prefix, bug))
2859 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002860 if fixed:
2861 regexp = re.compile(self.FIXED_LINE)
2862 prefix = settings.GetBugPrefix()
2863 if not any((regexp.match(line) for line in self._description_lines)):
2864 values = list(_get_bug_line_values(prefix, fixed))
2865 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002866
agable@chromium.org42c20792013-09-12 17:34:49 +00002867 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002868 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002869 return '\n'.join(self._description_lines)
2870
2871 def set_description(self, desc):
2872 if isinstance(desc, basestring):
2873 lines = desc.splitlines()
2874 else:
2875 lines = [line.rstrip() for line in desc]
2876 while lines and not lines[0]:
2877 lines.pop(0)
2878 while lines and not lines[-1]:
2879 lines.pop(-1)
2880 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002881
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002882 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2883 """Rewrites the R=/TBR= line(s) as a single line each.
2884
2885 Args:
2886 reviewers (list(str)) - list of additional emails to use for reviewers.
2887 tbrs (list(str)) - list of additional emails to use for TBRs.
2888 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2889 the change that are missing OWNER coverage. If this is not None, you
2890 must also pass a value for `change`.
2891 change (Change) - The Change that should be used for OWNERS lookups.
2892 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002893 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002894 assert isinstance(tbrs, list), tbrs
2895
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002896 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002897 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002898
2899 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002900 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002901
2902 reviewers = set(reviewers)
2903 tbrs = set(tbrs)
2904 LOOKUP = {
2905 'TBR': tbrs,
2906 'R': reviewers,
2907 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002908
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002909 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002910 regexp = re.compile(self.R_LINE)
2911 matches = [regexp.match(line) for line in self._description_lines]
2912 new_desc = [l for i, l in enumerate(self._description_lines)
2913 if not matches[i]]
2914 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002915
agable@chromium.org42c20792013-09-12 17:34:49 +00002916 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002917
2918 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002919 for match in matches:
2920 if not match:
2921 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002922 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2923
2924 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002925 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002926 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002927 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002928 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002929 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002930 LOOKUP[add_owners_to].update(
2931 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002932
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002933 # If any folks ended up in both groups, remove them from tbrs.
2934 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002935
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002936 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2937 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002938
2939 # Put the new lines in the description where the old first R= line was.
2940 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2941 if 0 <= line_loc < len(self._description_lines):
2942 if new_tbr_line:
2943 self._description_lines.insert(line_loc, new_tbr_line)
2944 if new_r_line:
2945 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002946 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002947 if new_r_line:
2948 self.append_footer(new_r_line)
2949 if new_tbr_line:
2950 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002951
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002952 def set_preserve_tryjobs(self):
2953 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2954 footers = git_footers.parse_footers(self.description)
2955 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2956 if v.lower() == 'true':
2957 return
2958 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2959
Anthony Polito8b955342019-09-24 19:01:36 +00002960 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002961 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002962 self.set_description([
2963 '# Enter a description of the change.',
2964 '# This will be displayed on the codereview site.',
2965 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002966 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002967 '--------------------',
2968 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002969 bug_regexp = re.compile(self.BUG_LINE)
2970 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002971 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002972 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2973 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002974 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002975
agable@chromium.org42c20792013-09-12 17:34:49 +00002976 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002977 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002978 if not content:
2979 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002980 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002981
Bruce Dawson2377b012018-01-11 16:46:49 -08002982 # Strip off comments and default inserted "Bug:" line.
2983 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002984 (line.startswith('#') or
2985 line.rstrip() == "Bug:" or
2986 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002987 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002988 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002989 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002990
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002991 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002992 """Adds a footer line to the description.
2993
2994 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2995 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2996 that Gerrit footers are always at the end.
2997 """
2998 parsed_footer_line = git_footers.parse_footer(line)
2999 if parsed_footer_line:
3000 # Line is a gerrit footer in the form: Footer-Key: any value.
3001 # Thus, must be appended observing Gerrit footer rules.
3002 self.set_description(
3003 git_footers.add_footer(self.description,
3004 key=parsed_footer_line[0],
3005 value=parsed_footer_line[1]))
3006 return
3007
3008 if not self._description_lines:
3009 self._description_lines.append(line)
3010 return
3011
3012 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3013 if gerrit_footers:
3014 # git_footers.split_footers ensures that there is an empty line before
3015 # actual (gerrit) footers, if any. We have to keep it that way.
3016 assert top_lines and top_lines[-1] == ''
3017 top_lines, separator = top_lines[:-1], top_lines[-1:]
3018 else:
3019 separator = [] # No need for separator if there are no gerrit_footers.
3020
3021 prev_line = top_lines[-1] if top_lines else ''
3022 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3023 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3024 top_lines.append('')
3025 top_lines.append(line)
3026 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003027
tandrii99a72f22016-08-17 14:33:24 -07003028 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003029 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003030 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003031 reviewers = [match.group(2).strip()
3032 for match in matches
3033 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003034 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003035
bradnelsond975b302016-10-23 12:20:23 -07003036 def get_cced(self):
3037 """Retrieves the list of reviewers."""
3038 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3039 cced = [match.group(2).strip() for match in matches if match]
3040 return cleanup_list(cced)
3041
Nodir Turakulov23b82142017-11-16 11:04:25 -08003042 def get_hash_tags(self):
3043 """Extracts and sanitizes a list of Gerrit hashtags."""
3044 subject = (self._description_lines or ('',))[0]
3045 subject = re.sub(
3046 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3047
3048 tags = []
3049 start = 0
3050 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3051 while True:
3052 m = bracket_exp.match(subject, start)
3053 if not m:
3054 break
3055 tags.append(self.sanitize_hash_tag(m.group(1)))
3056 start = m.end()
3057
3058 if not tags:
3059 # Try "Tag: " prefix.
3060 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3061 if m:
3062 tags.append(self.sanitize_hash_tag(m.group(1)))
3063 return tags
3064
3065 @classmethod
3066 def sanitize_hash_tag(cls, tag):
3067 """Returns a sanitized Gerrit hash tag.
3068
3069 A sanitized hashtag can be used as a git push refspec parameter value.
3070 """
3071 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3072
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003073 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3074 """Updates this commit description given the parent.
3075
3076 This is essentially what Gnumbd used to do.
3077 Consult https://goo.gl/WMmpDe for more details.
3078 """
3079 assert parent_msg # No, orphan branch creation isn't supported.
3080 assert parent_hash
3081 assert dest_ref
3082 parent_footer_map = git_footers.parse_footers(parent_msg)
3083 # This will also happily parse svn-position, which GnumbD is no longer
3084 # supporting. While we'd generate correct footers, the verifier plugin
3085 # installed in Gerrit will block such commit (ie git push below will fail).
3086 parent_position = git_footers.get_position(parent_footer_map)
3087
3088 # Cherry-picks may have last line obscuring their prior footers,
3089 # from git_footers perspective. This is also what Gnumbd did.
3090 cp_line = None
3091 if (self._description_lines and
3092 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3093 cp_line = self._description_lines.pop()
3094
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003095 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003096
3097 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3098 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003099 for i, line in enumerate(footer_lines):
3100 k, v = git_footers.parse_footer(line) or (None, None)
3101 if k and k.startswith('Cr-'):
3102 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003103
3104 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003105 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003106 if parent_position[0] == dest_ref:
3107 # Same branch as parent.
3108 number = int(parent_position[1]) + 1
3109 else:
3110 number = 1 # New branch, and extra lineage.
3111 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3112 int(parent_position[1])))
3113
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003114 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3115 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003116
3117 self._description_lines = top_lines
3118 if cp_line:
3119 self._description_lines.append(cp_line)
3120 if self._description_lines[-1] != '':
3121 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003122 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003123
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003124
Aaron Gablea1bab272017-04-11 16:38:18 -07003125def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003126 """Retrieves the reviewers that approved a CL from the issue properties with
3127 messages.
3128
3129 Note that the list may contain reviewers that are not committer, thus are not
3130 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003131
3132 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003133 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003134 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003135 return sorted(
3136 set(
3137 message['sender']
3138 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003139 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003140 )
3141 )
3142
3143
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003144def FindCodereviewSettingsFile(filename='codereview.settings'):
3145 """Finds the given file starting in the cwd and going up.
3146
3147 Only looks up to the top of the repository unless an
3148 'inherit-review-settings-ok' file exists in the root of the repository.
3149 """
3150 inherit_ok_file = 'inherit-review-settings-ok'
3151 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003152 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003153 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3154 root = '/'
3155 while True:
3156 if filename in os.listdir(cwd):
3157 if os.path.isfile(os.path.join(cwd, filename)):
3158 return open(os.path.join(cwd, filename))
3159 if cwd == root:
3160 break
3161 cwd = os.path.dirname(cwd)
3162
3163
3164def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003165 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003166 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003167
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003168 def SetProperty(name, setting, unset_error_ok=False):
3169 fullname = 'rietveld.' + name
3170 if setting in keyvals:
3171 RunGit(['config', fullname, keyvals[setting]])
3172 else:
3173 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3174
tandrii48df5812016-10-17 03:55:37 -07003175 if not keyvals.get('GERRIT_HOST', False):
3176 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003177 # Only server setting is required. Other settings can be absent.
3178 # In that case, we ignore errors raised during option deletion attempt.
3179 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3180 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3181 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003182 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003183 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3184 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003185 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3186 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003187 SetProperty(
3188 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003189
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003190 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003191 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003192
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003193 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003194 RunGit(['config', 'gerrit.squash-uploads',
3195 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003196
tandrii@chromium.org28253532016-04-14 13:46:56 +00003197 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003198 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003199 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3200
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003201 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003202 # should be of the form
3203 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3204 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003205 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3206 keyvals['ORIGIN_URL_CONFIG']])
3207
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003208
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003209def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003210 """Downloads a network object to a local file, like urllib.urlretrieve.
3211
3212 This is necessary because urllib is broken for SSL connections via a proxy.
3213 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003214 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003215 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003216
3217
ukai@chromium.org712d6102013-11-27 00:52:58 +00003218def hasSheBang(fname):
3219 """Checks fname is a #! script."""
3220 with open(fname) as f:
3221 return f.read(2).startswith('#!')
3222
3223
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003224# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3225def DownloadHooks(*args, **kwargs):
3226 pass
3227
3228
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003229def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003230 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003231
3232 Args:
3233 force: True to update hooks. False to install hooks if not present.
3234 """
3235 if not settings.GetIsGerrit():
3236 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003237 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003238 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3239 if not os.access(dst, os.X_OK):
3240 if os.path.exists(dst):
3241 if not force:
3242 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003243 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003244 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003245 if not hasSheBang(dst):
3246 DieWithError('Not a script: %s\n'
3247 'You need to download from\n%s\n'
3248 'into .git/hooks/commit-msg and '
3249 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003250 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3251 except Exception:
3252 if os.path.exists(dst):
3253 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003254 DieWithError('\nFailed to download hooks.\n'
3255 'You need to download from\n%s\n'
3256 'into .git/hooks/commit-msg and '
3257 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003258
3259
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003260class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003261 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003262
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003263 _GOOGLESOURCE = 'googlesource.com'
3264
3265 def __init__(self):
3266 # Cached list of [host, identity, source], where source is either
3267 # .gitcookies or .netrc.
3268 self._all_hosts = None
3269
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003270 def ensure_configured_gitcookies(self):
3271 """Runs checks and suggests fixes to make git use .gitcookies from default
3272 path."""
3273 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3274 configured_path = RunGitSilent(
3275 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003276 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003277 if configured_path:
3278 self._ensure_default_gitcookies_path(configured_path, default)
3279 else:
3280 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003281
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003282 @staticmethod
3283 def _ensure_default_gitcookies_path(configured_path, default_path):
3284 assert configured_path
3285 if configured_path == default_path:
3286 print('git is already configured to use your .gitcookies from %s' %
3287 configured_path)
3288 return
3289
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003290 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003291 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3292 (configured_path, default_path))
3293
3294 if not os.path.exists(configured_path):
3295 print('However, your configured .gitcookies file is missing.')
3296 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3297 action='reconfigure')
3298 RunGit(['config', '--global', 'http.cookiefile', default_path])
3299 return
3300
3301 if os.path.exists(default_path):
3302 print('WARNING: default .gitcookies file already exists %s' %
3303 default_path)
3304 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3305 default_path)
3306
3307 confirm_or_exit('Move existing .gitcookies to default location?',
3308 action='move')
3309 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003310 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003311 print('Moved and reconfigured git to use .gitcookies from %s' %
3312 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003313
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003314 @staticmethod
3315 def _configure_gitcookies_path(default_path):
3316 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3317 if os.path.exists(netrc_path):
3318 print('You seem to be using outdated .netrc for git credentials: %s' %
3319 netrc_path)
3320 print('This tool will guide you through setting up recommended '
3321 '.gitcookies store for git credentials.\n'
3322 '\n'
3323 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3324 ' git config --global --unset http.cookiefile\n'
3325 ' mv %s %s.backup\n\n' % (default_path, default_path))
3326 confirm_or_exit(action='setup .gitcookies')
3327 RunGit(['config', '--global', 'http.cookiefile', default_path])
3328 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003329
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003330 def get_hosts_with_creds(self, include_netrc=False):
3331 if self._all_hosts is None:
3332 a = gerrit_util.CookiesAuthenticator()
3333 self._all_hosts = [
3334 (h, u, s)
3335 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003336 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3337 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003338 )
3339 if h.endswith(self._GOOGLESOURCE)
3340 ]
3341
3342 if include_netrc:
3343 return self._all_hosts
3344 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3345
3346 def print_current_creds(self, include_netrc=False):
3347 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3348 if not hosts:
3349 print('No Git/Gerrit credentials found')
3350 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003351 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003352 header = [('Host', 'User', 'Which file'),
3353 ['=' * l for l in lengths]]
3354 for row in (header + hosts):
3355 print('\t'.join((('%%+%ds' % l) % s)
3356 for l, s in zip(lengths, row)))
3357
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003358 @staticmethod
3359 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003360 """Parses identity "git-<username>.domain" into <username> and domain."""
3361 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003362 # distinguishable from sub-domains. But we do know typical domains:
3363 if identity.endswith('.chromium.org'):
3364 domain = 'chromium.org'
3365 username = identity[:-len('.chromium.org')]
3366 else:
3367 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003368 if username.startswith('git-'):
3369 username = username[len('git-'):]
3370 return username, domain
3371
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003372 def _canonical_git_googlesource_host(self, host):
3373 """Normalizes Gerrit hosts (with '-review') to Git host."""
3374 assert host.endswith(self._GOOGLESOURCE)
3375 # Prefix doesn't include '.' at the end.
3376 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3377 if prefix.endswith('-review'):
3378 prefix = prefix[:-len('-review')]
3379 return prefix + '.' + self._GOOGLESOURCE
3380
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003381 def _canonical_gerrit_googlesource_host(self, host):
3382 git_host = self._canonical_git_googlesource_host(host)
3383 prefix = git_host.split('.', 1)[0]
3384 return prefix + '-review.' + self._GOOGLESOURCE
3385
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003386 def _get_counterpart_host(self, host):
3387 assert host.endswith(self._GOOGLESOURCE)
3388 git = self._canonical_git_googlesource_host(host)
3389 gerrit = self._canonical_gerrit_googlesource_host(git)
3390 return git if gerrit == host else gerrit
3391
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003392 def has_generic_host(self):
3393 """Returns whether generic .googlesource.com has been configured.
3394
3395 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3396 """
3397 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3398 if host == '.' + self._GOOGLESOURCE:
3399 return True
3400 return False
3401
3402 def _get_git_gerrit_identity_pairs(self):
3403 """Returns map from canonic host to pair of identities (Git, Gerrit).
3404
3405 One of identities might be None, meaning not configured.
3406 """
3407 host_to_identity_pairs = {}
3408 for host, identity, _ in self.get_hosts_with_creds():
3409 canonical = self._canonical_git_googlesource_host(host)
3410 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3411 idx = 0 if canonical == host else 1
3412 pair[idx] = identity
3413 return host_to_identity_pairs
3414
3415 def get_partially_configured_hosts(self):
3416 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003417 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003418 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003419 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003420
3421 def get_conflicting_hosts(self):
3422 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003423 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003424 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003425 if None not in (i1, i2) and i1 != i2)
3426
3427 def get_duplicated_hosts(self):
3428 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003429 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003430
3431 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3432 'chromium.googlesource.com': 'chromium.org',
3433 'chrome-internal.googlesource.com': 'google.com',
3434 }
3435
3436 def get_hosts_with_wrong_identities(self):
3437 """Finds hosts which **likely** reference wrong identities.
3438
3439 Note: skips hosts which have conflicting identities for Git and Gerrit.
3440 """
3441 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003442 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003443 pair = self._get_git_gerrit_identity_pairs().get(host)
3444 if pair and pair[0] == pair[1]:
3445 _, domain = self._parse_identity(pair[0])
3446 if domain != expected:
3447 hosts.add(host)
3448 return hosts
3449
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003450 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003451 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003452 hosts = sorted(hosts)
3453 assert hosts
3454 if extra_column_func is None:
3455 extras = [''] * len(hosts)
3456 else:
3457 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003458 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3459 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003460 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003461 lines.append(tmpl % he)
3462 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003463
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003464 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003465 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003466 yield ('.googlesource.com wildcard record detected',
3467 ['Chrome Infrastructure team recommends to list full host names '
3468 'explicitly.'],
3469 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003470
3471 dups = self.get_duplicated_hosts()
3472 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003473 yield ('The following hosts were defined twice',
3474 self._format_hosts(dups),
3475 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003476
3477 partial = self.get_partially_configured_hosts()
3478 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003479 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3480 'These hosts are missing',
3481 self._format_hosts(partial, lambda host: 'but %s defined' %
3482 self._get_counterpart_host(host)),
3483 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003484
3485 conflicting = self.get_conflicting_hosts()
3486 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003487 yield ('The following Git hosts have differing credentials from their '
3488 'Gerrit counterparts',
3489 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3490 tuple(self._get_git_gerrit_identity_pairs()[host])),
3491 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003492
3493 wrong = self.get_hosts_with_wrong_identities()
3494 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003495 yield ('These hosts likely use wrong identity',
3496 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3497 (self._get_git_gerrit_identity_pairs()[host][0],
3498 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3499 wrong)
3500
3501 def find_and_report_problems(self):
3502 """Returns True if there was at least one problem, else False."""
3503 found = False
3504 bad_hosts = set()
3505 for title, sublines, hosts in self._find_problems():
3506 if not found:
3507 found = True
3508 print('\n\n.gitcookies problem report:\n')
3509 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003510 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003511 if sublines:
3512 print()
3513 print(' %s' % '\n '.join(sublines))
3514 print()
3515
3516 if bad_hosts:
3517 assert found
3518 print(' You can manually remove corresponding lines in your %s file and '
3519 'visit the following URLs with correct account to generate '
3520 'correct credential lines:\n' %
3521 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3522 print(' %s' % '\n '.join(sorted(set(
3523 gerrit_util.CookiesAuthenticator().get_new_password_url(
3524 self._canonical_git_googlesource_host(host))
3525 for host in bad_hosts
3526 ))))
3527 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003528
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003529
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003530@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003531def CMDcreds_check(parser, args):
3532 """Checks credentials and suggests changes."""
3533 _, _ = parser.parse_args(args)
3534
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003535 # Code below checks .gitcookies. Abort if using something else.
3536 authn = gerrit_util.Authenticator.get()
3537 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3538 if isinstance(authn, gerrit_util.GceAuthenticator):
3539 DieWithError(
3540 'This command is not designed for GCE, are you on a bot?\n'
3541 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3542 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003543 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003544 'This command is not designed for bot environment. It checks '
3545 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003546
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003547 checker = _GitCookiesChecker()
3548 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003549
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003550 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003551 checker.print_current_creds(include_netrc=True)
3552
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003553 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003554 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003555 return 0
3556 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003557
3558
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003559@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003560def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003561 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003562 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3563 branch = ShortBranchName(branchref)
3564 _, args = parser.parse_args(args)
3565 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003566 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003567 return RunGit(['config', 'branch.%s.base-url' % branch],
3568 error_ok=False).strip()
3569 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003570 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003571 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3572 error_ok=False).strip()
3573
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003574
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003575def color_for_status(status):
3576 """Maps a Changelist status to color, for CMDstatus and other tools."""
3577 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003578 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003579 'waiting': Fore.BLUE,
3580 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003581 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003582 'lgtm': Fore.GREEN,
3583 'commit': Fore.MAGENTA,
3584 'closed': Fore.CYAN,
3585 'error': Fore.WHITE,
3586 }.get(status, Fore.WHITE)
3587
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003588
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003589def get_cl_statuses(changes, fine_grained, max_processes=None):
3590 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003591
3592 If fine_grained is true, this will fetch CL statuses from the server.
3593 Otherwise, simply indicate if there's a matching url for the given branches.
3594
3595 If max_processes is specified, it is used as the maximum number of processes
3596 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3597 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003598
3599 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003600 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003601 if not changes:
3602 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003603
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003604 if not fine_grained:
3605 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003606 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003607 for cl in changes:
3608 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003609 return
3610
3611 # First, sort out authentication issues.
3612 logging.debug('ensuring credentials exist')
3613 for cl in changes:
3614 cl.EnsureAuthenticated(force=False, refresh=True)
3615
3616 def fetch(cl):
3617 try:
3618 return (cl, cl.GetStatus())
3619 except:
3620 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003621 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003622 raise
3623
3624 threads_count = len(changes)
3625 if max_processes:
3626 threads_count = max(1, min(threads_count, max_processes))
3627 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3628
3629 pool = ThreadPool(threads_count)
3630 fetched_cls = set()
3631 try:
3632 it = pool.imap_unordered(fetch, changes).__iter__()
3633 while True:
3634 try:
3635 cl, status = it.next(timeout=5)
3636 except multiprocessing.TimeoutError:
3637 break
3638 fetched_cls.add(cl)
3639 yield cl, status
3640 finally:
3641 pool.close()
3642
3643 # Add any branches that failed to fetch.
3644 for cl in set(changes) - fetched_cls:
3645 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003646
rmistry@google.com2dd99862015-06-22 12:22:18 +00003647
3648def upload_branch_deps(cl, args):
3649 """Uploads CLs of local branches that are dependents of the current branch.
3650
3651 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003652
3653 test1 -> test2.1 -> test3.1
3654 -> test3.2
3655 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003656
3657 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3658 run on the dependent branches in this order:
3659 test2.1, test3.1, test3.2, test2.2, test3.3
3660
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003661 Note: This function does not rebase your local dependent branches. Use it
3662 when you make a change to the parent branch that will not conflict
3663 with its dependent branches, and you would like their dependencies
3664 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003665 """
3666 if git_common.is_dirty_git_tree('upload-branch-deps'):
3667 return 1
3668
3669 root_branch = cl.GetBranch()
3670 if root_branch is None:
3671 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3672 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003673 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003674 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3675 'patchset dependencies without an uploaded CL.')
3676
3677 branches = RunGit(['for-each-ref',
3678 '--format=%(refname:short) %(upstream:short)',
3679 'refs/heads'])
3680 if not branches:
3681 print('No local branches found.')
3682 return 0
3683
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003684 # Create a dictionary of all local branches to the branches that are
3685 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003686 tracked_to_dependents = collections.defaultdict(list)
3687 for b in branches.splitlines():
3688 tokens = b.split()
3689 if len(tokens) == 2:
3690 branch_name, tracked = tokens
3691 tracked_to_dependents[tracked].append(branch_name)
3692
vapiera7fbd5a2016-06-16 09:17:49 -07003693 print()
3694 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003695 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003696
rmistry@google.com2dd99862015-06-22 12:22:18 +00003697 def traverse_dependents_preorder(branch, padding=''):
3698 dependents_to_process = tracked_to_dependents.get(branch, [])
3699 padding += ' '
3700 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003701 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003702 dependents.append(dependent)
3703 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003704
rmistry@google.com2dd99862015-06-22 12:22:18 +00003705 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003706 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003707
3708 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003709 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003710 return 0
3711
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003712 confirm_or_exit('This command will checkout all dependent branches and run '
3713 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003714
rmistry@google.com2dd99862015-06-22 12:22:18 +00003715 # Record all dependents that failed to upload.
3716 failures = {}
3717 # Go through all dependents, checkout the branch and upload.
3718 try:
3719 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003720 print()
3721 print('--------------------------------------')
3722 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003723 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003724 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003725 try:
3726 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003727 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003728 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003729 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003730 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003731 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003732 finally:
3733 # Swap back to the original root branch.
3734 RunGit(['checkout', '-q', root_branch])
3735
vapiera7fbd5a2016-06-16 09:17:49 -07003736 print()
3737 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003738 for dependent_branch in dependents:
3739 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003740 print(' %s : %s' % (dependent_branch, upload_status))
3741 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003742
3743 return 0
3744
3745
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003746def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3747 """Given a proposed tag name, returns a tag name that is guaranteed to be
3748 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3749 or 'foo-3', and so on."""
3750
3751 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3752 for suffix_num in itertools.count(1):
3753 if suffix_num == 1:
3754 to_check = proposed_tag
3755 else:
3756 to_check = '%s-%d' % (proposed_tag, suffix_num)
3757
3758 if to_check not in existing_tags:
3759 return to_check
3760
3761
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003762@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003763def CMDarchive(parser, args):
3764 """Archives and deletes branches associated with closed changelists."""
3765 parser.add_option(
3766 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003767 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003768 parser.add_option(
3769 '-f', '--force', action='store_true',
3770 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003771 parser.add_option(
3772 '-d', '--dry-run', action='store_true',
3773 help='Skip the branch tagging and removal steps.')
3774 parser.add_option(
3775 '-t', '--notags', action='store_true',
3776 help='Do not tag archived branches. '
3777 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003778
kmarshall3bff56b2016-06-06 18:31:47 -07003779 options, args = parser.parse_args(args)
3780 if args:
3781 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003782
3783 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3784 if not branches:
3785 return 0
3786
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003787 tags = RunGit(['for-each-ref', '--format=%(refname)',
3788 'refs/tags']).splitlines() or []
3789 tags = [t.split('/')[-1] for t in tags]
3790
vapiera7fbd5a2016-06-16 09:17:49 -07003791 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003792 changes = [Changelist(branchref=b)
3793 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003794 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3795 statuses = get_cl_statuses(changes,
3796 fine_grained=True,
3797 max_processes=options.maxjobs)
3798 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003799 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3800 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003801 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003802 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003803 proposal.sort()
3804
3805 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003806 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003807 return 0
3808
3809 current_branch = GetCurrentBranch()
3810
vapiera7fbd5a2016-06-16 09:17:49 -07003811 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003812 if options.notags:
3813 for next_item in proposal:
3814 print(' ' + next_item[0])
3815 else:
3816 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3817 for next_item in proposal:
3818 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003819
kmarshall9249e012016-08-23 12:02:16 -07003820 # Quit now on precondition failure or if instructed by the user, either
3821 # via an interactive prompt or by command line flags.
3822 if options.dry_run:
3823 print('\nNo changes were made (dry run).\n')
3824 return 0
3825 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003826 print('You are currently on a branch \'%s\' which is associated with a '
3827 'closed codereview issue, so archive cannot proceed. Please '
3828 'checkout another branch and run this command again.' %
3829 current_branch)
3830 return 1
kmarshall9249e012016-08-23 12:02:16 -07003831 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003832 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3833 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003834 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003835 return 1
3836
3837 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003838 if not options.notags:
3839 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003840
3841 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3842 # Clean up the tag if we failed to delete the branch.
3843 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003844
vapiera7fbd5a2016-06-16 09:17:49 -07003845 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003846
3847 return 0
3848
3849
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003850@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003851def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003852 """Show status of changelists.
3853
3854 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003855 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003856 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003857 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003858 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003859 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003860 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003861 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003862
3863 Also see 'git cl comments'.
3864 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003865 parser.add_option(
3866 '--no-branch-color',
3867 action='store_true',
3868 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003869 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003870 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003871 parser.add_option('-f', '--fast', action='store_true',
3872 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003873 parser.add_option(
3874 '-j', '--maxjobs', action='store', type=int,
3875 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003876
iannuccie53c9352016-08-17 14:40:40 -07003877 _add_codereview_issue_select_options(
3878 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003879 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003880 if args:
3881 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003882
iannuccie53c9352016-08-17 14:40:40 -07003883 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003884 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003885
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003886 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003887 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003888 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003890 elif options.field == 'id':
3891 issueid = cl.GetIssue()
3892 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003893 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003894 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003895 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003896 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003897 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003898 elif options.field == 'status':
3899 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003900 elif options.field == 'url':
3901 url = cl.GetIssueURL()
3902 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003903 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003904 return 0
3905
3906 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3907 if not branches:
3908 print('No local branch found.')
3909 return 0
3910
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003911 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003912 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003913 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003914 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003915 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003916 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003917 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003918
Daniel McArdlea23bf592019-02-12 00:25:12 +00003919 current_branch = GetCurrentBranch()
3920
3921 def FormatBranchName(branch, colorize=False):
3922 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3923 an asterisk when it is the current branch."""
3924
3925 asterisk = ""
3926 color = Fore.RESET
3927 if branch == current_branch:
3928 asterisk = "* "
3929 color = Fore.GREEN
3930 branch_name = ShortBranchName(branch)
3931
3932 if colorize:
3933 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003934 return asterisk + branch_name
3935
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003936 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003937
3938 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003939 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3940 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003941 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003942 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003943 branch_statuses[c.GetBranch()] = status
3944 status = branch_statuses.pop(branch)
3945 url = cl.GetIssueURL()
3946 if url and (not status or status == 'error'):
3947 # The issue probably doesn't exist anymore.
3948 url += ' (broken)'
3949
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003950 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003951 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003952 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003953 color = ''
3954 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003955 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003956
Alan Cuttera3be9a52019-03-04 18:50:33 +00003957 branch_display = FormatBranchName(branch)
3958 padding = ' ' * (alignment - len(branch_display))
3959 if not options.no_branch_color:
3960 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003961
Alan Cuttera3be9a52019-03-04 18:50:33 +00003962 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3963 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003964
vapiera7fbd5a2016-06-16 09:17:49 -07003965 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003966 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003967 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003968 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003969 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003970 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003971 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003972 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003973 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003974 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003975 print('Issue description:')
3976 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003977 return 0
3978
3979
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003980def colorize_CMDstatus_doc():
3981 """To be called once in main() to add colors to git cl status help."""
3982 colors = [i for i in dir(Fore) if i[0].isupper()]
3983
3984 def colorize_line(line):
3985 for color in colors:
3986 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003987 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003988 indent = len(line) - len(line.lstrip(' ')) + 1
3989 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3990 return line
3991
3992 lines = CMDstatus.__doc__.splitlines()
3993 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3994
3995
phajdan.jre328cf92016-08-22 04:12:17 -07003996def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003997 if path == '-':
3998 json.dump(contents, sys.stdout)
3999 else:
4000 with open(path, 'w') as f:
4001 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004002
4003
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004004@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004005@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004006def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004007 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004008
4009 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004010 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004011 parser.add_option('-r', '--reverse', action='store_true',
4012 help='Lookup the branch(es) for the specified issues. If '
4013 'no issues are specified, all branches with mapped '
4014 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004015 parser.add_option('--json',
4016 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004017 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004018 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004019
dnj@chromium.org406c4402015-03-03 17:22:28 +00004020 if options.reverse:
4021 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004022 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004023 # Reverse issue lookup.
4024 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004025
4026 git_config = {}
4027 for config in RunGit(['config', '--get-regexp',
4028 r'branch\..*issue']).splitlines():
4029 name, _space, val = config.partition(' ')
4030 git_config[name] = val
4031
dnj@chromium.org406c4402015-03-03 17:22:28 +00004032 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004033 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4034 config_key = _git_branch_config_key(ShortBranchName(branch),
4035 cls.IssueConfigKey())
4036 issue = git_config.get(config_key)
4037 if issue:
4038 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004039 if not args:
4040 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004041 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004042 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004043 try:
4044 issue_num = int(issue)
4045 except ValueError:
4046 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004047 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004048 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004050 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004051 if options.json:
4052 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004053 return 0
4054
4055 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004056 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004057 if not issue.valid:
4058 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4059 'or no argument to list it.\n'
4060 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004061 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004062 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004063 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004064 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004065 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4066 if options.json:
4067 write_json(options.json, {
4068 'issue': cl.GetIssue(),
4069 'issue_url': cl.GetIssueURL(),
4070 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004071 return 0
4072
4073
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004074@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004075def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004076 """Shows or posts review comments for any changelist."""
4077 parser.add_option('-a', '--add-comment', dest='comment',
4078 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004079 parser.add_option('-p', '--publish', action='store_true',
4080 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004081 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004082 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004083 parser.add_option('-m', '--machine-readable', dest='readable',
4084 action='store_false', default=True,
4085 help='output comments in a format compatible with '
4086 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004087 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004088 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004089 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004090 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004091
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004092 issue = None
4093 if options.issue:
4094 try:
4095 issue = int(options.issue)
4096 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004097 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004098
Edward Lemur934836a2019-09-09 20:16:54 +00004099 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004100
4101 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004102 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004103 return 0
4104
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004105 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4106 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004107 for comment in summary:
4108 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004109 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004110 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004111 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004112 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004113 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004114 elif comment.autogenerated:
4115 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004116 else:
4117 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004118 print('\n%s%s %s%s\n%s' % (
4119 color,
4120 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4121 comment.sender,
4122 Fore.RESET,
4123 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4124
smut@google.comc85ac942015-09-15 16:34:43 +00004125 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004126 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004127 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004128 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4129 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004130 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004131 return 0
4132
4133
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004134@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004135@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004136def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004137 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004138 parser.add_option('-d', '--display', action='store_true',
4139 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004140 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004141 help='New description to set for this issue (- for stdin, '
4142 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004143 parser.add_option('-f', '--force', action='store_true',
4144 help='Delete any unpublished Gerrit edits for this issue '
4145 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004146
4147 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004148 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004149
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004150 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004151 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004152 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004153 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004154 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004155
Edward Lemur934836a2019-09-09 20:16:54 +00004156 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004157 if target_issue_arg:
4158 kwargs['issue'] = target_issue_arg.issue
4159 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004160
4161 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004162 if not cl.GetIssue():
4163 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004164
Edward Lemur678a6842019-10-03 22:25:05 +00004165 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004166 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004167
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004168 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004169
smut@google.com34fb6b12015-07-13 20:03:26 +00004170 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004171 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004172 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004173
4174 if options.new_description:
4175 text = options.new_description
4176 if text == '-':
4177 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004178 elif text == '+':
4179 base_branch = cl.GetCommonAncestorWithUpstream()
4180 change = cl.GetChange(base_branch, None, local_description=True)
4181 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004182
4183 description.set_description(text)
4184 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004185 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004186 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004187 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004188 return 0
4189
4190
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004191@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004192def CMDlint(parser, args):
4193 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004194 parser.add_option('--filter', action='append', metavar='-x,+y',
4195 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004196 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004197
4198 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004199 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004200 try:
4201 import cpplint
4202 import cpplint_chromium
4203 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004204 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004205 return 1
4206
4207 # Change the current working directory before calling lint so that it
4208 # shows the correct base.
4209 previous_cwd = os.getcwd()
4210 os.chdir(settings.GetRoot())
4211 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004212 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004213 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4214 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004215 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004216 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004217 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004218
4219 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004220 command = args + files
4221 if options.filter:
4222 command = ['--filter=' + ','.join(options.filter)] + command
4223 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004224
4225 white_regex = re.compile(settings.GetLintRegex())
4226 black_regex = re.compile(settings.GetLintIgnoreRegex())
4227 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4228 for filename in filenames:
4229 if white_regex.match(filename):
4230 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004231 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004232 else:
4233 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4234 extra_check_functions)
4235 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004236 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004237 finally:
4238 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004239 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004240 if cpplint._cpplint_state.error_count != 0:
4241 return 1
4242 return 0
4243
4244
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004245@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004246def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004247 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004248 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004249 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004250 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004251 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004252 parser.add_option('--all', action='store_true',
4253 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004254 parser.add_option('--parallel', action='store_true',
4255 help='Run all tests specified by input_api.RunTests in all '
4256 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004257 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004258
sbc@chromium.org71437c02015-04-09 19:29:40 +00004259 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004260 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004261 return 1
4262
Edward Lemur934836a2019-09-09 20:16:54 +00004263 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004264 if args:
4265 base_branch = args[0]
4266 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004267 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004268 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004269
Aaron Gable8076c282017-11-29 14:39:41 -08004270 if options.all:
4271 base_change = cl.GetChange(base_branch, None)
4272 files = [('M', f) for f in base_change.AllFiles()]
4273 change = presubmit_support.GitChange(
4274 base_change.Name(),
4275 base_change.FullDescriptionText(),
4276 base_change.RepositoryRoot(),
4277 files,
4278 base_change.issue,
4279 base_change.patchset,
4280 base_change.author_email,
4281 base_change._upstream)
4282 else:
4283 change = cl.GetChange(base_branch, None)
4284
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004285 cl.RunHook(
4286 committing=not options.upload,
4287 may_prompt=False,
4288 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004289 change=change,
4290 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004291 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004292
4293
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004294def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004295 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004296
4297 Works the same way as
4298 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4299 but can be called on demand on all platforms.
4300
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004301 The basic idea is to generate git hash of a state of the tree, original
4302 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004303 """
4304 lines = []
4305 tree_hash = RunGitSilent(['write-tree'])
4306 lines.append('tree %s' % tree_hash.strip())
4307 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4308 if code == 0:
4309 lines.append('parent %s' % parent.strip())
4310 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4311 lines.append('author %s' % author.strip())
4312 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4313 lines.append('committer %s' % committer.strip())
4314 lines.append('')
4315 # Note: Gerrit's commit-hook actually cleans message of some lines and
4316 # whitespace. This code is not doing this, but it clearly won't decrease
4317 # entropy.
4318 lines.append(message)
4319 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004320 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004321 return 'I%s' % change_hash.strip()
4322
4323
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004324def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004325 """Computes the remote branch ref to use for the CL.
4326
4327 Args:
4328 remote (str): The git remote for the CL.
4329 remote_branch (str): The git remote branch for the CL.
4330 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004331 """
4332 if not (remote and remote_branch):
4333 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004334
wittman@chromium.org455dc922015-01-26 20:15:50 +00004335 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004336 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004337 # refs, which are then translated into the remote full symbolic refs
4338 # below.
4339 if '/' not in target_branch:
4340 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4341 else:
4342 prefix_replacements = (
4343 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4344 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4345 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4346 )
4347 match = None
4348 for regex, replacement in prefix_replacements:
4349 match = re.search(regex, target_branch)
4350 if match:
4351 remote_branch = target_branch.replace(match.group(0), replacement)
4352 break
4353 if not match:
4354 # This is a branch path but not one we recognize; use as-is.
4355 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004356 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4357 # Handle the refs that need to land in different refs.
4358 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004359
wittman@chromium.org455dc922015-01-26 20:15:50 +00004360 # Create the true path to the remote branch.
4361 # Does the following translation:
4362 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4363 # * refs/remotes/origin/master -> refs/heads/master
4364 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4365 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4366 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4367 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4368 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4369 'refs/heads/')
4370 elif remote_branch.startswith('refs/remotes/branch-heads'):
4371 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004372
wittman@chromium.org455dc922015-01-26 20:15:50 +00004373 return remote_branch
4374
4375
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004376def cleanup_list(l):
4377 """Fixes a list so that comma separated items are put as individual items.
4378
4379 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4380 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4381 """
4382 items = sum((i.split(',') for i in l), [])
4383 stripped_items = (i.strip() for i in items)
4384 return sorted(filter(None, stripped_items))
4385
4386
Aaron Gable4db38df2017-11-03 14:59:07 -07004387@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004388@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004389def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004390 """Uploads the current changelist to codereview.
4391
4392 Can skip dependency patchset uploads for a branch by running:
4393 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004394 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004395 git config --unset branch.branch_name.skip-deps-uploads
4396 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004397
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004398 If the name of the checked out branch starts with "bug-" or "fix-" followed
4399 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004400 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004401
4402 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004403 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004404 [git-cl] add support for hashtags
4405 Foo bar: implement foo
4406 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004407 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004408 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4409 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004410 parser.add_option('--bypass-watchlists', action='store_true',
4411 dest='bypass_watchlists',
4412 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004413 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004414 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004415 parser.add_option('--message', '-m', dest='message',
4416 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004417 parser.add_option('-b', '--bug',
4418 help='pre-populate the bug number(s) for this issue. '
4419 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004420 parser.add_option('--message-file', dest='message_file',
4421 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004422 parser.add_option('--title', '-t', dest='title',
4423 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004424 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004425 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004426 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004427 parser.add_option('--tbrs',
4428 action='append', default=[],
4429 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004430 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004431 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004432 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004433 parser.add_option('--hashtag', dest='hashtags',
4434 action='append', default=[],
4435 help=('Gerrit hashtag for new CL; '
4436 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004437 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004438 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004439 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004440 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004441 metavar='TARGET',
4442 help='Apply CL to remote ref TARGET. ' +
4443 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004444 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004445 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004446 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004447 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004448 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004449 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004450 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4451 const='TBR', help='add a set of OWNERS to TBR')
4452 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4453 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004454 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004455 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004456 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004457 'implies --send-mail')
4458 parser.add_option('-d', '--cq-dry-run',
4459 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004460 help='Send the patchset to do a CQ dry run right after '
4461 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004462 parser.add_option('--preserve-tryjobs', action='store_true',
4463 help='instruct the CQ to let tryjobs running even after '
4464 'new patchsets are uploaded instead of canceling '
4465 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004466 parser.add_option('--dependencies', action='store_true',
4467 help='Uploads CLs of all the local branches that depend on '
4468 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004469 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4470 help='Sends your change to the CQ after an approval. Only '
4471 'works on repos that have the Auto-Submit label '
4472 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004473 parser.add_option('--parallel', action='store_true',
4474 help='Run all tests specified by input_api.RunTests in all '
4475 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004476 parser.add_option('--no-autocc', action='store_true',
4477 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004478 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004479 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004480 parser.add_option('-R', '--retry-failed', action='store_true',
4481 help='Retry failed tryjobs from old patchset immediately '
4482 'after uploading new patchset. Cannot be used with '
4483 '--use-commit-queue or --cq-dry-run.')
4484 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4485 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004486 parser.add_option('--fixed', '-x',
4487 help='List of bugs that will be commented on and marked '
4488 'fixed (pre-populates "Fixed:" tag). Same format as '
4489 '-b option / "Bug:" tag. If fixing several issues, '
4490 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004491 parser.add_option('--edit-description', action='store_true', default=False,
4492 help='Modify description before upload. Cannot be used '
4493 'with --force. It is a noop when --no-squash is set '
4494 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004495
rmistry@google.com2dd99862015-06-22 12:22:18 +00004496 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004497 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004498 (options, args) = parser.parse_args(args)
4499
sbc@chromium.org71437c02015-04-09 19:29:40 +00004500 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004501 return 1
4502
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004503 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004504 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004505 options.cc = cleanup_list(options.cc)
4506
Josipe827b0f2020-01-30 00:07:20 +00004507 if options.edit_description and options.force:
4508 parser.error('Only one of --force and --edit-description allowed')
4509
tandriib80458a2016-06-23 12:20:07 -07004510 if options.message_file:
4511 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004512 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004513 options.message = gclient_utils.FileRead(options.message_file)
4514 options.message_file = None
4515
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004516 if ([options.cq_dry_run,
4517 options.use_commit_queue,
4518 options.retry_failed].count(True) > 1):
4519 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4520 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004521
Aaron Gableedbc4132017-09-11 13:22:28 -07004522 if options.use_commit_queue:
4523 options.send_mail = True
4524
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004525 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4526 settings.GetIsGerrit()
4527
Edward Lemur934836a2019-09-09 20:16:54 +00004528 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004529 if options.retry_failed and not cl.GetIssue():
4530 print('No previous patchsets, so --retry-failed has no effect.')
4531 options.retry_failed = False
4532 # cl.GetMostRecentPatchset uses cached information, and can return the last
4533 # patchset before upload. Calling it here makes it clear that it's the
4534 # last patchset before upload. Note that GetMostRecentPatchset will fail
4535 # if no CL has been uploaded yet.
4536 if options.retry_failed:
4537 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004538
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004539 ret = cl.CMDUpload(options, args, orig_args)
4540
4541 if options.retry_failed:
4542 if ret != 0:
4543 print('Upload failed, so --retry-failed has no effect.')
4544 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004545 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004546 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004547 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004548 if len(buckets) == 0:
4549 print('No failed tryjobs, so --retry-failed has no effect.')
4550 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004551 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004552
4553 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004554
4555
Francois Dorayd42c6812017-05-30 15:10:20 -04004556@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004557@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004558def CMDsplit(parser, args):
4559 """Splits a branch into smaller branches and uploads CLs.
4560
4561 Creates a branch and uploads a CL for each group of files modified in the
4562 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004563 comment, '$directory' is replaced with the directory containing the changes
4564 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4565 sending out, and '$num_cls' is replaced with the total number of CLs that
4566 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004567 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004568 parser.add_option('-d', '--description', dest='description_file',
4569 help='A text file containing a CL description in which '
4570 '$directory will be replaced by each CL\'s directory.')
4571 parser.add_option('-c', '--comment', dest='comment_file',
4572 help='A text file containing a CL comment.')
4573 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004574 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004575 help='List the files and reviewers for each CL that would '
4576 'be created, but don\'t create branches or CLs.')
4577 parser.add_option('--cq-dry-run', action='store_true',
4578 help='If set, will do a cq dry run for each uploaded CL. '
4579 'Please be careful when doing this; more than ~10 CLs '
4580 'has the potential to overload our build '
4581 'infrastructure. Try to upload these not during high '
4582 'load times (usually 11-3 Mountain View time). Email '
4583 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004584 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4585 default=True,
4586 help='Sends your change to the CQ after an approval. Only '
4587 'works on repos that have the Auto-Submit label '
4588 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004589 options, _ = parser.parse_args(args)
4590
4591 if not options.description_file:
4592 parser.error('No --description flag specified.')
4593
4594 def WrappedCMDupload(args):
4595 return CMDupload(OptionParser(), args)
4596
4597 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004598 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004599 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004600
4601
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004602@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004603@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004604def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004605 """DEPRECATED: Used to commit the current changelist via git-svn."""
4606 message = ('git-cl no longer supports committing to SVN repositories via '
4607 'git-svn. You probably want to use `git cl land` instead.')
4608 print(message)
4609 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004610
4611
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004612@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004613@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004614def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004615 """Commits the current changelist via git.
4616
4617 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4618 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004619 """
4620 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4621 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004622 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004623 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004624 parser.add_option('--parallel', action='store_true',
4625 help='Run all tests specified by input_api.RunTests in all '
4626 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004627 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004628
Edward Lemur934836a2019-09-09 20:16:54 +00004629 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004630
Robert Iannucci2e73d432018-03-14 01:10:47 -07004631 if not cl.GetIssue():
4632 DieWithError('You must upload the change first to Gerrit.\n'
4633 ' If you would rather have `git cl land` upload '
4634 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004635 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004636 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004637
4638
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004639@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004640@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004641def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004642 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004643 parser.add_option('-b', dest='newbranch',
4644 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004645 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004646 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004647 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004648 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004649
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004650 group = optparse.OptionGroup(
4651 parser,
4652 'Options for continuing work on the current issue uploaded from a '
4653 'different clone (e.g. different machine). Must be used independently '
4654 'from the other options. No issue number should be specified, and the '
4655 'branch must have an issue number associated with it')
4656 group.add_option('--reapply', action='store_true', dest='reapply',
4657 help='Reset the branch and reapply the issue.\n'
4658 'CAUTION: This will undo any local changes in this '
4659 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004660
4661 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004662 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004663 parser.add_option_group(group)
4664
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004665 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004666 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004667
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004668 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004669 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004670 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004671 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004672 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004673
Edward Lemur934836a2019-09-09 20:16:54 +00004674 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004675 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004676 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004677
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004678 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004679 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004680 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004681
4682 RunGit(['reset', '--hard', upstream])
4683 if options.pull:
4684 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004685
Edward Lemur678a6842019-10-03 22:25:05 +00004686 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4687 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004688
4689 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004690 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004691
Edward Lemurf38bc172019-09-03 21:02:13 +00004692 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004693 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004694 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004695
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004696 # We don't want uncommitted changes mixed up with the patch.
4697 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004698 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004699
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004700 if options.newbranch:
4701 if options.force:
4702 RunGit(['branch', '-D', options.newbranch],
4703 stderr=subprocess2.PIPE, error_ok=True)
4704 RunGit(['new-branch', options.newbranch])
4705
Edward Lemur678a6842019-10-03 22:25:05 +00004706 cl = Changelist(
4707 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004708
Edward Lemur678a6842019-10-03 22:25:05 +00004709 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004710 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004711
Edward Lemurf38bc172019-09-03 21:02:13 +00004712 return cl.CMDPatchWithParsedIssue(
4713 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004714
4715
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004716def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004717 """Fetches the tree status and returns either 'open', 'closed',
4718 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004719 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004720 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004721 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004722 if status.find('closed') != -1 or status == '0':
4723 return 'closed'
4724 elif status.find('open') != -1 or status == '1':
4725 return 'open'
4726 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004727 return 'unset'
4728
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004729
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004730def GetTreeStatusReason():
4731 """Fetches the tree status from a json url and returns the message
4732 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004733 url = settings.GetTreeStatusUrl()
4734 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004735 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004736 status = json.loads(connection.read())
4737 connection.close()
4738 return status['message']
4739
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004740
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004741@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004742def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004743 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004744 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004745 status = GetTreeStatus()
4746 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004747 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004748 return 2
4749
vapiera7fbd5a2016-06-16 09:17:49 -07004750 print('The tree is %s' % status)
4751 print()
4752 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004753 if status != 'open':
4754 return 1
4755 return 0
4756
4757
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004758@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004759def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004760 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4761 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004762 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004763 '-b', '--bot', action='append',
4764 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4765 'times to specify multiple builders. ex: '
4766 '"-b win_rel -b win_layout". See '
4767 'the try server waterfall for the builders name and the tests '
4768 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004769 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004770 '-B', '--bucket', default='',
4771 help=('Buildbucket bucket to send the try requests.'))
4772 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004773 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004774 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004775 'be determined by the try recipe that builder runs, which usually '
4776 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004777 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004778 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004779 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004780 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004781 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004782 '--category', default='git_cl_try', help='Specify custom build category.')
4783 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004784 '--project',
4785 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004786 'in recipe to determine to which repository or directory to '
4787 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004788 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004789 '-p', '--property', dest='properties', action='append', default=[],
4790 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004791 'key2=value2 etc. The value will be treated as '
4792 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004793 'NOTE: using this may make your tryjob not usable for CQ, '
4794 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004795 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004796 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4797 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004798 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004799 parser.add_option(
4800 '-R', '--retry-failed', action='store_true', default=False,
4801 help='Retry failed jobs from the latest set of tryjobs. '
4802 'Not allowed with --bucket and --bot options.')
Koji Ishii31c14782018-01-08 17:17:33 +09004803 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004804 options, args = parser.parse_args(args)
4805
machenbach@chromium.org45453142015-09-15 08:45:22 +00004806 # Make sure that all properties are prop=value pairs.
4807 bad_params = [x for x in options.properties if '=' not in x]
4808 if bad_params:
4809 parser.error('Got properties with missing "=": %s' % bad_params)
4810
maruel@chromium.org15192402012-09-06 12:38:29 +00004811 if args:
4812 parser.error('Unknown arguments: %s' % args)
4813
Edward Lemur934836a2019-09-09 20:16:54 +00004814 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004815 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004816 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004817
Edward Lemurf38bc172019-09-03 21:02:13 +00004818 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004819 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004820
tandriie113dfd2016-10-11 10:20:12 -07004821 error_message = cl.CannotTriggerTryJobReason()
4822 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004823 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004824
Quinten Yearsley983111f2019-09-26 17:18:48 +00004825 if options.retry_failed:
4826 if options.bot or options.bucket:
4827 print('ERROR: The option --retry-failed is not compatible with '
4828 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4829 return 1
4830 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004831 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004832 if options.verbose:
4833 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004834 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004835 if not buckets:
4836 print('There are no failed jobs in the latest set of jobs '
4837 '(patchset #%d), doing nothing.' % patchset)
4838 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004839 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004840 if num_builders > 10:
4841 confirm_or_exit('There are %d builders with failed builds.'
4842 % num_builders, action='continue')
4843 else:
4844 buckets = _get_bucket_map(cl, options, parser)
4845 if buckets and any(b.startswith('master.') for b in buckets):
4846 print('ERROR: Buildbot masters are not supported.')
4847 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004848
qyearsleydd49f942016-10-28 11:57:22 -07004849 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4850 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004851 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004852 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004853 print('git cl try with no bots now defaults to CQ dry run.')
4854 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4855 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004856
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004857 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004858 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004859 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004860 'of bot requires an initial job from a parent (usually a builder). '
4861 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004862 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004863 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004864
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004865 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004866 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004867 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004868 except BuildbucketResponseException as ex:
4869 print('ERROR: %s' % ex)
4870 return 1
4871 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004872
4873
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004874@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004875def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004876 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004877 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004878 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004879 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004880 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004881 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004882 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004883 '--color', action='store_true', default=setup_color.IS_TTY,
4884 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004885 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004886 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4887 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004888 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004889 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004890 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004891 parser.add_option_group(group)
Stefan Zager27db3f22017-10-10 15:15:01 -07004892 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004893 options, args = parser.parse_args(args)
4894 if args:
4895 parser.error('Unrecognized args: %s' % ' '.join(args))
4896
Edward Lemur934836a2019-09-09 20:16:54 +00004897 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004898 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004899 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004900
tandrii221ab252016-10-06 08:12:04 -07004901 patchset = options.patchset
4902 if not patchset:
4903 patchset = cl.GetMostRecentPatchset()
4904 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004905 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004906 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004907 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004908 cl.GetIssue())
4909
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004910 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004911 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004912 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004913 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004914 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004915 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004916 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004917 else:
4918 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004919 return 0
4920
4921
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004922@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004923@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004924def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004925 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004926 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004927 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004928 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004929
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004930 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004931 if args:
4932 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004933 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004934 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004935 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004936 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004937
4938 # Clear configured merge-base, if there is one.
4939 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004940 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004941 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004942 return 0
4943
4944
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004945@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004946def CMDweb(parser, args):
4947 """Opens the current CL in the web browser."""
4948 _, args = parser.parse_args(args)
4949 if args:
4950 parser.error('Unrecognized args: %s' % ' '.join(args))
4951
4952 issue_url = Changelist().GetIssueURL()
4953 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004954 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004955 return 1
4956
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004957 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004958 # allows us to hide the "Created new window in existing browser session."
4959 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004960 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004961 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004962 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004963 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004964 os.open(os.devnull, os.O_RDWR)
4965 try:
4966 webbrowser.open(issue_url)
4967 finally:
4968 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004969 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004970 return 0
4971
4972
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004973@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004974def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004975 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004976 parser.add_option('-d', '--dry-run', action='store_true',
4977 help='trigger in dry run mode')
4978 parser.add_option('-c', '--clear', action='store_true',
4979 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004980 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004981 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004982 if args:
4983 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004984 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004985 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004986
Edward Lemur934836a2019-09-09 20:16:54 +00004987 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004988 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004989 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004990 elif options.dry_run:
4991 state = _CQState.DRY_RUN
4992 else:
4993 state = _CQState.COMMIT
4994 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004995 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004996 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004997 return 0
4998
4999
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005000@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005001def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005002 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005003 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005004 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005005 if args:
5006 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005007 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005008 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005009 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005010 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005011 cl.CloseIssue()
5012 return 0
5013
5014
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005015@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005016def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005017 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005018 parser.add_option(
5019 '--stat',
5020 action='store_true',
5021 dest='stat',
5022 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005023 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005024 if args:
5025 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005026
Edward Lemur934836a2019-09-09 20:16:54 +00005027 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005028 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005029 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005030 if not issue:
5031 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005032
Aaron Gablea718c3e2017-08-28 17:47:28 -07005033 base = cl._GitGetBranchConfigValue('last-upload-hash')
5034 if not base:
5035 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5036 if not base:
5037 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5038 revision_info = detail['revisions'][detail['current_revision']]
5039 fetch_info = revision_info['fetch']['http']
5040 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5041 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005042
Aaron Gablea718c3e2017-08-28 17:47:28 -07005043 cmd = ['git', 'diff']
5044 if options.stat:
5045 cmd.append('--stat')
5046 cmd.append(base)
5047 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005048
5049 return 0
5050
5051
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005052@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005053def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005054 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005055 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005056 '--ignore-current',
5057 action='store_true',
5058 help='Ignore the CL\'s current reviewers and start from scratch.')
5059 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005060 '--ignore-self',
5061 action='store_true',
5062 help='Do not consider CL\'s author as an owners.')
5063 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005064 '--no-color',
5065 action='store_true',
5066 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005067 parser.add_option(
5068 '--batch',
5069 action='store_true',
5070 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005071 # TODO: Consider moving this to another command, since other
5072 # git-cl owners commands deal with owners for a given CL.
5073 parser.add_option(
5074 '--show-all',
5075 action='store_true',
5076 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005077 options, args = parser.parse_args(args)
5078
5079 author = RunGit(['config', 'user.email']).strip() or None
5080
Edward Lemur934836a2019-09-09 20:16:54 +00005081 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005082
Yang Guo6e269a02019-06-26 11:17:02 +00005083 if options.show_all:
5084 for arg in args:
5085 base_branch = cl.GetCommonAncestorWithUpstream()
5086 change = cl.GetChange(base_branch, None)
5087 database = owners.Database(change.RepositoryRoot(), file, os.path)
5088 database.load_data_needed_for([arg])
5089 print('Owners for %s:' % arg)
5090 for owner in sorted(database.all_possible_owners([arg], None)):
5091 print(' - %s' % owner)
5092 return 0
5093
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005094 if args:
5095 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005096 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005097 base_branch = args[0]
5098 else:
5099 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005100 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005101
5102 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005103 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5104
5105 if options.batch:
5106 db = owners.Database(change.RepositoryRoot(), file, os.path)
5107 print('\n'.join(db.reviewers_for(affected_files, author)))
5108 return 0
5109
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005110 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005111 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005112 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005113 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005114 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005115 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005116 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005117 override_files=change.OriginalOwnersFiles(),
5118 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005119
5120
Aiden Bennerc08566e2018-10-03 17:52:42 +00005121def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005122 """Generates a diff command."""
5123 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005124 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5125
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005126 if allow_prefix:
5127 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5128 # case that diff.noprefix is set in the user's git config.
5129 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5130 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005131 diff_cmd += ['--no-prefix']
5132
5133 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005134
5135 if args:
5136 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005137 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005138 diff_cmd.append(arg)
5139 else:
5140 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005141
5142 return diff_cmd
5143
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005144
Jamie Madill5e96ad12020-01-13 16:08:35 +00005145def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5146 """Runs clang-format-diff and sets a return value if necessary."""
5147
5148 if not clang_diff_files:
5149 return 0
5150
5151 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5152 # formatted. This is used to block during the presubmit.
5153 return_value = 0
5154
5155 # Locate the clang-format binary in the checkout
5156 try:
5157 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5158 except clang_format.NotFoundError as e:
5159 DieWithError(e)
5160
5161 if opts.full or settings.GetFormatFullByDefault():
5162 cmd = [clang_format_tool]
5163 if not opts.dry_run and not opts.diff:
5164 cmd.append('-i')
5165 if opts.dry_run:
5166 for diff_file in clang_diff_files:
5167 with open(diff_file, 'r') as myfile:
5168 code = myfile.read().replace('\r\n', '\n')
5169 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5170 stdout = stdout.replace('\r\n', '\n')
5171 if opts.diff:
5172 sys.stdout.write(stdout)
5173 if code != stdout:
5174 return_value = 2
5175 else:
5176 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5177 if opts.diff:
5178 sys.stdout.write(stdout)
5179 else:
5180 env = os.environ.copy()
5181 env['PATH'] = str(os.path.dirname(clang_format_tool))
5182 try:
5183 script = clang_format.FindClangFormatScriptInChromiumTree(
5184 'clang-format-diff.py')
5185 except clang_format.NotFoundError as e:
5186 DieWithError(e)
5187
5188 cmd = [sys.executable, script, '-p0']
5189 if not opts.dry_run and not opts.diff:
5190 cmd.append('-i')
5191
5192 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5193 diff_output = RunGit(diff_cmd)
5194
5195 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5196 if opts.diff:
5197 sys.stdout.write(stdout)
5198 if opts.dry_run and len(stdout) > 0:
5199 return_value = 2
5200
5201 return return_value
5202
5203
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005204def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005205 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005206 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005207
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005208
enne@chromium.org555cfe42014-01-29 18:21:39 +00005209@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005210@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005211def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005212 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005213 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005214 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005215 parser.add_option('--full', action='store_true',
5216 help='Reformat the full content of all touched files')
5217 parser.add_option('--dry-run', action='store_true',
5218 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005219 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005220 '--no-clang-format',
5221 dest='clang_format',
5222 action='store_false',
5223 default=True,
5224 help='Disables formatting of various file types using clang-format.')
5225 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005226 '--python',
5227 action='store_true',
5228 default=None,
5229 help='Enables python formatting on all python files.')
5230 parser.add_option(
5231 '--no-python',
5232 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005233 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005234 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005235 'If neither --python or --no-python are set, python files that have a '
5236 '.style.yapf file in an ancestor directory will be formatted. '
5237 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005238 parser.add_option(
5239 '--js',
5240 action='store_true',
Tim van der Lippe42a51f62020-01-31 19:41:09 +00005241 default=None,
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005242 help='Format javascript code with clang-format. '
5243 'Has no effect if --no-clang-format is set.')
Tim van der Lippe42a51f62020-01-31 19:41:09 +00005244 parser.add_option(
5245 '--no-js',
5246 action='store_true',
5247 default=False,
5248 help='Disable JavaScript/TypeScript formatting code with clang-format. '
5249 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005250 parser.add_option('--diff', action='store_true',
5251 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005252 parser.add_option('--presubmit', action='store_true',
5253 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005254 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005255
Garrett Beaty91a6f332020-01-06 16:57:24 +00005256 if opts.python is not None and opts.no_python:
5257 raise parser.error('Cannot set both --python and --no-python')
5258 if opts.no_python:
5259 opts.python = False
Tim van der Lippe42a51f62020-01-31 19:41:09 +00005260 if opts.js is not None and opts.no_js:
5261 raise parser.error('Cannot set both --js and --no-js')
5262 if opts.no_js:
5263 opts.js = False
Garrett Beaty91a6f332020-01-06 16:57:24 +00005264
Daniel Chengc55eecf2016-12-30 03:11:02 -08005265 # Normalize any remaining args against the current path, so paths relative to
5266 # the current directory are still resolved as expected.
5267 args = [os.path.join(os.getcwd(), arg) for arg in args]
5268
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005269 # git diff generates paths against the root of the repository. Change
5270 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005271 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005272 if rel_base_path:
5273 os.chdir(rel_base_path)
5274
digit@chromium.org29e47272013-05-17 17:01:46 +00005275 # Grab the merge-base commit, i.e. the upstream commit of the current
5276 # branch when it was created or the last time it was rebased. This is
5277 # to cover the case where the user may have called "git fetch origin",
5278 # moving the origin branch to a newer commit, but hasn't rebased yet.
5279 upstream_commit = None
5280 cl = Changelist()
5281 upstream_branch = cl.GetUpstreamBranch()
5282 if upstream_branch:
5283 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5284 upstream_commit = upstream_commit.strip()
5285
5286 if not upstream_commit:
5287 DieWithError('Could not find base commit for this branch. '
5288 'Are you in detached state?')
5289
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005290 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5291 diff_output = RunGit(changed_files_cmd)
5292 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005293 # Filter out files deleted by this CL
5294 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005295
Tim van der Lippe42a51f62020-01-31 19:41:09 +00005296 js_explicitly_disabled = opts.js is not None and not opts.js
5297 if not js_explicitly_disabled:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005298 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005299
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005300 clang_diff_files = []
5301 if opts.clang_format:
5302 clang_diff_files = [
5303 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5304 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005305 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5306 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005307 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005308
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005309 top_dir = os.path.normpath(
5310 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5311
Jamie Madill5e96ad12020-01-13 16:08:35 +00005312 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5313 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005314
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005315 # Similar code to above, but using yapf on .py files rather than clang-format
5316 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005317 py_explicitly_disabled = opts.python is not None and not opts.python
5318 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005319 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5320 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5321 if sys.platform.startswith('win'):
5322 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005323
Aiden Bennerc08566e2018-10-03 17:52:42 +00005324 # Used for caching.
5325 yapf_configs = {}
5326 for f in python_diff_files:
5327 # Find the yapf style config for the current file, defaults to depot
5328 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005329 _FindYapfConfigFile(f, yapf_configs, top_dir)
5330
5331 # Turn on python formatting by default if a yapf config is specified.
5332 # This breaks in the case of this repo though since the specified
5333 # style file is also the global default.
5334 if opts.python is None:
5335 filtered_py_files = []
5336 for f in python_diff_files:
5337 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5338 filtered_py_files.append(f)
5339 else:
5340 filtered_py_files = python_diff_files
5341
5342 # Note: yapf still seems to fix indentation of the entire file
5343 # even if line ranges are specified.
5344 # See https://github.com/google/yapf/issues/499
5345 if not opts.full and filtered_py_files:
5346 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5347
Brian Sheedyb4307d52019-12-02 19:18:17 +00005348 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5349 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5350 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005351
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005352 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005353 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5354 # Default to pep8 if not .style.yapf is found.
5355 if not yapf_style:
5356 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005357
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005358 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005359
5360 has_formattable_lines = False
5361 if not opts.full:
5362 # Only run yapf over changed line ranges.
5363 for diff_start, diff_len in py_line_diffs[f]:
5364 diff_end = diff_start + diff_len - 1
5365 # Yapf errors out if diff_end < diff_start but this
5366 # is a valid line range diff for a removal.
5367 if diff_end >= diff_start:
5368 has_formattable_lines = True
5369 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5370 # If all line diffs were removals we have nothing to format.
5371 if not has_formattable_lines:
5372 continue
5373
5374 if opts.diff or opts.dry_run:
5375 cmd += ['--diff']
5376 # Will return non-zero exit code if non-empty diff.
5377 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5378 if opts.diff:
5379 sys.stdout.write(stdout)
5380 elif len(stdout) > 0:
5381 return_value = 2
5382 else:
5383 cmd += ['-i']
5384 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005385
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005386 # Dart's formatter does not have the nice property of only operating on
5387 # modified chunks, so hard code full.
5388 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005389 try:
5390 command = [dart_format.FindDartFmtToolInChromiumTree()]
5391 if not opts.dry_run and not opts.diff:
5392 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005393 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005394
ppi@chromium.org6593d932016-03-03 15:41:15 +00005395 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005396 if opts.dry_run and stdout:
5397 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005398 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005399 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5400 'found in this checkout. Files in other languages are still '
5401 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005402
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005403 # Format GN build files. Always run on full build files for canonical form.
5404 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005405 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005406 if opts.dry_run or opts.diff:
5407 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005408 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005409 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5410 shell=sys.platform == 'win32',
5411 cwd=top_dir)
5412 if opts.dry_run and gn_ret == 2:
5413 return_value = 2 # Not formatted.
5414 elif opts.diff and gn_ret == 2:
5415 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005416 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005417 elif gn_ret != 0:
5418 # For non-dry run cases (and non-2 return values for dry-run), a
5419 # nonzero error code indicates a failure, probably because the file
5420 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005421 DieWithError('gn format failed on ' + gn_diff_file +
5422 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005423
Ilya Shermane081cbe2017-08-15 17:51:04 -07005424 # Skip the metrics formatting from the global presubmit hook. These files have
5425 # a separate presubmit hook that issues an error if the files need formatting,
5426 # whereas the top-level presubmit script merely issues a warning. Formatting
5427 # these files is somewhat slow, so it's important not to duplicate the work.
5428 if not opts.presubmit:
5429 for xml_dir in GetDirtyMetricsDirs(diff_files):
5430 tool_dir = os.path.join(top_dir, xml_dir)
5431 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5432 if opts.dry_run or opts.diff:
5433 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005434 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005435 if opts.diff:
5436 sys.stdout.write(stdout)
5437 if opts.dry_run and stdout:
5438 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005439
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005440 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005441
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005442
Steven Holte2e664bf2017-04-21 13:10:47 -07005443def GetDirtyMetricsDirs(diff_files):
5444 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5445 metrics_xml_dirs = [
5446 os.path.join('tools', 'metrics', 'actions'),
5447 os.path.join('tools', 'metrics', 'histograms'),
5448 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005449 os.path.join('tools', 'metrics', 'ukm'),
5450 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005451 for xml_dir in metrics_xml_dirs:
5452 if any(file.startswith(xml_dir) for file in xml_diff_files):
5453 yield xml_dir
5454
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005455
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005456@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005457@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005458def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005459 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005460 _, args = parser.parse_args(args)
5461
5462 if len(args) != 1:
5463 parser.print_help()
5464 return 1
5465
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005466 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005467 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005468 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005469
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005470 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005471
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005472 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005473 output = RunGit(['config', '--local', '--get-regexp',
5474 r'branch\..*\.%s' % issueprefix],
5475 error_ok=True)
5476 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005477 if issue == target_issue:
5478 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005479
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005480 branches = []
5481 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005482 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005483 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005484 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005485 return 1
5486 if len(branches) == 1:
5487 RunGit(['checkout', branches[0]])
5488 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005489 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005490 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005491 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005492 which = raw_input('Choose by index: ')
5493 try:
5494 RunGit(['checkout', branches[int(which)]])
5495 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005496 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005497 return 1
5498
5499 return 0
5500
5501
maruel@chromium.org29404b52014-09-08 22:58:00 +00005502def CMDlol(parser, args):
5503 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005504 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005505 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5506 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5507 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005508 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005509 return 0
5510
5511
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005512class OptionParser(optparse.OptionParser):
5513 """Creates the option parse and add --verbose support."""
5514 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005515 optparse.OptionParser.__init__(
5516 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005517 self.add_option(
5518 '-v', '--verbose', action='count', default=0,
5519 help='Use 2 times for more debugging info')
5520
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005521 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005522 try:
5523 return self._parse_args(args)
5524 finally:
5525 # Regardless of success or failure of args parsing, we want to report
5526 # metrics, but only after logging has been initialized (if parsing
5527 # succeeded).
5528 global settings
5529 settings = Settings()
5530
5531 if not metrics.DISABLE_METRICS_COLLECTION:
5532 # GetViewVCUrl ultimately calls logging method.
5533 project_url = settings.GetViewVCUrl().strip('/+')
5534 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5535 metrics.collector.add('project_urls', [project_url])
5536
5537 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005538 # Create an optparse.Values object that will store only the actual passed
5539 # options, without the defaults.
5540 actual_options = optparse.Values()
5541 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5542 # Create an optparse.Values object with the default options.
5543 options = optparse.Values(self.get_default_values().__dict__)
5544 # Update it with the options passed by the user.
5545 options._update_careful(actual_options.__dict__)
5546 # Store the options passed by the user in an _actual_options attribute.
5547 # We store only the keys, and not the values, since the values can contain
5548 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005549 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005550
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005551 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005552 logging.basicConfig(
5553 level=levels[min(options.verbose, len(levels) - 1)],
5554 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5555 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005556
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005557 return options, args
5558
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005559
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005560def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005561 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005562 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005563 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005564 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005565
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005566 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005567 dispatcher = subcommand.CommandDispatcher(__name__)
5568 try:
5569 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005570 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005571 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005572 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005573 if e.code != 500:
5574 raise
5575 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005576 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005577 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005578 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005579
5580
5581if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005582 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5583 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005584 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005585 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005586 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005587 sys.exit(main(sys.argv[1:]))