blob: e0c82572cbd5eef5f31e4be8895fc5a22da2925f [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)
Christopher Lamf732cd52017-01-24 12:40:11 +1100143 backup_file = open(backup_path, 'w')
144 backup_file.write(change_desc.description)
145 backup_file.close()
146
147
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000148def GetNoGitPagerEnv():
149 env = os.environ.copy()
150 # 'cat' is a magical git string that disables pagers on all platforms.
151 env['GIT_PAGER'] = 'cat'
152 return env
153
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000154
bsep@chromium.org627d9002016-04-29 00:00:52 +0000155def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000156 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000157 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
158 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000159 except subprocess2.CalledProcessError as e:
160 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000161 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000163 'Command "%s" failed.\n%s' % (
164 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000165 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000166
167
168def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000169 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000170 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000171
172
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000173def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000174 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700175 if suppress_stderr:
176 stderr = subprocess2.VOID
177 else:
178 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000179 try:
tandrii5d48c322016-08-18 16:19:37 -0700180 (out, _), code = subprocess2.communicate(['git'] + args,
181 env=GetNoGitPagerEnv(),
182 stdout=subprocess2.PIPE,
183 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000184 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700185 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900186 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000187 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000188
189
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000190def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000191 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000192 return RunGitWithCode(args, suppress_stderr=True)[1]
193
194
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000195def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000196 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000197 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000198 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000199 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000200
201
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000202def BranchExists(branch):
203 """Return True if specified branch exists."""
204 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
205 suppress_stderr=True)
206 return not code
207
208
tandrii2a16b952016-10-19 07:09:44 -0700209def time_sleep(seconds):
210 # Use this so that it can be mocked in tests without interfering with python
211 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700212 return time.sleep(seconds)
213
214
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000215def time_time():
216 # Use this so that it can be mocked in tests without interfering with python
217 # system machinery.
218 return time.time()
219
220
Edward Lemur1b52d872019-05-09 21:12:12 +0000221def datetime_now():
222 # Use this so that it can be mocked in tests without interfering with python
223 # system machinery.
224 return datetime.datetime.now()
225
226
maruel@chromium.org90541732011-04-01 17:54:18 +0000227def ask_for_data(prompt):
228 try:
229 return raw_input(prompt)
230 except KeyboardInterrupt:
231 # Hide the exception.
232 sys.exit(1)
233
234
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100235def confirm_or_exit(prefix='', action='confirm'):
236 """Asks user to press enter to continue or press Ctrl+C to abort."""
237 if not prefix or prefix.endswith('\n'):
238 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100239 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240 mid = ' Press'
241 elif prefix.endswith(' '):
242 mid = 'press'
243 else:
244 mid = ' press'
245 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
246
247
248def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000249 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100250 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
251 while True:
252 if 'yes'.startswith(result):
253 return True
254 if 'no'.startswith(result):
255 return False
256 result = ask_for_data('Please, type yes or no: ').lower()
257
258
tandrii5d48c322016-08-18 16:19:37 -0700259def _git_branch_config_key(branch, key):
260 """Helper method to return Git config key for a branch."""
261 assert branch, 'branch name is required to set git config for it'
262 return 'branch.%s.%s' % (branch, key)
263
264
265def _git_get_branch_config_value(key, default=None, value_type=str,
266 branch=False):
267 """Returns git config value of given or current branch if any.
268
269 Returns default in all other cases.
270 """
271 assert value_type in (int, str, bool)
272 if branch is False: # Distinguishing default arg value from None.
273 branch = GetCurrentBranch()
274
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000275 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700276 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000277
tandrii5d48c322016-08-18 16:19:37 -0700278 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700279 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700280 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000281 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700282 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700283 args.append(_git_branch_config_key(branch, key))
284 code, out = RunGitWithCode(args)
285 if code == 0:
286 value = out.strip()
287 if value_type == int:
288 return int(value)
289 if value_type == bool:
290 return bool(value.lower() == 'true')
291 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000292 return default
293
294
tandrii5d48c322016-08-18 16:19:37 -0700295def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000296 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700297
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000298 If value is None, the key will be unset, otherwise it will be set.
299 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700300 """
301 if not branch:
302 branch = GetCurrentBranch()
303 assert branch, 'a branch name OR currently checked out branch is required'
304 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700305 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700306 if value is None:
307 args.append('--unset')
308 elif isinstance(value, bool):
309 args.append('--bool')
310 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700311 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000312 # `git config` also has --int, but apparently git config suffers from
313 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700314 value = str(value)
315 args.append(_git_branch_config_key(branch, key))
316 if value is not None:
317 args.append(value)
318 RunGit(args, **kwargs)
319
320
machenbach@chromium.org45453142015-09-15 08:45:22 +0000321def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000322 prop_list = getattr(options, 'properties', [])
323 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000324 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000325 try:
326 properties[key] = json.loads(val)
327 except ValueError:
328 pass # If a value couldn't be evaluated, treat it as a string.
329 return properties
330
331
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000332# TODO(crbug.com/976104): Remove this function once git-cl try-results has
333# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000334def _buildbucket_retry(operation_name, http, *args, **kwargs):
335 """Retries requests to buildbucket service and returns parsed json content."""
336 try_count = 0
337 while True:
338 response, content = http.request(*args, **kwargs)
339 try:
340 content_json = json.loads(content)
341 except ValueError:
342 content_json = None
343
344 # Buildbucket could return an error even if status==200.
345 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000346 error = content_json.get('error')
347 if error.get('code') == 403:
348 raise BuildbucketResponseException(
349 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000350 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000351 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000352 raise BuildbucketResponseException(msg)
353
354 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700355 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000356 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000357 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700358 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000359 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000360 content)
361 return content_json
362 if response.status < 500 or try_count >= 2:
363 raise httplib2.HttpLib2Error(content)
364
365 # status >= 500 means transient failures.
366 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000367 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000368 try_count += 1
369 assert False, 'unreachable'
370
371
Edward Lemur4c707a22019-09-24 21:13:43 +0000372def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373 """Calls a buildbucket v2 method and returns the parsed json response."""
374 headers = {
375 'Accept': 'application/json',
376 'Content-Type': 'application/json',
377 }
378 request = json.dumps(request)
379 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
380
381 logging.info('POST %s with %s' % (url, request))
382
383 attempts = 1
384 time_to_sleep = 1
385 while True:
386 response, content = http.request(url, 'POST', body=request, headers=headers)
387 if response.status == 200:
388 return json.loads(content[4:])
389 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
390 msg = '%s error when calling POST %s with %s: %s' % (
391 response.status, url, request, content)
392 raise BuildbucketResponseException(msg)
393 logging.debug(
394 '%s error when calling POST %s with %s. '
395 'Sleeping for %d seconds and retrying...' % (
396 response.status, url, request, time_to_sleep))
397 time.sleep(time_to_sleep)
398 time_to_sleep *= 2
399 attempts += 1
400
401 assert False, 'unreachable'
402
403
qyearsley1fdfcb62016-10-24 13:22:03 -0700404def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700405 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000406 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700407 """
qyearsleydd49f942016-10-28 11:57:22 -0700408 # If no bots are listed, we try to get a set of builders and tests based
409 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 if not options.bot:
411 change = changelist.GetChange(
412 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700413 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700414 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700415 change=change,
416 changed_files=change.LocalPaths(),
417 repository_root=settings.GetRoot(),
418 default_presubmit=None,
419 project=None,
420 verbose=options.verbose,
421 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700422 if masters is None:
423 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000424 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700425
qyearsley1fdfcb62016-10-24 13:22:03 -0700426 if options.bucket:
427 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000428 option_parser.error(
Edward Lemur5ef16a32019-11-11 21:13:25 +0000429 'Please specify the bucket, e.g. "-B chromium/try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700430
431
Edward Lemur6215c792019-10-03 21:59:05 +0000432def _parse_bucket(raw_bucket):
433 legacy = True
434 project = bucket = None
435 if '/' in raw_bucket:
436 legacy = False
437 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000438 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000439 elif raw_bucket.startswith('luci.'):
440 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000441 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000442 elif '.' in raw_bucket:
443 project = raw_bucket.split('.')[0]
444 bucket = raw_bucket
445 # Legacy buckets.
446 if legacy:
447 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
448 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000449
450
Edward Lemur5b929a42019-10-21 17:57:39 +0000451def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000452 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700453
454 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000455 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700456 buckets: A nested dict mapping bucket names to builders to tests.
457 options: Command-line options.
458 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000459 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000460 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000461 print('Bucket:', bucket)
462 print('\n'.join(
463 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000464 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000465 print('To see results here, run: git cl try-results')
466 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700467
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000468 requests = _make_try_job_schedule_requests(
469 changelist, buckets, options, patchset)
470 if not requests:
471 return
472
Edward Lemur5b929a42019-10-21 17:57:39 +0000473 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000474 http.force_exception_to_status_code = True
475
476 batch_request = {'requests': requests}
477 batch_response = _call_buildbucket(
478 http, options.buildbucket_host, 'Batch', batch_request)
479
480 errors = [
481 ' ' + response['error']['message']
482 for response in batch_response.get('responses', [])
483 if 'error' in response
484 ]
485 if errors:
486 raise BuildbucketResponseException(
487 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
488
489
490def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000491 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000492 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000493 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000494 shared_properties['clobber'] = True
495 shared_properties.update(_get_properties_from_options(options) or {})
496
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000497 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
498 if options.retry_failed:
499 shared_tags.append({'key': 'retry_failed',
500 'value': '1'})
501
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000502 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000503 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000504 project, bucket = _parse_bucket(raw_bucket)
505 if not project or not bucket:
506 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
507 continue
508
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000509 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000510 properties = shared_properties.copy()
511 if 'presubmit' in builder.lower():
512 properties['dry_run'] = 'true'
513 if tests:
514 properties['testfilter'] = tests
515
516 requests.append({
517 'scheduleBuild': {
518 'requestId': str(uuid.uuid4()),
519 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000520 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000521 'bucket': bucket,
522 'builder': builder,
523 },
524 'gerritChanges': gerrit_changes,
525 'properties': properties,
526 'tags': [
527 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000528 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000529 }
530 })
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000531 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000532
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000533
Edward Lemur5b929a42019-10-21 17:57:39 +0000534def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000535 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000536
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000538 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000539 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000540 request = {
541 'predicate': {
542 'gerritChanges': [changelist.GetGerritChange(patchset)],
543 },
544 'fields': ','.join('builds.*.' + field for field in fields),
545 }
tandrii221ab252016-10-06 08:12:04 -0700546
Edward Lemur5b929a42019-10-21 17:57:39 +0000547 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000548 if authenticator.has_cached_credentials():
549 http = authenticator.authorize(httplib2.Http())
550 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700551 print('Warning: Some results might be missing because %s' %
552 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000553 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000555 http.force_exception_to_status_code = True
556
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000557 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
558 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000559
Edward Lemur5b929a42019-10-21 17:57:39 +0000560def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000561 """Fetches builds from the latest patchset that has builds (within
562 the last few patchsets).
563
564 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000565 changelist (Changelist): The CL to fetch builds for
566 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000567 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
568 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000569 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
571 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000572 """
573 assert buildbucket_host
574 assert changelist.GetIssue(), 'CL must be uploaded first'
575 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000576 if latest_patchset is None:
577 assert changelist.GetMostRecentPatchset()
578 ps = changelist.GetMostRecentPatchset()
579 else:
580 assert latest_patchset > 0, latest_patchset
581 ps = latest_patchset
582
Quinten Yearsley983111f2019-09-26 17:18:48 +0000583 min_ps = max(1, ps - 5)
584 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000585 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000586 if len(builds):
587 return builds, ps
588 ps -= 1
589 return [], 0
590
591
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000592def _filter_failed_for_retry(all_builds):
593 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000594
595 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000596 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000597 i.e. a list of buildbucket.v2.Builds which includes status and builder
598 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000599
600 Returns:
601 A dict of bucket to builder to tests (empty list). This is the same format
602 accepted by _trigger_try_jobs and returned by _get_bucket_map.
603 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000604
605 def _builder_of(build):
606 builder = build['builder']
607 return (builder['project'], builder['bucket'], builder['builder'])
608
609 res = collections.defaultdict(dict)
610 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
611 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
612 # If builder had several builds, retry only if the last one failed.
613 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
614 # build, but in case of retrying failed jobs retrying a flaky one makes
615 # sense.
616 builds = list(builds)
617 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
618 continue
619 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
620 for t in builds[-1]['tags']):
621 # Don't retry experimental build previously triggered by CQ.
622 continue
623 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
624 # Don't retry if any are running.
625 continue
626 res[proj + '/' + buck][bldr] = []
627 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000628
629
qyearsleyeab3c042016-08-24 09:18:28 -0700630def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 """Prints nicely result of fetch_try_jobs."""
632 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000633 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000634 return
635
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000636 longest_builder = max(len(b['builder']['builder']) for b in builds)
637 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000638 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000639 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
640 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000641
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000642 builds_by_status = {}
643 for b in builds:
644 builds_by_status.setdefault(b['status'], []).append({
645 'id': b['id'],
646 'name': name_fmt.format(
647 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
648 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000649
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000650 sort_key = lambda b: (b['name'], b['id'])
651
652 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000653 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000654 if not builds:
655 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000656
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000657 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000658 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000659 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 else:
661 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
662
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000663 print(colorize(title))
664 for b in sorted(builds, key=sort_key):
665 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000666
667 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000668 print_builds(
669 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
670 print_builds(
671 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
672 color=Fore.MAGENTA)
673 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
674 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
675 color=Fore.MAGENTA)
676 print_builds('Started:', builds_by_status.pop('STARTED', []))
677 print_builds(
678 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000679 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000680 print_builds(
681 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000682 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000683
684
Aiden Bennerc08566e2018-10-03 17:52:42 +0000685def _ComputeDiffLineRanges(files, upstream_commit):
686 """Gets the changed line ranges for each file since upstream_commit.
687
688 Parses a git diff on provided files and returns a dict that maps a file name
689 to an ordered list of range tuples in the form (start_line, count).
690 Ranges are in the same format as a git diff.
691 """
692 # If files is empty then diff_output will be a full diff.
693 if len(files) == 0:
694 return {}
695
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000696 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000697 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000698 diff_output = RunGit(diff_cmd)
699
700 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
701 # 2 capture groups
702 # 0 == fname of diff file
703 # 1 == 'diff_start,diff_count' or 'diff_start'
704 # will match each of
705 # diff --git a/foo.foo b/foo.py
706 # @@ -12,2 +14,3 @@
707 # @@ -12,2 +17 @@
708 # running re.findall on the above string with pattern will give
709 # [('foo.py', ''), ('', '14,3'), ('', '17')]
710
711 curr_file = None
712 line_diffs = {}
713 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
714 if match[0] != '':
715 # Will match the second filename in diff --git a/a.py b/b.py.
716 curr_file = match[0]
717 line_diffs[curr_file] = []
718 else:
719 # Matches +14,3
720 if ',' in match[1]:
721 diff_start, diff_count = match[1].split(',')
722 else:
723 # Single line changes are of the form +12 instead of +12,1.
724 diff_start = match[1]
725 diff_count = 1
726
727 diff_start = int(diff_start)
728 diff_count = int(diff_count)
729
730 # If diff_count == 0 this is a removal we can ignore.
731 line_diffs[curr_file].append((diff_start, diff_count))
732
733 return line_diffs
734
735
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000736def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000737 """Checks if a yapf file is in any parent directory of fpath until top_dir.
738
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000739 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000740 is found returns None. Uses yapf_config_cache as a cache for previously found
741 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000742 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000743 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000744 # Return result if we've already computed it.
745 if fpath in yapf_config_cache:
746 return yapf_config_cache[fpath]
747
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000748 parent_dir = os.path.dirname(fpath)
749 if os.path.isfile(fpath):
750 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000751 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000752 # Otherwise fpath is a directory
753 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
754 if os.path.isfile(yapf_file):
755 ret = yapf_file
756 elif fpath == top_dir or parent_dir == fpath:
757 # If we're at the top level directory, or if we're at root
758 # there is no provided style.
759 ret = None
760 else:
761 # Otherwise recurse on the current directory.
762 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000763 yapf_config_cache[fpath] = ret
764 return ret
765
766
Brian Sheedyb4307d52019-12-02 19:18:17 +0000767def _GetYapfIgnorePatterns(top_dir):
768 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000769
770 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
771 but this functionality appears to break when explicitly passing files to
772 yapf for formatting. According to
773 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
774 the .yapfignore file should be in the directory that yapf is invoked from,
775 which we assume to be the top level directory in this case.
776
777 Args:
778 top_dir: The top level directory for the repository being formatted.
779
780 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000781 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000782 """
783 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000784 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000785 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000786 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000787
Brian Sheedyb4307d52019-12-02 19:18:17 +0000788 with open(yapfignore_file) as f:
789 for line in f.readlines():
790 stripped_line = line.strip()
791 # Comments and blank lines should be ignored.
792 if stripped_line.startswith('#') or stripped_line == '':
793 continue
794 ignore_patterns.add(stripped_line)
795 return ignore_patterns
796
797
798def _FilterYapfIgnoredFiles(filepaths, patterns):
799 """Filters out any filepaths that match any of the given patterns.
800
801 Args:
802 filepaths: An iterable of strings containing filepaths to filter.
803 patterns: An iterable of strings containing fnmatch patterns to filter on.
804
805 Returns:
806 A list of strings containing all the elements of |filepaths| that did not
807 match any of the patterns in |patterns|.
808 """
809 # Not inlined so that tests can use the same implementation.
810 return [f for f in filepaths
811 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000812
813
Aaron Gable13101a62018-02-09 13:20:41 -0800814def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000815 """Prints statistics about the change to the user."""
816 # --no-ext-diff is broken in some versions of Git, so try to work around
817 # this by overriding the environment (but there is still a problem if the
818 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000819 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000820 if 'GIT_EXTERNAL_DIFF' in env:
821 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000822
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000823 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800824 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000825 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000826
827
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000828class BuildbucketResponseException(Exception):
829 pass
830
831
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000832class Settings(object):
833 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000835 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000836 self.tree_status_url = None
837 self.viewvc_url = None
838 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000839 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000840 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000841 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000842 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000843 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000844
845 def LazyUpdateIfNeeded(self):
846 """Updates the settings from a codereview.settings file, if available."""
847 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000848 # The only value that actually changes the behavior is
849 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000850 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000851 error_ok=True
852 ).strip().lower()
853
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000854 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000855 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000856 LoadCodereviewSettingsFromFile(cr_settings_file)
857 self.updated = True
858
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000859 @staticmethod
860 def GetRelativeRoot():
861 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000862
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000863 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000864 if self.root is None:
865 self.root = os.path.abspath(self.GetRelativeRoot())
866 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000867
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000868 def GetTreeStatusUrl(self, error_ok=False):
869 if not self.tree_status_url:
870 error_message = ('You must configure your tree status URL by running '
871 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000872 self.tree_status_url = self._GetConfig(
873 'rietveld.tree-status-url', error_ok=error_ok,
874 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000875 return self.tree_status_url
876
877 def GetViewVCUrl(self):
878 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000879 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000880 return self.viewvc_url
881
rmistry@google.com90752582014-01-14 21:04:50 +0000882 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000883 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000884
rmistry@google.com5626a922015-02-26 14:03:30 +0000885 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000886 run_post_upload_hook = self._GetConfig(
887 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000888 return run_post_upload_hook == "True"
889
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000890 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000891 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000892
ukai@chromium.orge8077812012-02-03 03:41:46 +0000893 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000894 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000895 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700896 self.is_gerrit = (
897 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000898 return self.is_gerrit
899
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000900 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000901 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000902 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700903 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
904 if self.squash_gerrit_uploads is None:
905 # Default is squash now (http://crbug.com/611892#c23).
906 self.squash_gerrit_uploads = not (
907 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
908 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000909 return self.squash_gerrit_uploads
910
tandriia60502f2016-06-20 02:01:53 -0700911 def GetSquashGerritUploadsOverride(self):
912 """Return True or False if codereview.settings should be overridden.
913
914 Returns None if no override has been defined.
915 """
916 # See also http://crbug.com/611892#c23
917 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
918 error_ok=True).strip()
919 if result == 'true':
920 return True
921 if result == 'false':
922 return False
923 return None
924
tandrii@chromium.org28253532016-04-14 13:46:56 +0000925 def GetGerritSkipEnsureAuthenticated(self):
926 """Return True if EnsureAuthenticated should not be done for Gerrit
927 uploads."""
928 if self.gerrit_skip_ensure_authenticated is None:
929 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000930 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000931 error_ok=True).strip() == 'true')
932 return self.gerrit_skip_ensure_authenticated
933
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000934 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000935 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000936 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000937 # Git requires single quotes for paths with spaces. We need to replace
938 # them with double quotes for Windows to treat such paths as a single
939 # path.
940 self.git_editor = self._GetConfig(
941 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000942 return self.git_editor or None
943
thestig@chromium.org44202a22014-03-11 19:22:18 +0000944 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000945 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000946 DEFAULT_LINT_REGEX)
947
948 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000949 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000950 DEFAULT_LINT_IGNORE_REGEX)
951
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000952 def GetFormatFullByDefault(self):
953 if self.format_full_by_default is None:
954 result = (
955 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
956 error_ok=True).strip())
957 self.format_full_by_default = (result == 'true')
958 return self.format_full_by_default
959
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000960 def _GetConfig(self, param, **kwargs):
961 self.LazyUpdateIfNeeded()
962 return RunGit(['config', param], **kwargs).strip()
963
964
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000965def ShortBranchName(branch):
966 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000967 return branch.replace('refs/heads/', '', 1)
968
969
970def GetCurrentBranchRef():
971 """Returns branch ref (e.g., refs/heads/master) or None."""
972 return RunGit(['symbolic-ref', 'HEAD'],
973 stderr=subprocess2.VOID, error_ok=True).strip() or None
974
975
976def GetCurrentBranch():
977 """Returns current branch or None.
978
979 For refs/heads/* branches, returns just last part. For others, full ref.
980 """
981 branchref = GetCurrentBranchRef()
982 if branchref:
983 return ShortBranchName(branchref)
984 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000985
986
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000987class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000988 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000989 NONE = 'none'
990 DRY_RUN = 'dry_run'
991 COMMIT = 'commit'
992
993 ALL_STATES = [NONE, DRY_RUN, COMMIT]
994
995
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000996class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000997 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000998 self.issue = issue
999 self.patchset = patchset
1000 self.hostname = hostname
1001
1002 @property
1003 def valid(self):
1004 return self.issue is not None
1005
1006
Edward Lemurf38bc172019-09-03 21:02:13 +00001007def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001008 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1009 fail_result = _ParsedIssueNumberArgument()
1010
Edward Lemur678a6842019-10-03 22:25:05 +00001011 if isinstance(arg, int):
1012 return _ParsedIssueNumberArgument(issue=arg)
1013 if not isinstance(arg, basestring):
1014 return fail_result
1015
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001016 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001017 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001018 if not arg.startswith('http'):
1019 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001020
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001021 url = gclient_utils.UpgradeToHttps(arg)
1022 try:
Edward Lemur79d4f992019-11-11 23:49:02 +00001023 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001024 except ValueError:
1025 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001026
Edward Lemur678a6842019-10-03 22:25:05 +00001027 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1028 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1029 # Short urls like https://domain/<issue_number> can be used, but don't allow
1030 # specifying the patchset (you'd 404), but we allow that here.
1031 if parsed_url.path == '/':
1032 part = parsed_url.fragment
1033 else:
1034 part = parsed_url.path
1035
1036 match = re.match(
1037 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1038 if not match:
1039 return fail_result
1040
1041 issue = int(match.group('issue'))
1042 patchset = match.group('patchset')
1043 return _ParsedIssueNumberArgument(
1044 issue=issue,
1045 patchset=int(patchset) if patchset else None,
1046 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001047
1048
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001049def _create_description_from_log(args):
1050 """Pulls out the commit log to use as a base for the CL description."""
1051 log_args = []
1052 if len(args) == 1 and not args[0].endswith('.'):
1053 log_args = [args[0] + '..']
1054 elif len(args) == 1 and args[0].endswith('...'):
1055 log_args = [args[0][:-1]]
1056 elif len(args) == 2:
1057 log_args = [args[0] + '..' + args[1]]
1058 else:
1059 log_args = args[:] # Hope for the best!
1060 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1061
1062
Aaron Gablea45ee112016-11-22 15:14:38 -08001063class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001064 def __init__(self, issue, url):
1065 self.issue = issue
1066 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001067 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001068
1069 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001070 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001071 self.issue, self.url)
1072
1073
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001074_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001075 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001076 # TODO(tandrii): these two aren't known in Gerrit.
1077 'approval', 'disapproval'])
1078
1079
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001080class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001081 """Changelist works with one changelist in local branch.
1082
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001083 Notes:
1084 * Not safe for concurrent multi-{thread,process} use.
1085 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001086 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001087 """
1088
Edward Lemur125d60a2019-09-13 18:25:41 +00001089 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001090 """Create a new ChangeList instance.
1091
Edward Lemurf38bc172019-09-03 21:02:13 +00001092 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001093 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001094 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001095 global settings
1096 if not settings:
1097 # Happens when git_cl.py is used as a utility library.
1098 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001099
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001100 self.branchref = branchref
1101 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001102 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103 self.branch = ShortBranchName(self.branchref)
1104 else:
1105 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001106 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001107 self.lookedup_issue = False
1108 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109 self.has_description = False
1110 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001111 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001112 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001113 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001114 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001115 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001116 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001117
Edward Lemur125d60a2019-09-13 18:25:41 +00001118 # Lazily cached values.
1119 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1120 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1121 # Map from change number (issue) to its detail cache.
1122 self._detail_cache = {}
1123
1124 if codereview_host is not None:
1125 assert not codereview_host.startswith('https://'), codereview_host
1126 self._gerrit_host = codereview_host
1127 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001128
1129 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001130 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001131
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001132 The return value is a string suitable for passing to git cl with the --cc
1133 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001134 """
1135 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001136 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001137 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001138 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1139 return self.cc
1140
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001141 def GetCCListWithoutDefault(self):
1142 """Return the users cc'd on this CL excluding default ones."""
1143 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001144 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001145 return self.cc
1146
Daniel Cheng7227d212017-11-17 08:12:37 -08001147 def ExtendCC(self, more_cc):
1148 """Extends the list of users to cc on this CL based on the changed files."""
1149 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150
1151 def GetBranch(self):
1152 """Returns the short branch name, e.g. 'master'."""
1153 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001154 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001155 if not branchref:
1156 return None
1157 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001158 self.branch = ShortBranchName(self.branchref)
1159 return self.branch
1160
1161 def GetBranchRef(self):
1162 """Returns the full branch name, e.g. 'refs/heads/master'."""
1163 self.GetBranch() # Poke the lazy loader.
1164 return self.branchref
1165
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001166 def ClearBranch(self):
1167 """Clears cached branch data of this object."""
1168 self.branch = self.branchref = None
1169
tandrii5d48c322016-08-18 16:19:37 -07001170 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1171 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1172 kwargs['branch'] = self.GetBranch()
1173 return _git_get_branch_config_value(key, default, **kwargs)
1174
1175 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1176 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1177 assert self.GetBranch(), (
1178 'this CL must have an associated branch to %sset %s%s' %
1179 ('un' if value is None else '',
1180 key,
1181 '' if value is None else ' to %r' % value))
1182 kwargs['branch'] = self.GetBranch()
1183 return _git_set_branch_config_value(key, value, **kwargs)
1184
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001185 @staticmethod
1186 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001187 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001188 e.g. 'origin', 'refs/heads/master'
1189 """
1190 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001191 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1192
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001193 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001194 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001195 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001196 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1197 error_ok=True).strip()
1198 if upstream_branch:
1199 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001200 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001201 # Else, try to guess the origin remote.
1202 remote_branches = RunGit(['branch', '-r']).split()
1203 if 'origin/master' in remote_branches:
1204 # Fall back on origin/master if it exits.
1205 remote = 'origin'
1206 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001207 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001208 DieWithError(
1209 'Unable to determine default branch to diff against.\n'
1210 'Either pass complete "git diff"-style arguments, like\n'
1211 ' git cl upload origin/master\n'
1212 'or verify this branch is set up to track another \n'
1213 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001214
1215 return remote, upstream_branch
1216
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001217 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001218 upstream_branch = self.GetUpstreamBranch()
1219 if not BranchExists(upstream_branch):
1220 DieWithError('The upstream for the current branch (%s) does not exist '
1221 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001222 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001223 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001224
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001225 def GetUpstreamBranch(self):
1226 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001227 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001228 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001229 upstream_branch = upstream_branch.replace('refs/heads/',
1230 'refs/remotes/%s/' % remote)
1231 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1232 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001233 self.upstream_branch = upstream_branch
1234 return self.upstream_branch
1235
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001236 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001237 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001238 remote, branch = None, self.GetBranch()
1239 seen_branches = set()
1240 while branch not in seen_branches:
1241 seen_branches.add(branch)
1242 remote, branch = self.FetchUpstreamTuple(branch)
1243 branch = ShortBranchName(branch)
1244 if remote != '.' or branch.startswith('refs/remotes'):
1245 break
1246 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001247 remotes = RunGit(['remote'], error_ok=True).split()
1248 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001249 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001250 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001251 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001252 logging.warn('Could not determine which remote this change is '
1253 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001254 else:
1255 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001256 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001257 branch = 'HEAD'
1258 if branch.startswith('refs/remotes'):
1259 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001260 elif branch.startswith('refs/branch-heads/'):
1261 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001262 else:
1263 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001264 return self._remote
1265
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001266 def GitSanityChecks(self, upstream_git_obj):
1267 """Checks git repo status and ensures diff is from local commits."""
1268
sbc@chromium.org79706062015-01-14 21:18:12 +00001269 if upstream_git_obj is None:
1270 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001271 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001272 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001273 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001274 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001275 return False
1276
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001277 # Verify the commit we're diffing against is in our current branch.
1278 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1279 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1280 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001281 print('ERROR: %s is not in the current branch. You may need to rebase '
1282 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001283 return False
1284
1285 # List the commits inside the diff, and verify they are all local.
1286 commits_in_diff = RunGit(
1287 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1288 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1289 remote_branch = remote_branch.strip()
1290 if code != 0:
1291 _, remote_branch = self.GetRemoteBranch()
1292
1293 commits_in_remote = RunGit(
1294 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1295
1296 common_commits = set(commits_in_diff) & set(commits_in_remote)
1297 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001298 print('ERROR: Your diff contains %d commits already in %s.\n'
1299 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1300 'the diff. If you are using a custom git flow, you can override'
1301 ' the reference used for this check with "git config '
1302 'gitcl.remotebranch <git-ref>".' % (
1303 len(common_commits), remote_branch, upstream_git_obj),
1304 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001305 return False
1306 return True
1307
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001308 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001309 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001310
1311 Returns None if it is not set.
1312 """
tandrii5d48c322016-08-18 16:19:37 -07001313 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001314
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001315 def GetRemoteUrl(self):
1316 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1317
1318 Returns None if there is no remote.
1319 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001320 is_cached, value = self._cached_remote_url
1321 if is_cached:
1322 return value
1323
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001324 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001325 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1326
Edward Lemur298f2cf2019-02-22 21:40:39 +00001327 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001328 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001329 if host:
1330 self._cached_remote_url = (True, url)
1331 return url
1332
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001333 # If it cannot be parsed as an url, assume it is a local directory,
1334 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001335 logging.warning('"%s" doesn\'t appear to point to a git host. '
1336 'Interpreting it as a local directory.', url)
1337 if not os.path.isdir(url):
1338 logging.error(
1339 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001340 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001341 return None
1342
1343 cache_path = url
1344 url = RunGit(['config', 'remote.%s.url' % remote],
1345 error_ok=True,
1346 cwd=url).strip()
1347
Edward Lemur79d4f992019-11-11 23:49:02 +00001348 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001349 if not host:
1350 logging.error(
1351 'Remote "%(remote)s" for branch "%(branch)s" points to '
1352 '"%(cache_path)s", but it is misconfigured.\n'
1353 '"%(cache_path)s" must be a git repo and must have a remote named '
1354 '"%(remote)s" pointing to the git host.', {
1355 'remote': remote,
1356 'cache_path': cache_path,
1357 'branch': self.GetBranch()})
1358 return None
1359
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001360 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001361 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001362
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001363 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001364 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001365 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001366 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001367 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001368 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001369 return self.issue
1370
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001371 def GetIssueURL(self):
1372 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001373 issue = self.GetIssue()
1374 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001375 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001376 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001377
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001378 def GetDescription(self, pretty=False, force=False):
1379 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001380 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001381 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001382 self.has_description = True
1383 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001384 # Set width to 72 columns + 2 space indent.
1385 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001386 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001387 lines = self.description.splitlines()
1388 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001389 return self.description
1390
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001391 def GetDescriptionFooters(self):
1392 """Returns (non_footer_lines, footers) for the commit message.
1393
1394 Returns:
1395 non_footer_lines (list(str)) - Simple list of description lines without
1396 any footer. The lines do not contain newlines, nor does the list contain
1397 the empty line between the message and the footers.
1398 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1399 [("Change-Id", "Ideadbeef...."), ...]
1400 """
1401 raw_description = self.GetDescription()
1402 msg_lines, _, footers = git_footers.split_footers(raw_description)
1403 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001404 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001405 return msg_lines, footers
1406
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001407 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001408 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001409 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001410 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001411 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001412 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001413 return self.patchset
1414
1415 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001416 """Set this branch's patchset. If patchset=0, clears the patchset."""
1417 assert self.GetBranch()
1418 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001419 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001420 else:
1421 self.patchset = int(patchset)
1422 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001423 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001424
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001425 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001426 """Set this branch's issue. If issue isn't given, clears the issue."""
1427 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001428 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001429 issue = int(issue)
1430 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001431 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001432 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001433 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001434 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001435 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001436 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001437 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001438 else:
tandrii5d48c322016-08-18 16:19:37 -07001439 # Reset all of these just to be clean.
1440 reset_suffixes = [
1441 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001442 self.IssueConfigKey(),
1443 self.PatchsetConfigKey(),
1444 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001445 ] + self._PostUnsetIssueProperties()
1446 for prop in reset_suffixes:
1447 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001448 msg = RunGit(['log', '-1', '--format=%B']).strip()
1449 if msg and git_footers.get_footer_change_id(msg):
1450 print('WARNING: The change patched into this branch has a Change-Id. '
1451 'Removing it.')
1452 RunGit(['commit', '--amend', '-m',
1453 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001454 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001455 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001456 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001457
dnjba1b0f32016-09-02 12:37:42 -07001458 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001459 if not self.GitSanityChecks(upstream_branch):
1460 DieWithError('\nGit sanity check failure')
1461
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001462 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001463 if not root:
1464 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001465 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001466
1467 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001468 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001469 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001470 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001471 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001472 except subprocess2.CalledProcessError:
1473 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001474 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001475 'This branch probably doesn\'t exist anymore. To reset the\n'
1476 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001477 ' git branch --set-upstream-to origin/master %s\n'
1478 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001479 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001480
maruel@chromium.org52424302012-08-29 15:14:30 +00001481 issue = self.GetIssue()
1482 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001483 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001484 description = self.GetDescription()
1485 else:
1486 # If the change was never uploaded, use the log messages of all commits
1487 # up to the branch point, as git cl upload will prefill the description
1488 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001489 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1490 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001491
1492 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001493 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001494 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001495 name,
1496 description,
1497 absroot,
1498 files,
1499 issue,
1500 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001501 author,
1502 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001503
dsansomee2d6fd92016-09-08 00:10:47 -07001504 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001505 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001506 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001507 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001508
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001509 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1510 """Sets the description for this CL remotely.
1511
1512 You can get description_lines and footers with GetDescriptionFooters.
1513
1514 Args:
1515 description_lines (list(str)) - List of CL description lines without
1516 newline characters.
1517 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1518 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1519 `List-Of-Tokens`). It will be case-normalized so that each token is
1520 title-cased.
1521 """
1522 new_description = '\n'.join(description_lines)
1523 if footers:
1524 new_description += '\n'
1525 for k, v in footers:
1526 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1527 if not git_footers.FOOTER_PATTERN.match(foot):
1528 raise ValueError('Invalid footer %r' % foot)
1529 new_description += foot + '\n'
1530 self.UpdateDescription(new_description, force)
1531
Edward Lesmes8e282792018-04-03 18:50:29 -04001532 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001533 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1534 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001535 start = time_time()
1536 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001537 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1538 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001539 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001540 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001541 metrics.collector.add_repeated('sub_commands', {
1542 'command': 'presubmit',
1543 'execution_time': time_time() - start,
1544 'exit_code': 0 if result.should_continue() else 1,
1545 })
1546 return result
vapierfd77ac72016-06-16 08:33:57 -07001547 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001548 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001549
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001550 def CMDUpload(self, options, git_diff_args, orig_args):
1551 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001552 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001553 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001554 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001555 else:
1556 if self.GetBranch() is None:
1557 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1558
1559 # Default to diffing against common ancestor of upstream branch
1560 base_branch = self.GetCommonAncestorWithUpstream()
1561 git_diff_args = [base_branch, 'HEAD']
1562
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001563 # Fast best-effort checks to abort before running potentially expensive
1564 # hooks if uploading is likely to fail anyway. Passing these checks does
1565 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001566 self.EnsureAuthenticated(force=options.force)
1567 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001568
1569 # Apply watchlists on upload.
1570 change = self.GetChange(base_branch, None)
1571 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1572 files = [f.LocalPath() for f in change.AffectedFiles()]
1573 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001574 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001575
1576 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001577 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001578 # Set the reviewer list now so that presubmit checks can access it.
1579 change_description = ChangeDescription(change.FullDescriptionText())
1580 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001581 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001582 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583 change)
1584 change.SetDescriptionText(change_description.description)
1585 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001586 may_prompt=not options.force,
1587 verbose=options.verbose,
1588 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001589 if not hook_results.should_continue():
1590 return 1
1591 if not options.reviewers and hook_results.reviewers:
1592 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001593 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001594
Aaron Gable13101a62018-02-09 13:20:41 -08001595 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001596 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001597 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001598 _git_set_branch_config_value('last-upload-hash',
1599 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001600 # Run post upload hooks, if specified.
1601 if settings.GetRunPostUploadHook():
1602 presubmit_support.DoPostUploadExecuter(
1603 change,
1604 self,
1605 settings.GetRoot(),
1606 options.verbose,
1607 sys.stdout)
1608
1609 # Upload all dependencies if specified.
1610 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001611 print()
1612 print('--dependencies has been specified.')
1613 print('All dependent local branches will be re-uploaded.')
1614 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001615 # Remove the dependencies flag from args so that we do not end up in a
1616 # loop.
1617 orig_args.remove('--dependencies')
1618 ret = upload_branch_deps(self, orig_args)
1619 return ret
1620
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001621 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001622 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001623
1624 Issue must have been already uploaded and known.
1625 """
1626 assert new_state in _CQState.ALL_STATES
1627 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001628 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001629 vote_map = {
1630 _CQState.NONE: 0,
1631 _CQState.DRY_RUN: 1,
1632 _CQState.COMMIT: 2,
1633 }
1634 labels = {'Commit-Queue': vote_map[new_state]}
1635 notify = False if new_state == _CQState.DRY_RUN else None
1636 gerrit_util.SetReview(
1637 self._GetGerritHost(), self._GerritChangeIdentifier(),
1638 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001639 return 0
1640 except KeyboardInterrupt:
1641 raise
1642 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001643 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001644 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001645 ' * Your project has no CQ,\n'
1646 ' * You don\'t have permission to change the CQ state,\n'
1647 ' * There\'s a bug in this code (see stack trace below).\n'
1648 'Consider specifying which bots to trigger manually or asking your '
1649 'project owners for permissions or contacting Chrome Infra at:\n'
1650 'https://www.chromium.org/infra\n\n' %
1651 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001652 # Still raise exception so that stack trace is printed.
1653 raise
1654
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001655 def _GetGerritHost(self):
1656 # Lazy load of configs.
1657 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001658 if self._gerrit_host and '.' not in self._gerrit_host:
1659 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1660 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001661 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001662 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001663 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001664 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001665 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1666 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001667 return self._gerrit_host
1668
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001669 def _GetGitHost(self):
1670 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001671 remote_url = self.GetRemoteUrl()
1672 if not remote_url:
1673 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001674 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001675
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001676 def GetCodereviewServer(self):
1677 if not self._gerrit_server:
1678 # If we're on a branch then get the server potentially associated
1679 # with that branch.
1680 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001681 self._gerrit_server = self._GitGetBranchConfigValue(
1682 self.CodereviewServerConfigKey())
1683 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001684 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001685 if not self._gerrit_server:
1686 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1687 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001688 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001689 parts[0] = parts[0] + '-review'
1690 self._gerrit_host = '.'.join(parts)
1691 self._gerrit_server = 'https://%s' % self._gerrit_host
1692 return self._gerrit_server
1693
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001694 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001695 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001696 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001697 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001698 logging.warn('can\'t detect Gerrit project.')
1699 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001700 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001701 if project.endswith('.git'):
1702 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001703 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1704 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1705 # gitiles/git-over-https protocol. E.g.,
1706 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1707 # as
1708 # https://chromium.googlesource.com/v8/v8
1709 if project.startswith('a/'):
1710 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001711 return project
1712
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001713 def _GerritChangeIdentifier(self):
1714 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1715
1716 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001717 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001718 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001719 project = self._GetGerritProject()
1720 if project:
1721 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1722 # Fall back on still unique, but less efficient change number.
1723 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001724
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001725 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001726 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001727 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001728
tandrii5d48c322016-08-18 16:19:37 -07001729 @classmethod
1730 def PatchsetConfigKey(cls):
1731 return 'gerritpatchset'
1732
1733 @classmethod
1734 def CodereviewServerConfigKey(cls):
1735 return 'gerritserver'
1736
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001737 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001738 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001739 if settings.GetGerritSkipEnsureAuthenticated():
1740 # For projects with unusual authentication schemes.
1741 # See http://crbug.com/603378.
1742 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001743
1744 # Check presence of cookies only if using cookies-based auth method.
1745 cookie_auth = gerrit_util.Authenticator.get()
1746 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001747 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001748
Edward Lemur79d4f992019-11-11 23:49:02 +00001749 if urllib.parse.urlparse(self.GetRemoteUrl()).scheme != 'https':
Daniel Chengcf6269b2019-05-18 01:02:12 +00001750 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001751 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001752 return
1753
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001754 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001755 self.GetCodereviewServer()
1756 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001757 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001758
1759 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1760 git_auth = cookie_auth.get_auth_header(git_host)
1761 if gerrit_auth and git_auth:
1762 if gerrit_auth == git_auth:
1763 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001764 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001765 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001766 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001767 ' %s\n'
1768 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001769 ' Consider running the following command:\n'
1770 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001771 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001772 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001773 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001774 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001775 cookie_auth.get_new_password_message(git_host)))
1776 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001777 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001778 return
1779 else:
1780 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001781 ([] if gerrit_auth else [self._gerrit_host]) +
1782 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001783 DieWithError('Credentials for the following hosts are required:\n'
1784 ' %s\n'
1785 'These are read from %s (or legacy %s)\n'
1786 '%s' % (
1787 '\n '.join(missing),
1788 cookie_auth.get_gitcookies_path(),
1789 cookie_auth.get_netrc_path(),
1790 cookie_auth.get_new_password_message(git_host)))
1791
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001792 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001793 if not self.GetIssue():
1794 return
1795
1796 # Warm change details cache now to avoid RPCs later, reducing latency for
1797 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001798 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001799 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001800
1801 status = self._GetChangeDetail()['status']
1802 if status in ('MERGED', 'ABANDONED'):
1803 DieWithError('Change %s has been %s, new uploads are not allowed' %
1804 (self.GetIssueURL(),
1805 'submitted' if status == 'MERGED' else 'abandoned'))
1806
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001807 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1808 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1809 # Apparently this check is not very important? Otherwise get_auth_email
1810 # could have been added to other implementations of Authenticator.
1811 cookies_auth = gerrit_util.Authenticator.get()
1812 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001813 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001814
1815 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001816 if self.GetIssueOwner() == cookies_user:
1817 return
1818 logging.debug('change %s owner is %s, cookies user is %s',
1819 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001820 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001821 # so ask what Gerrit thinks of this user.
1822 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1823 if details['email'] == self.GetIssueOwner():
1824 return
1825 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001826 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001827 'as %s.\n'
1828 'Uploading may fail due to lack of permissions.' %
1829 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1830 confirm_or_exit(action='upload')
1831
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001832 def _PostUnsetIssueProperties(self):
1833 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001834 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001835
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001836 def GetGerritObjForPresubmit(self):
1837 return presubmit_support.GerritAccessor(self._GetGerritHost())
1838
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001839 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001840 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001841 or CQ status, assuming adherence to a common workflow.
1842
1843 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001844 * 'error' - error from review tool (including deleted issues)
1845 * 'unsent' - no reviewers added
1846 * 'waiting' - waiting for review
1847 * 'reply' - waiting for uploader to reply to review
1848 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001849 * 'dry-run' - dry-running in the CQ
1850 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001851 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001852 """
1853 if not self.GetIssue():
1854 return None
1855
1856 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001857 data = self._GetChangeDetail([
1858 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001859 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001860 return 'error'
1861
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001862 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001863 return 'closed'
1864
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001865 cq_label = data['labels'].get('Commit-Queue', {})
1866 max_cq_vote = 0
1867 for vote in cq_label.get('all', []):
1868 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1869 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001870 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001871 if max_cq_vote == 1:
1872 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001873
Aaron Gable9ab38c62017-04-06 14:36:33 -07001874 if data['labels'].get('Code-Review', {}).get('approved'):
1875 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001876
1877 if not data.get('reviewers', {}).get('REVIEWER', []):
1878 return 'unsent'
1879
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001880 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001881 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001882 last_message_author = messages.pop().get('author', {})
1883 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001884 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1885 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001886 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001887 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001888 if last_message_author.get('_account_id') == owner:
1889 # Most recent message was by owner.
1890 return 'waiting'
1891 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001892 # Some reply from non-owner.
1893 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001894
1895 # Somehow there are no messages even though there are reviewers.
1896 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001897
1898 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001899 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001900 patchset = data['revisions'][data['current_revision']]['_number']
1901 self.SetPatchset(patchset)
1902 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001904 def FetchDescription(self, force=False):
1905 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1906 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001907 current_rev = data['current_revision']
Edward Lemur79d4f992019-11-11 23:49:02 +00001908 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001909
dsansomee2d6fd92016-09-08 00:10:47 -07001910 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001911 if gerrit_util.HasPendingChangeEdit(
1912 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001913 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001914 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001915 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001916 'unpublished edit. Either publish the edit in the Gerrit web UI '
1917 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001918
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001919 gerrit_util.DeletePendingChangeEdit(
1920 self._GetGerritHost(), self._GerritChangeIdentifier())
1921 gerrit_util.SetCommitMessage(
1922 self._GetGerritHost(), self._GerritChangeIdentifier(),
1923 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001924
Aaron Gable636b13f2017-07-14 10:42:48 -07001925 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001926 gerrit_util.SetReview(
1927 self._GetGerritHost(), self._GerritChangeIdentifier(),
1928 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001929
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001930 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001931 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001932 # CURRENT_REVISION is included to get the latest patchset so that
1933 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001934 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001935 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1936 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001937 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001938 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001939 robot_file_comments = gerrit_util.GetChangeRobotComments(
1940 self._GetGerritHost(), self._GerritChangeIdentifier())
1941
1942 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001943 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001944 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001945 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001946 line_comments = file_comments.setdefault(path, [])
1947 line_comments.extend(
1948 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001949
1950 # Build dictionary of file comments for easy access and sorting later.
1951 # {author+date: {path: {patchset: {line: url+message}}}}
1952 comments = collections.defaultdict(
1953 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001954 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001955 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001956 tag = comment.get('tag', '')
1957 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001958 continue
1959 key = (comment['author']['email'], comment['updated'])
1960 if comment.get('side', 'REVISION') == 'PARENT':
1961 patchset = 'Base'
1962 else:
1963 patchset = 'PS%d' % comment['patch_set']
1964 line = comment.get('line', 0)
1965 url = ('https://%s/c/%s/%s/%s#%s%s' %
1966 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1967 'b' if comment.get('side') == 'PARENT' else '',
1968 str(line) if line else ''))
1969 comments[key][path][patchset][line] = (url, comment['message'])
1970
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001971 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001972 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001973 summary = self._BuildCommentSummary(msg, comments, readable)
1974 if summary:
1975 summaries.append(summary)
1976 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001977
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001978 @staticmethod
1979 def _BuildCommentSummary(msg, comments, readable):
1980 key = (msg['author']['email'], msg['date'])
1981 # Don't bother showing autogenerated messages that don't have associated
1982 # file or line comments. this will filter out most autogenerated
1983 # messages, but will keep robot comments like those from Tricium.
1984 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1985 if is_autogenerated and not comments.get(key):
1986 return None
1987 message = msg['message']
1988 # Gerrit spits out nanoseconds.
1989 assert len(msg['date'].split('.')[-1]) == 9
1990 date = datetime.datetime.strptime(msg['date'][:-3],
1991 '%Y-%m-%d %H:%M:%S.%f')
1992 if key in comments:
1993 message += '\n'
1994 for path, patchsets in sorted(comments.get(key, {}).items()):
1995 if readable:
1996 message += '\n%s' % path
1997 for patchset, lines in sorted(patchsets.items()):
1998 for line, (url, content) in sorted(lines.items()):
1999 if line:
2000 line_str = 'Line %d' % line
2001 path_str = '%s:%d:' % (path, line)
2002 else:
2003 line_str = 'File comment'
2004 path_str = '%s:0:' % path
2005 if readable:
2006 message += '\n %s, %s: %s' % (patchset, line_str, url)
2007 message += '\n %s\n' % content
2008 else:
2009 message += '\n%s ' % path_str
2010 message += '\n%s\n' % content
2011
2012 return _CommentSummary(
2013 date=date,
2014 message=message,
2015 sender=msg['author']['email'],
2016 autogenerated=is_autogenerated,
2017 # These could be inferred from the text messages and correlated with
2018 # Code-Review label maximum, however this is not reliable.
2019 # Leaving as is until the need arises.
2020 approval=False,
2021 disapproval=False,
2022 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002023
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002024 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002025 gerrit_util.AbandonChange(
2026 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002027
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002028 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002029 gerrit_util.SubmitChange(
2030 self._GetGerritHost(), self._GerritChangeIdentifier(),
2031 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002032
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002033 def _GetChangeDetail(self, options=None, no_cache=False):
2034 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002035
2036 If fresh data is needed, set no_cache=True which will clear cache and
2037 thus new data will be fetched from Gerrit.
2038 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002039 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002040 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002041
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002042 # Optimization to avoid multiple RPCs:
2043 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2044 'CURRENT_COMMIT' not in options):
2045 options.append('CURRENT_COMMIT')
2046
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002047 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002048 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002049 options = [o.upper() for o in options]
2050
2051 # Check in cache first unless no_cache is True.
2052 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002053 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002054 else:
2055 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002056 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002057 # Assumption: data fetched before with extra options is suitable
2058 # for return for a smaller set of options.
2059 # For example, if we cached data for
2060 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2061 # and request is for options=[CURRENT_REVISION],
2062 # THEN we can return prior cached data.
2063 if options_set.issubset(cached_options_set):
2064 return data
2065
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002066 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002067 data = gerrit_util.GetChangeDetail(
2068 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002069 except gerrit_util.GerritError as e:
2070 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002071 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002072 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002073
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002074 self._detail_cache.setdefault(cache_key, []).append(
2075 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002076 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002077
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002078 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002079 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002080 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002081 data = gerrit_util.GetChangeCommit(
2082 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002083 except gerrit_util.GerritError as e:
2084 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002085 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002086 raise
agable32978d92016-11-01 12:55:02 -07002087 return data
2088
Karen Qian40c19422019-03-13 21:28:29 +00002089 def _IsCqConfigured(self):
2090 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002091 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002092
Olivier Robin75ee7252018-04-13 10:02:56 +02002093 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002094 if git_common.is_dirty_git_tree('land'):
2095 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002096
tandriid60367b2016-06-22 05:25:12 -07002097 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002098 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002099 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002100 'which can test and land changes for you. '
2101 'Are you sure you wish to bypass it?\n',
2102 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002103 differs = True
tandriic4344b52016-08-29 06:04:54 -07002104 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002105 # Note: git diff outputs nothing if there is no diff.
2106 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002107 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002108 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002109 if detail['current_revision'] == last_upload:
2110 differs = False
2111 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002112 print('WARNING: Local branch contents differ from latest uploaded '
2113 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002114 if differs:
2115 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002116 confirm_or_exit(
2117 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2118 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002119 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002120 elif not bypass_hooks:
2121 hook_results = self.RunHook(
2122 committing=True,
2123 may_prompt=not force,
2124 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002125 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2126 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002127 if not hook_results.should_continue():
2128 return 1
2129
2130 self.SubmitIssue(wait_for_merge=True)
2131 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002132 links = self._GetChangeCommit().get('web_links', [])
2133 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002134 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002135 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002136 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002137 return 0
2138
Edward Lemurf38bc172019-09-03 21:02:13 +00002139 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002140 assert parsed_issue_arg.valid
2141
Edward Lemur125d60a2019-09-13 18:25:41 +00002142 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002143
2144 if parsed_issue_arg.hostname:
2145 self._gerrit_host = parsed_issue_arg.hostname
2146 self._gerrit_server = 'https://%s' % self._gerrit_host
2147
tandriic2405f52016-10-10 08:13:15 -07002148 try:
2149 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002150 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002151 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002152
2153 if not parsed_issue_arg.patchset:
2154 # Use current revision by default.
2155 revision_info = detail['revisions'][detail['current_revision']]
2156 patchset = int(revision_info['_number'])
2157 else:
2158 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002159 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002160 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2161 break
2162 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002163 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164 (parsed_issue_arg.patchset, self.GetIssue()))
2165
Edward Lemur125d60a2019-09-13 18:25:41 +00002166 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002167 if remote_url.endswith('.git'):
2168 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002169 remote_url = remote_url.rstrip('/')
2170
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002171 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002172 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002173
2174 if remote_url != fetch_info['url']:
2175 DieWithError('Trying to patch a change from %s but this repo appears '
2176 'to be %s.' % (fetch_info['url'], remote_url))
2177
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002178 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002179
Aaron Gable62619a32017-06-16 08:22:09 -07002180 if force:
2181 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2182 print('Checked out commit for change %i patchset %i locally' %
2183 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002184 elif nocommit:
2185 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2186 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002187 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002188 RunGit(['cherry-pick', 'FETCH_HEAD'])
2189 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002190 (parsed_issue_arg.issue, patchset))
2191 print('Note: this created a local commit which does not have '
2192 'the same hash as the one uploaded for review. This will make '
2193 'uploading changes based on top of this branch difficult.\n'
2194 'If you want to do that, use "git cl patch --force" instead.')
2195
Stefan Zagerd08043c2017-10-12 12:07:02 -07002196 if self.GetBranch():
2197 self.SetIssue(parsed_issue_arg.issue)
2198 self.SetPatchset(patchset)
2199 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2200 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2201 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2202 else:
2203 print('WARNING: You are in detached HEAD state.\n'
2204 'The patch has been applied to your checkout, but you will not be '
2205 'able to upload a new patch set to the gerrit issue.\n'
2206 'Try using the \'-b\' option if you would like to work on a '
2207 'branch and/or upload a new patch set.')
2208
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002209 return 0
2210
tandrii16e0b4e2016-06-07 10:34:28 -07002211 def _GerritCommitMsgHookCheck(self, offer_removal):
2212 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2213 if not os.path.exists(hook):
2214 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002215 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2216 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002217 data = gclient_utils.FileRead(hook)
2218 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2219 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002220 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002221 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002222 'and may interfere with it in subtle ways.\n'
2223 'We recommend you remove the commit-msg hook.')
2224 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002225 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002226 gclient_utils.rm_file_or_tree(hook)
2227 print('Gerrit commit-msg hook removed.')
2228 else:
2229 print('OK, will keep Gerrit commit-msg hook in place.')
2230
Edward Lemur1b52d872019-05-09 21:12:12 +00002231 def _CleanUpOldTraces(self):
2232 """Keep only the last |MAX_TRACES| traces."""
2233 try:
2234 traces = sorted([
2235 os.path.join(TRACES_DIR, f)
2236 for f in os.listdir(TRACES_DIR)
2237 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2238 and not f.startswith('tmp'))
2239 ])
2240 traces_to_delete = traces[:-MAX_TRACES]
2241 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002242 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002243 except OSError:
2244 print('WARNING: Failed to remove old git traces from\n'
2245 ' %s'
2246 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002247
Edward Lemur5737f022019-05-17 01:24:00 +00002248 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002249 """Zip and write the git push traces stored in traces_dir."""
2250 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002251 traces_zip = trace_name + '-traces'
2252 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002253 # Create a temporary dir to store git config and gitcookies in. It will be
2254 # compressed and stored next to the traces.
2255 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002256 git_info_zip = trace_name + '-git-info'
2257
Edward Lemur5737f022019-05-17 01:24:00 +00002258 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002259 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002260 git_push_metadata['now'] = git_push_metadata['now'].decode(
2261 sys.stdin.encoding)
2262
Edward Lemur1b52d872019-05-09 21:12:12 +00002263 git_push_metadata['trace_name'] = trace_name
2264 gclient_utils.FileWrite(
2265 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2266
2267 # Keep only the first 6 characters of the git hashes on the packet
2268 # trace. This greatly decreases size after compression.
2269 packet_traces = os.path.join(traces_dir, 'trace-packet')
2270 if os.path.isfile(packet_traces):
2271 contents = gclient_utils.FileRead(packet_traces)
2272 gclient_utils.FileWrite(
2273 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2274 shutil.make_archive(traces_zip, 'zip', traces_dir)
2275
2276 # Collect and compress the git config and gitcookies.
2277 git_config = RunGit(['config', '-l'])
2278 gclient_utils.FileWrite(
2279 os.path.join(git_info_dir, 'git-config'),
2280 git_config)
2281
2282 cookie_auth = gerrit_util.Authenticator.get()
2283 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2284 gitcookies_path = cookie_auth.get_gitcookies_path()
2285 if os.path.isfile(gitcookies_path):
2286 gitcookies = gclient_utils.FileRead(gitcookies_path)
2287 gclient_utils.FileWrite(
2288 os.path.join(git_info_dir, 'gitcookies'),
2289 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2290 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2291
Edward Lemur1b52d872019-05-09 21:12:12 +00002292 gclient_utils.rmtree(git_info_dir)
2293
2294 def _RunGitPushWithTraces(
2295 self, change_desc, refspec, refspec_opts, git_push_metadata):
2296 """Run git push and collect the traces resulting from the execution."""
2297 # Create a temporary directory to store traces in. Traces will be compressed
2298 # and stored in a 'traces' dir inside depot_tools.
2299 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002300 trace_name = os.path.join(
2301 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002302
2303 env = os.environ.copy()
2304 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2305 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002306 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002307 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2308 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2309 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2310
2311 try:
2312 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002313 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002314 before_push = time_time()
2315 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002316 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002317 env=env,
2318 print_stdout=True,
2319 # Flush after every line: useful for seeing progress when running as
2320 # recipe.
2321 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002322 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002323 except subprocess2.CalledProcessError as e:
2324 push_returncode = e.returncode
2325 DieWithError('Failed to create a change. Please examine output above '
2326 'for the reason of the failure.\n'
2327 'Hint: run command below to diagnose common Git/Gerrit '
2328 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002329 ' git cl creds-check\n'
2330 '\n'
2331 'If git-cl is not working correctly, file a bug under the '
2332 'Infra>SDK component including the files below.\n'
2333 'Review the files before upload, since they might contain '
2334 'sensitive information.\n'
2335 'Set the Restrict-View-Google label so that they are not '
2336 'publicly accessible.\n'
2337 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002338 change_desc)
2339 finally:
2340 execution_time = time_time() - before_push
2341 metrics.collector.add_repeated('sub_commands', {
2342 'command': 'git push',
2343 'execution_time': execution_time,
2344 'exit_code': push_returncode,
2345 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2346 })
2347
Edward Lemur1b52d872019-05-09 21:12:12 +00002348 git_push_metadata['execution_time'] = execution_time
2349 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002350 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002351
Edward Lemur1b52d872019-05-09 21:12:12 +00002352 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002353 gclient_utils.rmtree(traces_dir)
2354
2355 return push_stdout
2356
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002357 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002358 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002359 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002360 # Load default for user, repo, squash=true, in this order.
2361 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002362
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002363 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002364 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002365 # This may be None; default fallback value is determined in logic below.
2366 title = options.title
2367
Dominic Battre7d1c4842017-10-27 09:17:28 +02002368 # Extract bug number from branch name.
2369 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002370 fixed = options.fixed
2371 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2372 self.GetBranch())
2373 if not bug and not fixed and match:
2374 if match.group('type') == 'bug':
2375 bug = match.group('bugnum')
2376 else:
2377 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002378
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002380 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002381 if self.GetIssue():
2382 # Try to get the message from a previous upload.
2383 message = self.GetDescription()
2384 if not message:
2385 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002386 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002387 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002388 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002389 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002390 # When uploading a subsequent patchset, -m|--message is taken
2391 # as the patchset title if --title was not provided.
2392 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002393 else:
2394 default_title = RunGit(
2395 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002396 if options.force:
2397 title = default_title
2398 else:
2399 title = ask_for_data(
2400 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002401 change_id = self._GetChangeDetail()['change_id']
2402 while True:
2403 footer_change_ids = git_footers.get_footer_change_id(message)
2404 if footer_change_ids == [change_id]:
2405 break
2406 if not footer_change_ids:
2407 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002408 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409 continue
2410 # There is already a valid footer but with different or several ids.
2411 # Doing this automatically is non-trivial as we don't want to lose
2412 # existing other footers, yet we want to append just 1 desired
2413 # Change-Id. Thus, just create a new footer, but let user verify the
2414 # new description.
2415 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002416 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002417 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002418 print(
2419 'WARNING: change %s has Change-Id footer(s):\n'
2420 ' %s\n'
2421 'but change has Change-Id %s, according to Gerrit.\n'
2422 'Please, check the proposed correction to the description, '
2423 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2424 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2425 change_id))
2426 confirm_or_exit(action='edit')
2427 change_desc.prompt()
2428
2429 message = change_desc.description
2430 if not message:
2431 DieWithError("Description is empty. Aborting...")
2432
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002433 # Continue the while loop.
2434 # Sanity check of this code - we should end up with proper message
2435 # footer.
2436 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002437 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002438 else: # if not self.GetIssue()
2439 if options.message:
2440 message = options.message
2441 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002442 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002443 if options.title:
2444 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002445 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002446 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002447 change_desc.prompt()
2448
Aaron Gableb56ad332017-01-06 15:24:31 -08002449 # On first upload, patchset title is always this string, while
2450 # --title flag gets converted to first line of message.
2451 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002452 if not change_desc.description:
2453 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002454 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002455 if len(change_ids) > 1:
2456 DieWithError('too many Change-Id footers, at most 1 allowed.')
2457 if not change_ids:
2458 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002459 change_desc.set_description(git_footers.add_footer_change_id(
2460 change_desc.description,
2461 GenerateGerritChangeId(change_desc.description)))
2462 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002463 assert len(change_ids) == 1
2464 change_id = change_ids[0]
2465
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002466 if options.reviewers or options.tbrs or options.add_owners_to:
2467 change_desc.update_reviewers(options.reviewers, options.tbrs,
2468 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002469 if options.preserve_tryjobs:
2470 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002471
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002472 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002473 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2474 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002475 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lesmesf6a22322019-11-04 22:14:39 +00002476 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
Edward Lemur79d4f992019-11-11 23:49:02 +00002477 desc_tempfile.write(change_desc.description.encode('utf-8', 'replace'))
Aaron Gable9a03ae02017-11-03 11:31:07 -07002478 desc_tempfile.close()
2479 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2480 '-F', desc_tempfile.name]).strip()
2481 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002482 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002483 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002484 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002485 if not change_desc.description:
2486 DieWithError("Description is empty. Aborting...")
2487
2488 if not git_footers.get_footer_change_id(change_desc.description):
2489 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002490 change_desc.set_description(
2491 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002492 if options.reviewers or options.tbrs or options.add_owners_to:
2493 change_desc.update_reviewers(options.reviewers, options.tbrs,
2494 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002495 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002496 # For no-squash mode, we assume the remote called "origin" is the one we
2497 # want. It is not worthwhile to support different workflows for
2498 # no-squash mode.
2499 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002500 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2501
2502 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002503 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002504 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2505 ref_to_push)]).splitlines()
2506 if len(commits) > 1:
2507 print('WARNING: This will upload %d commits. Run the following command '
2508 'to see which commits will be uploaded: ' % len(commits))
2509 print('git log %s..%s' % (parent, ref_to_push))
2510 print('You can also use `git squash-branch` to squash these into a '
2511 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002512 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002513
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002514 if options.reviewers or options.tbrs or options.add_owners_to:
2515 change_desc.update_reviewers(options.reviewers, options.tbrs,
2516 options.add_owners_to, change)
2517
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002518 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002519 cc = []
2520 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2521 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2522 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002523 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002524 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002525 if options.cc:
2526 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002527 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002528 if change_desc.get_cced():
2529 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002530 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2531 valid_accounts = set(reviewers + cc)
2532 # TODO(crbug/877717): relax this for all hosts.
2533 else:
2534 valid_accounts = gerrit_util.ValidAccounts(
2535 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002536 logging.info('accounts %s are recognized, %s invalid',
2537 sorted(valid_accounts),
2538 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002539
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002540 # Extra options that can be specified at push time. Doc:
2541 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002542 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002543
Aaron Gable844cf292017-06-28 11:32:59 -07002544 # By default, new changes are started in WIP mode, and subsequent patchsets
2545 # don't send email. At any time, passing --send-mail will mark the change
2546 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002547 if options.send_mail:
2548 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002549 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002550 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002551 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002552 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002553 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002554
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002555 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002556 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002557
Aaron Gable9b713dd2016-12-14 16:04:21 -08002558 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002559 # Punctuation and whitespace in |title| must be percent-encoded.
2560 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002561
agablec6787972016-09-09 16:13:34 -07002562 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002563 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002564
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002565 for r in sorted(reviewers):
2566 if r in valid_accounts:
2567 refspec_opts.append('r=%s' % r)
2568 reviewers.remove(r)
2569 else:
2570 # TODO(tandrii): this should probably be a hard failure.
2571 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2572 % r)
2573 for c in sorted(cc):
2574 # refspec option will be rejected if cc doesn't correspond to an
2575 # account, even though REST call to add such arbitrary cc may succeed.
2576 if c in valid_accounts:
2577 refspec_opts.append('cc=%s' % c)
2578 cc.remove(c)
2579
rmistry9eadede2016-09-19 11:22:43 -07002580 if options.topic:
2581 # Documentation on Gerrit topics is here:
2582 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002583 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002584
Edward Lemur687ca902018-12-05 02:30:30 +00002585 if options.enable_auto_submit:
2586 refspec_opts.append('l=Auto-Submit+1')
2587 if options.use_commit_queue:
2588 refspec_opts.append('l=Commit-Queue+2')
2589 elif options.cq_dry_run:
2590 refspec_opts.append('l=Commit-Queue+1')
2591
2592 if change_desc.get_reviewers(tbr_only=True):
2593 score = gerrit_util.GetCodeReviewTbrScore(
2594 self._GetGerritHost(),
2595 self._GetGerritProject())
2596 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002597
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002598 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002599 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002600 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002601 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002602 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2603
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002604 refspec_suffix = ''
2605 if refspec_opts:
2606 refspec_suffix = '%' + ','.join(refspec_opts)
2607 assert ' ' not in refspec_suffix, (
2608 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2609 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2610
Edward Lemur1b52d872019-05-09 21:12:12 +00002611 git_push_metadata = {
2612 'gerrit_host': self._GetGerritHost(),
2613 'title': title or '<untitled>',
2614 'change_id': change_id,
2615 'description': change_desc.description,
2616 }
2617 push_stdout = self._RunGitPushWithTraces(
2618 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002619
2620 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002621 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002622 change_numbers = [m.group(1)
2623 for m in map(regex.match, push_stdout.splitlines())
2624 if m]
2625 if len(change_numbers) != 1:
2626 DieWithError(
2627 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002628 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002629 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002630 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002631
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002632 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002633 # GetIssue() is not set in case of non-squash uploads according to tests.
2634 # TODO(agable): non-squash uploads in git cl should be removed.
2635 gerrit_util.AddReviewers(
2636 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002637 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002638 reviewers, cc,
2639 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002640
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002641 return 0
2642
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002643 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2644 change_desc):
2645 """Computes parent of the generated commit to be uploaded to Gerrit.
2646
2647 Returns revision or a ref name.
2648 """
2649 if custom_cl_base:
2650 # Try to avoid creating additional unintended CLs when uploading, unless
2651 # user wants to take this risk.
2652 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2653 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2654 local_ref_of_target_remote])
2655 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002656 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002657 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2658 'If you proceed with upload, more than 1 CL may be created by '
2659 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2660 'If you are certain that specified base `%s` has already been '
2661 'uploaded to Gerrit as another CL, you may proceed.\n' %
2662 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2663 if not force:
2664 confirm_or_exit(
2665 'Do you take responsibility for cleaning up potential mess '
2666 'resulting from proceeding with upload?',
2667 action='upload')
2668 return custom_cl_base
2669
Aaron Gablef97e33d2017-03-30 15:44:27 -07002670 if remote != '.':
2671 return self.GetCommonAncestorWithUpstream()
2672
2673 # If our upstream branch is local, we base our squashed commit on its
2674 # squashed version.
2675 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2676
Aaron Gablef97e33d2017-03-30 15:44:27 -07002677 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002678 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002679
2680 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002681 # TODO(tandrii): consider checking parent change in Gerrit and using its
2682 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2683 # the tree hash of the parent branch. The upside is less likely bogus
2684 # requests to reupload parent change just because it's uploadhash is
2685 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002686 parent = RunGit(['config',
2687 'branch.%s.gerritsquashhash' % upstream_branch_name],
2688 error_ok=True).strip()
2689 # Verify that the upstream branch has been uploaded too, otherwise
2690 # Gerrit will create additional CLs when uploading.
2691 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2692 RunGitSilent(['rev-parse', parent + ':'])):
2693 DieWithError(
2694 '\nUpload upstream branch %s first.\n'
2695 'It is likely that this branch has been rebased since its last '
2696 'upload, so you just need to upload it again.\n'
2697 '(If you uploaded it with --no-squash, then branch dependencies '
2698 'are not supported, and you should reupload with --squash.)'
2699 % upstream_branch_name,
2700 change_desc)
2701 return parent
2702
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002703 def _AddChangeIdToCommitMessage(self, options, args):
2704 """Re-commits using the current message, assumes the commit hook is in
2705 place.
2706 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002707 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002708 git_command = ['commit', '--amend', '-m', log_desc]
2709 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002710 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002711 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002712 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002713 return new_log_desc
2714 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002715 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002716
tandriie113dfd2016-10-11 10:20:12 -07002717 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002718 try:
2719 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002720 except GerritChangeNotExists:
2721 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002722
2723 if data['status'] in ('ABANDONED', 'MERGED'):
2724 return 'CL %s is closed' % self.GetIssue()
2725
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002726 def GetGerritChange(self, patchset=None):
2727 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002728 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002729 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002730 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002731 data = self._GetChangeDetail(['ALL_REVISIONS'])
2732
2733 assert host and issue and patchset, 'CL must be uploaded first'
2734
2735 has_patchset = any(
2736 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002737 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002738 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002739 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002740 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002741
tandrii8c5a3532016-11-04 07:52:02 -07002742 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002743 'host': host,
2744 'change': issue,
2745 'project': data['project'],
2746 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002747 }
tandriie113dfd2016-10-11 10:20:12 -07002748
tandriide281ae2016-10-12 06:02:30 -07002749 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002750 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002751
Edward Lemur707d70b2018-02-07 00:50:14 +01002752 def GetReviewers(self):
2753 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002754 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002755
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002756
2757_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002758 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002759}
2760
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002761
iannuccie53c9352016-08-17 14:40:40 -07002762def _add_codereview_issue_select_options(parser, extra=""):
2763 _add_codereview_select_options(parser)
2764
2765 text = ('Operate on this issue number instead of the current branch\'s '
2766 'implicit issue.')
2767 if extra:
2768 text += ' '+extra
2769 parser.add_option('-i', '--issue', type=int, help=text)
2770
2771
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002772def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002773 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002774 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002775 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002776 parser.add_option_group(parser.codereview_group)
2777 parser.codereview_group.add_option(
2778 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002779 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002780
2781
tandriif9aefb72016-07-01 09:06:51 -07002782def _get_bug_line_values(default_project, bugs):
2783 """Given default_project and comma separated list of bugs, yields bug line
2784 values.
2785
2786 Each bug can be either:
2787 * a number, which is combined with default_project
2788 * string, which is left as is.
2789
2790 This function may produce more than one line, because bugdroid expects one
2791 project per line.
2792
2793 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2794 ['v8:123', 'chromium:789']
2795 """
2796 default_bugs = []
2797 others = []
2798 for bug in bugs.split(','):
2799 bug = bug.strip()
2800 if bug:
2801 try:
2802 default_bugs.append(int(bug))
2803 except ValueError:
2804 others.append(bug)
2805
2806 if default_bugs:
2807 default_bugs = ','.join(map(str, default_bugs))
2808 if default_project:
2809 yield '%s:%s' % (default_project, default_bugs)
2810 else:
2811 yield default_bugs
2812 for other in sorted(others):
2813 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2814 yield other
2815
2816
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002817class ChangeDescription(object):
2818 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002819 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002820 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002821 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002822 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002823 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002824 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2825 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002826 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002827 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002828
Dan Beamd8b04ca2019-10-10 21:23:26 +00002829 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002830 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002831 if bug:
2832 regexp = re.compile(self.BUG_LINE)
2833 prefix = settings.GetBugPrefix()
2834 if not any((regexp.match(line) for line in self._description_lines)):
2835 values = list(_get_bug_line_values(prefix, bug))
2836 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002837 if fixed:
2838 regexp = re.compile(self.FIXED_LINE)
2839 prefix = settings.GetBugPrefix()
2840 if not any((regexp.match(line) for line in self._description_lines)):
2841 values = list(_get_bug_line_values(prefix, fixed))
2842 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002843
agable@chromium.org42c20792013-09-12 17:34:49 +00002844 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002845 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002846 return '\n'.join(self._description_lines)
2847
2848 def set_description(self, desc):
2849 if isinstance(desc, basestring):
2850 lines = desc.splitlines()
2851 else:
2852 lines = [line.rstrip() for line in desc]
2853 while lines and not lines[0]:
2854 lines.pop(0)
2855 while lines and not lines[-1]:
2856 lines.pop(-1)
2857 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002858
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002859 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2860 """Rewrites the R=/TBR= line(s) as a single line each.
2861
2862 Args:
2863 reviewers (list(str)) - list of additional emails to use for reviewers.
2864 tbrs (list(str)) - list of additional emails to use for TBRs.
2865 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2866 the change that are missing OWNER coverage. If this is not None, you
2867 must also pass a value for `change`.
2868 change (Change) - The Change that should be used for OWNERS lookups.
2869 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002870 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002871 assert isinstance(tbrs, list), tbrs
2872
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002873 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002874 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002875
2876 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002877 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002878
2879 reviewers = set(reviewers)
2880 tbrs = set(tbrs)
2881 LOOKUP = {
2882 'TBR': tbrs,
2883 'R': reviewers,
2884 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002885
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002886 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002887 regexp = re.compile(self.R_LINE)
2888 matches = [regexp.match(line) for line in self._description_lines]
2889 new_desc = [l for i, l in enumerate(self._description_lines)
2890 if not matches[i]]
2891 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892
agable@chromium.org42c20792013-09-12 17:34:49 +00002893 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002894
2895 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002896 for match in matches:
2897 if not match:
2898 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002899 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2900
2901 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002902 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002903 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002904 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002905 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002906 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002907 LOOKUP[add_owners_to].update(
2908 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002909
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002910 # If any folks ended up in both groups, remove them from tbrs.
2911 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002912
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002913 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2914 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002915
2916 # Put the new lines in the description where the old first R= line was.
2917 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2918 if 0 <= line_loc < len(self._description_lines):
2919 if new_tbr_line:
2920 self._description_lines.insert(line_loc, new_tbr_line)
2921 if new_r_line:
2922 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002923 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002924 if new_r_line:
2925 self.append_footer(new_r_line)
2926 if new_tbr_line:
2927 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002928
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002929 def set_preserve_tryjobs(self):
2930 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2931 footers = git_footers.parse_footers(self.description)
2932 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2933 if v.lower() == 'true':
2934 return
2935 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2936
Anthony Polito8b955342019-09-24 19:01:36 +00002937 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002938 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002939 self.set_description([
2940 '# Enter a description of the change.',
2941 '# This will be displayed on the codereview site.',
2942 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002943 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002944 '--------------------',
2945 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002946 bug_regexp = re.compile(self.BUG_LINE)
2947 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002948 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002949 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2950 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002951 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002952
agable@chromium.org42c20792013-09-12 17:34:49 +00002953 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002954 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002955 if not content:
2956 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002957 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002958
Bruce Dawson2377b012018-01-11 16:46:49 -08002959 # Strip off comments and default inserted "Bug:" line.
2960 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002961 (line.startswith('#') or
2962 line.rstrip() == "Bug:" or
2963 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002964 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002965 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002966 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002967
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002968 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002969 """Adds a footer line to the description.
2970
2971 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2972 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2973 that Gerrit footers are always at the end.
2974 """
2975 parsed_footer_line = git_footers.parse_footer(line)
2976 if parsed_footer_line:
2977 # Line is a gerrit footer in the form: Footer-Key: any value.
2978 # Thus, must be appended observing Gerrit footer rules.
2979 self.set_description(
2980 git_footers.add_footer(self.description,
2981 key=parsed_footer_line[0],
2982 value=parsed_footer_line[1]))
2983 return
2984
2985 if not self._description_lines:
2986 self._description_lines.append(line)
2987 return
2988
2989 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2990 if gerrit_footers:
2991 # git_footers.split_footers ensures that there is an empty line before
2992 # actual (gerrit) footers, if any. We have to keep it that way.
2993 assert top_lines and top_lines[-1] == ''
2994 top_lines, separator = top_lines[:-1], top_lines[-1:]
2995 else:
2996 separator = [] # No need for separator if there are no gerrit_footers.
2997
2998 prev_line = top_lines[-1] if top_lines else ''
2999 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3000 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3001 top_lines.append('')
3002 top_lines.append(line)
3003 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003004
tandrii99a72f22016-08-17 14:33:24 -07003005 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003006 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003007 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003008 reviewers = [match.group(2).strip()
3009 for match in matches
3010 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003011 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003012
bradnelsond975b302016-10-23 12:20:23 -07003013 def get_cced(self):
3014 """Retrieves the list of reviewers."""
3015 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3016 cced = [match.group(2).strip() for match in matches if match]
3017 return cleanup_list(cced)
3018
Nodir Turakulov23b82142017-11-16 11:04:25 -08003019 def get_hash_tags(self):
3020 """Extracts and sanitizes a list of Gerrit hashtags."""
3021 subject = (self._description_lines or ('',))[0]
3022 subject = re.sub(
3023 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3024
3025 tags = []
3026 start = 0
3027 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3028 while True:
3029 m = bracket_exp.match(subject, start)
3030 if not m:
3031 break
3032 tags.append(self.sanitize_hash_tag(m.group(1)))
3033 start = m.end()
3034
3035 if not tags:
3036 # Try "Tag: " prefix.
3037 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3038 if m:
3039 tags.append(self.sanitize_hash_tag(m.group(1)))
3040 return tags
3041
3042 @classmethod
3043 def sanitize_hash_tag(cls, tag):
3044 """Returns a sanitized Gerrit hash tag.
3045
3046 A sanitized hashtag can be used as a git push refspec parameter value.
3047 """
3048 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3049
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003050 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3051 """Updates this commit description given the parent.
3052
3053 This is essentially what Gnumbd used to do.
3054 Consult https://goo.gl/WMmpDe for more details.
3055 """
3056 assert parent_msg # No, orphan branch creation isn't supported.
3057 assert parent_hash
3058 assert dest_ref
3059 parent_footer_map = git_footers.parse_footers(parent_msg)
3060 # This will also happily parse svn-position, which GnumbD is no longer
3061 # supporting. While we'd generate correct footers, the verifier plugin
3062 # installed in Gerrit will block such commit (ie git push below will fail).
3063 parent_position = git_footers.get_position(parent_footer_map)
3064
3065 # Cherry-picks may have last line obscuring their prior footers,
3066 # from git_footers perspective. This is also what Gnumbd did.
3067 cp_line = None
3068 if (self._description_lines and
3069 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3070 cp_line = self._description_lines.pop()
3071
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003072 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003073
3074 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3075 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003076 for i, line in enumerate(footer_lines):
3077 k, v = git_footers.parse_footer(line) or (None, None)
3078 if k and k.startswith('Cr-'):
3079 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003080
3081 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003082 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003083 if parent_position[0] == dest_ref:
3084 # Same branch as parent.
3085 number = int(parent_position[1]) + 1
3086 else:
3087 number = 1 # New branch, and extra lineage.
3088 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3089 int(parent_position[1])))
3090
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003091 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3092 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003093
3094 self._description_lines = top_lines
3095 if cp_line:
3096 self._description_lines.append(cp_line)
3097 if self._description_lines[-1] != '':
3098 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003099 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003100
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003101
Aaron Gablea1bab272017-04-11 16:38:18 -07003102def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003103 """Retrieves the reviewers that approved a CL from the issue properties with
3104 messages.
3105
3106 Note that the list may contain reviewers that are not committer, thus are not
3107 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003108
3109 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003110 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003111 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003112 return sorted(
3113 set(
3114 message['sender']
3115 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003116 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003117 )
3118 )
3119
3120
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003121def FindCodereviewSettingsFile(filename='codereview.settings'):
3122 """Finds the given file starting in the cwd and going up.
3123
3124 Only looks up to the top of the repository unless an
3125 'inherit-review-settings-ok' file exists in the root of the repository.
3126 """
3127 inherit_ok_file = 'inherit-review-settings-ok'
3128 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003129 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003130 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3131 root = '/'
3132 while True:
3133 if filename in os.listdir(cwd):
3134 if os.path.isfile(os.path.join(cwd, filename)):
3135 return open(os.path.join(cwd, filename))
3136 if cwd == root:
3137 break
3138 cwd = os.path.dirname(cwd)
3139
3140
3141def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003142 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003143 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003144
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003145 def SetProperty(name, setting, unset_error_ok=False):
3146 fullname = 'rietveld.' + name
3147 if setting in keyvals:
3148 RunGit(['config', fullname, keyvals[setting]])
3149 else:
3150 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3151
tandrii48df5812016-10-17 03:55:37 -07003152 if not keyvals.get('GERRIT_HOST', False):
3153 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003154 # Only server setting is required. Other settings can be absent.
3155 # In that case, we ignore errors raised during option deletion attempt.
3156 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3157 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3158 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003159 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003160 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3161 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003162 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3163 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003164 SetProperty(
3165 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003166
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003167 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003168 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003169
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003170 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003171 RunGit(['config', 'gerrit.squash-uploads',
3172 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003173
tandrii@chromium.org28253532016-04-14 13:46:56 +00003174 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003175 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003176 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3177
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003178 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003179 # should be of the form
3180 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3181 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003182 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3183 keyvals['ORIGIN_URL_CONFIG']])
3184
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003185
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003186def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003187 """Downloads a network object to a local file, like urllib.urlretrieve.
3188
3189 This is necessary because urllib is broken for SSL connections via a proxy.
3190 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003191 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003192 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003193
3194
ukai@chromium.org712d6102013-11-27 00:52:58 +00003195def hasSheBang(fname):
3196 """Checks fname is a #! script."""
3197 with open(fname) as f:
3198 return f.read(2).startswith('#!')
3199
3200
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003201# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3202def DownloadHooks(*args, **kwargs):
3203 pass
3204
3205
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003206def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003207 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003208
3209 Args:
3210 force: True to update hooks. False to install hooks if not present.
3211 """
3212 if not settings.GetIsGerrit():
3213 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003214 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003215 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3216 if not os.access(dst, os.X_OK):
3217 if os.path.exists(dst):
3218 if not force:
3219 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003220 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003221 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003222 if not hasSheBang(dst):
3223 DieWithError('Not a script: %s\n'
3224 'You need to download from\n%s\n'
3225 'into .git/hooks/commit-msg and '
3226 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003227 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3228 except Exception:
3229 if os.path.exists(dst):
3230 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003231 DieWithError('\nFailed to download hooks.\n'
3232 'You need to download from\n%s\n'
3233 'into .git/hooks/commit-msg and '
3234 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003235
3236
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003237class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003238 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003239
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003240 _GOOGLESOURCE = 'googlesource.com'
3241
3242 def __init__(self):
3243 # Cached list of [host, identity, source], where source is either
3244 # .gitcookies or .netrc.
3245 self._all_hosts = None
3246
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003247 def ensure_configured_gitcookies(self):
3248 """Runs checks and suggests fixes to make git use .gitcookies from default
3249 path."""
3250 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3251 configured_path = RunGitSilent(
3252 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003253 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003254 if configured_path:
3255 self._ensure_default_gitcookies_path(configured_path, default)
3256 else:
3257 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003258
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003259 @staticmethod
3260 def _ensure_default_gitcookies_path(configured_path, default_path):
3261 assert configured_path
3262 if configured_path == default_path:
3263 print('git is already configured to use your .gitcookies from %s' %
3264 configured_path)
3265 return
3266
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003267 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003268 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3269 (configured_path, default_path))
3270
3271 if not os.path.exists(configured_path):
3272 print('However, your configured .gitcookies file is missing.')
3273 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3274 action='reconfigure')
3275 RunGit(['config', '--global', 'http.cookiefile', default_path])
3276 return
3277
3278 if os.path.exists(default_path):
3279 print('WARNING: default .gitcookies file already exists %s' %
3280 default_path)
3281 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3282 default_path)
3283
3284 confirm_or_exit('Move existing .gitcookies to default location?',
3285 action='move')
3286 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003287 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003288 print('Moved and reconfigured git to use .gitcookies from %s' %
3289 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003290
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003291 @staticmethod
3292 def _configure_gitcookies_path(default_path):
3293 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3294 if os.path.exists(netrc_path):
3295 print('You seem to be using outdated .netrc for git credentials: %s' %
3296 netrc_path)
3297 print('This tool will guide you through setting up recommended '
3298 '.gitcookies store for git credentials.\n'
3299 '\n'
3300 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3301 ' git config --global --unset http.cookiefile\n'
3302 ' mv %s %s.backup\n\n' % (default_path, default_path))
3303 confirm_or_exit(action='setup .gitcookies')
3304 RunGit(['config', '--global', 'http.cookiefile', default_path])
3305 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003306
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003307 def get_hosts_with_creds(self, include_netrc=False):
3308 if self._all_hosts is None:
3309 a = gerrit_util.CookiesAuthenticator()
3310 self._all_hosts = [
3311 (h, u, s)
3312 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003313 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3314 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003315 )
3316 if h.endswith(self._GOOGLESOURCE)
3317 ]
3318
3319 if include_netrc:
3320 return self._all_hosts
3321 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3322
3323 def print_current_creds(self, include_netrc=False):
3324 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3325 if not hosts:
3326 print('No Git/Gerrit credentials found')
3327 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003328 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003329 header = [('Host', 'User', 'Which file'),
3330 ['=' * l for l in lengths]]
3331 for row in (header + hosts):
3332 print('\t'.join((('%%+%ds' % l) % s)
3333 for l, s in zip(lengths, row)))
3334
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003335 @staticmethod
3336 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003337 """Parses identity "git-<username>.domain" into <username> and domain."""
3338 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003339 # distinguishable from sub-domains. But we do know typical domains:
3340 if identity.endswith('.chromium.org'):
3341 domain = 'chromium.org'
3342 username = identity[:-len('.chromium.org')]
3343 else:
3344 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003345 if username.startswith('git-'):
3346 username = username[len('git-'):]
3347 return username, domain
3348
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003349 def _canonical_git_googlesource_host(self, host):
3350 """Normalizes Gerrit hosts (with '-review') to Git host."""
3351 assert host.endswith(self._GOOGLESOURCE)
3352 # Prefix doesn't include '.' at the end.
3353 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3354 if prefix.endswith('-review'):
3355 prefix = prefix[:-len('-review')]
3356 return prefix + '.' + self._GOOGLESOURCE
3357
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003358 def _canonical_gerrit_googlesource_host(self, host):
3359 git_host = self._canonical_git_googlesource_host(host)
3360 prefix = git_host.split('.', 1)[0]
3361 return prefix + '-review.' + self._GOOGLESOURCE
3362
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003363 def _get_counterpart_host(self, host):
3364 assert host.endswith(self._GOOGLESOURCE)
3365 git = self._canonical_git_googlesource_host(host)
3366 gerrit = self._canonical_gerrit_googlesource_host(git)
3367 return git if gerrit == host else gerrit
3368
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003369 def has_generic_host(self):
3370 """Returns whether generic .googlesource.com has been configured.
3371
3372 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3373 """
3374 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3375 if host == '.' + self._GOOGLESOURCE:
3376 return True
3377 return False
3378
3379 def _get_git_gerrit_identity_pairs(self):
3380 """Returns map from canonic host to pair of identities (Git, Gerrit).
3381
3382 One of identities might be None, meaning not configured.
3383 """
3384 host_to_identity_pairs = {}
3385 for host, identity, _ in self.get_hosts_with_creds():
3386 canonical = self._canonical_git_googlesource_host(host)
3387 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3388 idx = 0 if canonical == host else 1
3389 pair[idx] = identity
3390 return host_to_identity_pairs
3391
3392 def get_partially_configured_hosts(self):
3393 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003394 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003395 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003396 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003397
3398 def get_conflicting_hosts(self):
3399 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003400 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003401 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003402 if None not in (i1, i2) and i1 != i2)
3403
3404 def get_duplicated_hosts(self):
3405 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003406 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003407
3408 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3409 'chromium.googlesource.com': 'chromium.org',
3410 'chrome-internal.googlesource.com': 'google.com',
3411 }
3412
3413 def get_hosts_with_wrong_identities(self):
3414 """Finds hosts which **likely** reference wrong identities.
3415
3416 Note: skips hosts which have conflicting identities for Git and Gerrit.
3417 """
3418 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003419 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003420 pair = self._get_git_gerrit_identity_pairs().get(host)
3421 if pair and pair[0] == pair[1]:
3422 _, domain = self._parse_identity(pair[0])
3423 if domain != expected:
3424 hosts.add(host)
3425 return hosts
3426
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003427 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003428 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003429 hosts = sorted(hosts)
3430 assert hosts
3431 if extra_column_func is None:
3432 extras = [''] * len(hosts)
3433 else:
3434 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003435 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3436 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003437 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003438 lines.append(tmpl % he)
3439 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003440
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003441 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003442 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003443 yield ('.googlesource.com wildcard record detected',
3444 ['Chrome Infrastructure team recommends to list full host names '
3445 'explicitly.'],
3446 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003447
3448 dups = self.get_duplicated_hosts()
3449 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003450 yield ('The following hosts were defined twice',
3451 self._format_hosts(dups),
3452 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003453
3454 partial = self.get_partially_configured_hosts()
3455 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003456 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3457 'These hosts are missing',
3458 self._format_hosts(partial, lambda host: 'but %s defined' %
3459 self._get_counterpart_host(host)),
3460 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003461
3462 conflicting = self.get_conflicting_hosts()
3463 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003464 yield ('The following Git hosts have differing credentials from their '
3465 'Gerrit counterparts',
3466 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3467 tuple(self._get_git_gerrit_identity_pairs()[host])),
3468 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003469
3470 wrong = self.get_hosts_with_wrong_identities()
3471 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003472 yield ('These hosts likely use wrong identity',
3473 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3474 (self._get_git_gerrit_identity_pairs()[host][0],
3475 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3476 wrong)
3477
3478 def find_and_report_problems(self):
3479 """Returns True if there was at least one problem, else False."""
3480 found = False
3481 bad_hosts = set()
3482 for title, sublines, hosts in self._find_problems():
3483 if not found:
3484 found = True
3485 print('\n\n.gitcookies problem report:\n')
3486 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003487 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003488 if sublines:
3489 print()
3490 print(' %s' % '\n '.join(sublines))
3491 print()
3492
3493 if bad_hosts:
3494 assert found
3495 print(' You can manually remove corresponding lines in your %s file and '
3496 'visit the following URLs with correct account to generate '
3497 'correct credential lines:\n' %
3498 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3499 print(' %s' % '\n '.join(sorted(set(
3500 gerrit_util.CookiesAuthenticator().get_new_password_url(
3501 self._canonical_git_googlesource_host(host))
3502 for host in bad_hosts
3503 ))))
3504 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003505
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003506
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003507@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003508def CMDcreds_check(parser, args):
3509 """Checks credentials and suggests changes."""
3510 _, _ = parser.parse_args(args)
3511
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003512 # Code below checks .gitcookies. Abort if using something else.
3513 authn = gerrit_util.Authenticator.get()
3514 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3515 if isinstance(authn, gerrit_util.GceAuthenticator):
3516 DieWithError(
3517 'This command is not designed for GCE, are you on a bot?\n'
3518 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3519 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003520 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003521 'This command is not designed for bot environment. It checks '
3522 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003523
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003524 checker = _GitCookiesChecker()
3525 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003526
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003527 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003528 checker.print_current_creds(include_netrc=True)
3529
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003530 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003531 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003532 return 0
3533 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003534
3535
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003536@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003537def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003538 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003539 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3540 branch = ShortBranchName(branchref)
3541 _, args = parser.parse_args(args)
3542 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003543 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003544 return RunGit(['config', 'branch.%s.base-url' % branch],
3545 error_ok=False).strip()
3546 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003547 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003548 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3549 error_ok=False).strip()
3550
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003551
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003552def color_for_status(status):
3553 """Maps a Changelist status to color, for CMDstatus and other tools."""
3554 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003555 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003556 'waiting': Fore.BLUE,
3557 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003558 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003559 'lgtm': Fore.GREEN,
3560 'commit': Fore.MAGENTA,
3561 'closed': Fore.CYAN,
3562 'error': Fore.WHITE,
3563 }.get(status, Fore.WHITE)
3564
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003565
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003566def get_cl_statuses(changes, fine_grained, max_processes=None):
3567 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003568
3569 If fine_grained is true, this will fetch CL statuses from the server.
3570 Otherwise, simply indicate if there's a matching url for the given branches.
3571
3572 If max_processes is specified, it is used as the maximum number of processes
3573 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3574 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003575
3576 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003577 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003578 if not changes:
3579 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003580
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003581 if not fine_grained:
3582 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003583 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003584 for cl in changes:
3585 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003586 return
3587
3588 # First, sort out authentication issues.
3589 logging.debug('ensuring credentials exist')
3590 for cl in changes:
3591 cl.EnsureAuthenticated(force=False, refresh=True)
3592
3593 def fetch(cl):
3594 try:
3595 return (cl, cl.GetStatus())
3596 except:
3597 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003598 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003599 raise
3600
3601 threads_count = len(changes)
3602 if max_processes:
3603 threads_count = max(1, min(threads_count, max_processes))
3604 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3605
3606 pool = ThreadPool(threads_count)
3607 fetched_cls = set()
3608 try:
3609 it = pool.imap_unordered(fetch, changes).__iter__()
3610 while True:
3611 try:
3612 cl, status = it.next(timeout=5)
3613 except multiprocessing.TimeoutError:
3614 break
3615 fetched_cls.add(cl)
3616 yield cl, status
3617 finally:
3618 pool.close()
3619
3620 # Add any branches that failed to fetch.
3621 for cl in set(changes) - fetched_cls:
3622 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003623
rmistry@google.com2dd99862015-06-22 12:22:18 +00003624
3625def upload_branch_deps(cl, args):
3626 """Uploads CLs of local branches that are dependents of the current branch.
3627
3628 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003629
3630 test1 -> test2.1 -> test3.1
3631 -> test3.2
3632 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003633
3634 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3635 run on the dependent branches in this order:
3636 test2.1, test3.1, test3.2, test2.2, test3.3
3637
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003638 Note: This function does not rebase your local dependent branches. Use it
3639 when you make a change to the parent branch that will not conflict
3640 with its dependent branches, and you would like their dependencies
3641 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003642 """
3643 if git_common.is_dirty_git_tree('upload-branch-deps'):
3644 return 1
3645
3646 root_branch = cl.GetBranch()
3647 if root_branch is None:
3648 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3649 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003650 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003651 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3652 'patchset dependencies without an uploaded CL.')
3653
3654 branches = RunGit(['for-each-ref',
3655 '--format=%(refname:short) %(upstream:short)',
3656 'refs/heads'])
3657 if not branches:
3658 print('No local branches found.')
3659 return 0
3660
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003661 # Create a dictionary of all local branches to the branches that are
3662 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003663 tracked_to_dependents = collections.defaultdict(list)
3664 for b in branches.splitlines():
3665 tokens = b.split()
3666 if len(tokens) == 2:
3667 branch_name, tracked = tokens
3668 tracked_to_dependents[tracked].append(branch_name)
3669
vapiera7fbd5a2016-06-16 09:17:49 -07003670 print()
3671 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003672 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003673
rmistry@google.com2dd99862015-06-22 12:22:18 +00003674 def traverse_dependents_preorder(branch, padding=''):
3675 dependents_to_process = tracked_to_dependents.get(branch, [])
3676 padding += ' '
3677 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003678 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003679 dependents.append(dependent)
3680 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003681
rmistry@google.com2dd99862015-06-22 12:22:18 +00003682 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003683 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003684
3685 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003686 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003687 return 0
3688
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003689 confirm_or_exit('This command will checkout all dependent branches and run '
3690 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003691
rmistry@google.com2dd99862015-06-22 12:22:18 +00003692 # Record all dependents that failed to upload.
3693 failures = {}
3694 # Go through all dependents, checkout the branch and upload.
3695 try:
3696 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003697 print()
3698 print('--------------------------------------')
3699 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003700 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003701 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003702 try:
3703 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003704 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003705 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003706 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003707 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003708 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003709 finally:
3710 # Swap back to the original root branch.
3711 RunGit(['checkout', '-q', root_branch])
3712
vapiera7fbd5a2016-06-16 09:17:49 -07003713 print()
3714 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003715 for dependent_branch in dependents:
3716 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003717 print(' %s : %s' % (dependent_branch, upload_status))
3718 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003719
3720 return 0
3721
3722
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003723def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3724 """Given a proposed tag name, returns a tag name that is guaranteed to be
3725 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3726 or 'foo-3', and so on."""
3727
3728 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3729 for suffix_num in itertools.count(1):
3730 if suffix_num == 1:
3731 to_check = proposed_tag
3732 else:
3733 to_check = '%s-%d' % (proposed_tag, suffix_num)
3734
3735 if to_check not in existing_tags:
3736 return to_check
3737
3738
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003739@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003740def CMDarchive(parser, args):
3741 """Archives and deletes branches associated with closed changelists."""
3742 parser.add_option(
3743 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003744 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003745 parser.add_option(
3746 '-f', '--force', action='store_true',
3747 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003748 parser.add_option(
3749 '-d', '--dry-run', action='store_true',
3750 help='Skip the branch tagging and removal steps.')
3751 parser.add_option(
3752 '-t', '--notags', action='store_true',
3753 help='Do not tag archived branches. '
3754 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003755
kmarshall3bff56b2016-06-06 18:31:47 -07003756 options, args = parser.parse_args(args)
3757 if args:
3758 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003759
3760 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3761 if not branches:
3762 return 0
3763
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003764 tags = RunGit(['for-each-ref', '--format=%(refname)',
3765 'refs/tags']).splitlines() or []
3766 tags = [t.split('/')[-1] for t in tags]
3767
vapiera7fbd5a2016-06-16 09:17:49 -07003768 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003769 changes = [Changelist(branchref=b)
3770 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003771 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3772 statuses = get_cl_statuses(changes,
3773 fine_grained=True,
3774 max_processes=options.maxjobs)
3775 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003776 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3777 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003778 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003779 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003780 proposal.sort()
3781
3782 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003783 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003784 return 0
3785
3786 current_branch = GetCurrentBranch()
3787
vapiera7fbd5a2016-06-16 09:17:49 -07003788 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003789 if options.notags:
3790 for next_item in proposal:
3791 print(' ' + next_item[0])
3792 else:
3793 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3794 for next_item in proposal:
3795 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003796
kmarshall9249e012016-08-23 12:02:16 -07003797 # Quit now on precondition failure or if instructed by the user, either
3798 # via an interactive prompt or by command line flags.
3799 if options.dry_run:
3800 print('\nNo changes were made (dry run).\n')
3801 return 0
3802 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003803 print('You are currently on a branch \'%s\' which is associated with a '
3804 'closed codereview issue, so archive cannot proceed. Please '
3805 'checkout another branch and run this command again.' %
3806 current_branch)
3807 return 1
kmarshall9249e012016-08-23 12:02:16 -07003808 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003809 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3810 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003811 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003812 return 1
3813
3814 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003815 if not options.notags:
3816 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003817
3818 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3819 # Clean up the tag if we failed to delete the branch.
3820 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003821
vapiera7fbd5a2016-06-16 09:17:49 -07003822 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003823
3824 return 0
3825
3826
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003827@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003828def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003829 """Show status of changelists.
3830
3831 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003832 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003833 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003834 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003835 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003836 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003837 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003838 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003839
3840 Also see 'git cl comments'.
3841 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003842 parser.add_option(
3843 '--no-branch-color',
3844 action='store_true',
3845 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003846 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003847 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003848 parser.add_option('-f', '--fast', action='store_true',
3849 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003850 parser.add_option(
3851 '-j', '--maxjobs', action='store', type=int,
3852 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003853
iannuccie53c9352016-08-17 14:40:40 -07003854 _add_codereview_issue_select_options(
3855 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003856 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003857 if args:
3858 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003859
iannuccie53c9352016-08-17 14:40:40 -07003860 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003861 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003862
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003863 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003864 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003865 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003866 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003867 elif options.field == 'id':
3868 issueid = cl.GetIssue()
3869 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003870 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003871 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003872 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003873 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003874 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003875 elif options.field == 'status':
3876 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003877 elif options.field == 'url':
3878 url = cl.GetIssueURL()
3879 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003880 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003881 return 0
3882
3883 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3884 if not branches:
3885 print('No local branch found.')
3886 return 0
3887
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003888 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003889 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003890 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003891 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003892 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003893 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003894 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003895
Daniel McArdlea23bf592019-02-12 00:25:12 +00003896 current_branch = GetCurrentBranch()
3897
3898 def FormatBranchName(branch, colorize=False):
3899 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3900 an asterisk when it is the current branch."""
3901
3902 asterisk = ""
3903 color = Fore.RESET
3904 if branch == current_branch:
3905 asterisk = "* "
3906 color = Fore.GREEN
3907 branch_name = ShortBranchName(branch)
3908
3909 if colorize:
3910 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003911 return asterisk + branch_name
3912
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003913 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003914
3915 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003916 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3917 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003918 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003919 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003920 branch_statuses[c.GetBranch()] = status
3921 status = branch_statuses.pop(branch)
3922 url = cl.GetIssueURL()
3923 if url and (not status or status == 'error'):
3924 # The issue probably doesn't exist anymore.
3925 url += ' (broken)'
3926
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003927 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003928 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003929 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003930 color = ''
3931 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003932 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003933
Alan Cuttera3be9a52019-03-04 18:50:33 +00003934 branch_display = FormatBranchName(branch)
3935 padding = ' ' * (alignment - len(branch_display))
3936 if not options.no_branch_color:
3937 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003938
Alan Cuttera3be9a52019-03-04 18:50:33 +00003939 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3940 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003941
vapiera7fbd5a2016-06-16 09:17:49 -07003942 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003943 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003944 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003945 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003946 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003947 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003948 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003949 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003950 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003951 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003952 print('Issue description:')
3953 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003954 return 0
3955
3956
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003957def colorize_CMDstatus_doc():
3958 """To be called once in main() to add colors to git cl status help."""
3959 colors = [i for i in dir(Fore) if i[0].isupper()]
3960
3961 def colorize_line(line):
3962 for color in colors:
3963 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003964 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003965 indent = len(line) - len(line.lstrip(' ')) + 1
3966 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3967 return line
3968
3969 lines = CMDstatus.__doc__.splitlines()
3970 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3971
3972
phajdan.jre328cf92016-08-22 04:12:17 -07003973def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003974 if path == '-':
3975 json.dump(contents, sys.stdout)
3976 else:
3977 with open(path, 'w') as f:
3978 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003979
3980
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003981@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003982@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003983def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003984 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003985
3986 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003987 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003988 parser.add_option('-r', '--reverse', action='store_true',
3989 help='Lookup the branch(es) for the specified issues. If '
3990 'no issues are specified, all branches with mapped '
3991 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003992 parser.add_option('--json',
3993 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003994 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003995 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003996
dnj@chromium.org406c4402015-03-03 17:22:28 +00003997 if options.reverse:
3998 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003999 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004000 # Reverse issue lookup.
4001 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004002
4003 git_config = {}
4004 for config in RunGit(['config', '--get-regexp',
4005 r'branch\..*issue']).splitlines():
4006 name, _space, val = config.partition(' ')
4007 git_config[name] = val
4008
dnj@chromium.org406c4402015-03-03 17:22:28 +00004009 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004010 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4011 config_key = _git_branch_config_key(ShortBranchName(branch),
4012 cls.IssueConfigKey())
4013 issue = git_config.get(config_key)
4014 if issue:
4015 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004016 if not args:
4017 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004018 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004019 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004020 try:
4021 issue_num = int(issue)
4022 except ValueError:
4023 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004024 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004025 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004026 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004027 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004028 if options.json:
4029 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004030 return 0
4031
4032 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004033 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004034 if not issue.valid:
4035 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4036 'or no argument to list it.\n'
4037 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004038 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004039 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004040 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004041 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004042 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4043 if options.json:
4044 write_json(options.json, {
4045 'issue': cl.GetIssue(),
4046 'issue_url': cl.GetIssueURL(),
4047 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004048 return 0
4049
4050
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004051@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004052def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004053 """Shows or posts review comments for any changelist."""
4054 parser.add_option('-a', '--add-comment', dest='comment',
4055 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004056 parser.add_option('-p', '--publish', action='store_true',
4057 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004058 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004059 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004060 parser.add_option('-m', '--machine-readable', dest='readable',
4061 action='store_false', default=True,
4062 help='output comments in a format compatible with '
4063 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004064 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004065 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004066 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004067 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004068
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004069 issue = None
4070 if options.issue:
4071 try:
4072 issue = int(options.issue)
4073 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004074 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004075
Edward Lemur934836a2019-09-09 20:16:54 +00004076 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004077
4078 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004079 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004080 return 0
4081
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004082 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4083 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004084 for comment in summary:
4085 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004086 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004087 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004088 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004089 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004090 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004091 elif comment.autogenerated:
4092 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004093 else:
4094 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004095 print('\n%s%s %s%s\n%s' % (
4096 color,
4097 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4098 comment.sender,
4099 Fore.RESET,
4100 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4101
smut@google.comc85ac942015-09-15 16:34:43 +00004102 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004103 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004104 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004105 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4106 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004107 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004108 return 0
4109
4110
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004111@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004112@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004113def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004114 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004115 parser.add_option('-d', '--display', action='store_true',
4116 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004117 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004118 help='New description to set for this issue (- for stdin, '
4119 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004120 parser.add_option('-f', '--force', action='store_true',
4121 help='Delete any unpublished Gerrit edits for this issue '
4122 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004123
4124 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004125 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004126
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004127 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004128 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004129 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004130 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004131 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004132
Edward Lemur934836a2019-09-09 20:16:54 +00004133 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004134 if target_issue_arg:
4135 kwargs['issue'] = target_issue_arg.issue
4136 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004137
4138 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004139 if not cl.GetIssue():
4140 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004141
Edward Lemur678a6842019-10-03 22:25:05 +00004142 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004143 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004144
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004145 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004146
smut@google.com34fb6b12015-07-13 20:03:26 +00004147 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004148 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004149 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004150
4151 if options.new_description:
4152 text = options.new_description
4153 if text == '-':
4154 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004155 elif text == '+':
4156 base_branch = cl.GetCommonAncestorWithUpstream()
4157 change = cl.GetChange(base_branch, None, local_description=True)
4158 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004159
4160 description.set_description(text)
4161 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004162 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004163 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004164 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004165 return 0
4166
4167
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004168@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004169def CMDlint(parser, args):
4170 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004171 parser.add_option('--filter', action='append', metavar='-x,+y',
4172 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004173 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004174
4175 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004176 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004177 try:
4178 import cpplint
4179 import cpplint_chromium
4180 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004181 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004182 return 1
4183
4184 # Change the current working directory before calling lint so that it
4185 # shows the correct base.
4186 previous_cwd = os.getcwd()
4187 os.chdir(settings.GetRoot())
4188 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004189 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004190 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4191 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004192 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004193 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004194 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004195
4196 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004197 command = args + files
4198 if options.filter:
4199 command = ['--filter=' + ','.join(options.filter)] + command
4200 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004201
4202 white_regex = re.compile(settings.GetLintRegex())
4203 black_regex = re.compile(settings.GetLintIgnoreRegex())
4204 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4205 for filename in filenames:
4206 if white_regex.match(filename):
4207 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004208 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004209 else:
4210 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4211 extra_check_functions)
4212 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004213 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004214 finally:
4215 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004216 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004217 if cpplint._cpplint_state.error_count != 0:
4218 return 1
4219 return 0
4220
4221
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004222@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004223def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004224 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004225 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004226 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004227 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004228 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004229 parser.add_option('--all', action='store_true',
4230 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004231 parser.add_option('--parallel', action='store_true',
4232 help='Run all tests specified by input_api.RunTests in all '
4233 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004234 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004235
sbc@chromium.org71437c02015-04-09 19:29:40 +00004236 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004237 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004238 return 1
4239
Edward Lemur934836a2019-09-09 20:16:54 +00004240 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004241 if args:
4242 base_branch = args[0]
4243 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004244 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004245 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004246
Aaron Gable8076c282017-11-29 14:39:41 -08004247 if options.all:
4248 base_change = cl.GetChange(base_branch, None)
4249 files = [('M', f) for f in base_change.AllFiles()]
4250 change = presubmit_support.GitChange(
4251 base_change.Name(),
4252 base_change.FullDescriptionText(),
4253 base_change.RepositoryRoot(),
4254 files,
4255 base_change.issue,
4256 base_change.patchset,
4257 base_change.author_email,
4258 base_change._upstream)
4259 else:
4260 change = cl.GetChange(base_branch, None)
4261
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004262 cl.RunHook(
4263 committing=not options.upload,
4264 may_prompt=False,
4265 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004266 change=change,
4267 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004268 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004269
4270
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004271def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004272 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004273
4274 Works the same way as
4275 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4276 but can be called on demand on all platforms.
4277
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004278 The basic idea is to generate git hash of a state of the tree, original
4279 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004280 """
4281 lines = []
4282 tree_hash = RunGitSilent(['write-tree'])
4283 lines.append('tree %s' % tree_hash.strip())
4284 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4285 if code == 0:
4286 lines.append('parent %s' % parent.strip())
4287 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4288 lines.append('author %s' % author.strip())
4289 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4290 lines.append('committer %s' % committer.strip())
4291 lines.append('')
4292 # Note: Gerrit's commit-hook actually cleans message of some lines and
4293 # whitespace. This code is not doing this, but it clearly won't decrease
4294 # entropy.
4295 lines.append(message)
4296 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004297 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004298 return 'I%s' % change_hash.strip()
4299
4300
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004301def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004302 """Computes the remote branch ref to use for the CL.
4303
4304 Args:
4305 remote (str): The git remote for the CL.
4306 remote_branch (str): The git remote branch for the CL.
4307 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004308 """
4309 if not (remote and remote_branch):
4310 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004311
wittman@chromium.org455dc922015-01-26 20:15:50 +00004312 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004313 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004314 # refs, which are then translated into the remote full symbolic refs
4315 # below.
4316 if '/' not in target_branch:
4317 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4318 else:
4319 prefix_replacements = (
4320 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4321 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4322 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4323 )
4324 match = None
4325 for regex, replacement in prefix_replacements:
4326 match = re.search(regex, target_branch)
4327 if match:
4328 remote_branch = target_branch.replace(match.group(0), replacement)
4329 break
4330 if not match:
4331 # This is a branch path but not one we recognize; use as-is.
4332 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004333 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4334 # Handle the refs that need to land in different refs.
4335 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004336
wittman@chromium.org455dc922015-01-26 20:15:50 +00004337 # Create the true path to the remote branch.
4338 # Does the following translation:
4339 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4340 # * refs/remotes/origin/master -> refs/heads/master
4341 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4342 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4343 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4344 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4345 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4346 'refs/heads/')
4347 elif remote_branch.startswith('refs/remotes/branch-heads'):
4348 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004349
wittman@chromium.org455dc922015-01-26 20:15:50 +00004350 return remote_branch
4351
4352
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004353def cleanup_list(l):
4354 """Fixes a list so that comma separated items are put as individual items.
4355
4356 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4357 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4358 """
4359 items = sum((i.split(',') for i in l), [])
4360 stripped_items = (i.strip() for i in items)
4361 return sorted(filter(None, stripped_items))
4362
4363
Aaron Gable4db38df2017-11-03 14:59:07 -07004364@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004365@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004366def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004367 """Uploads the current changelist to codereview.
4368
4369 Can skip dependency patchset uploads for a branch by running:
4370 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004371 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004372 git config --unset branch.branch_name.skip-deps-uploads
4373 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004374
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004375 If the name of the checked out branch starts with "bug-" or "fix-" followed
4376 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004377 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004378
4379 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004380 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004381 [git-cl] add support for hashtags
4382 Foo bar: implement foo
4383 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004384 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004385 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4386 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004387 parser.add_option('--bypass-watchlists', action='store_true',
4388 dest='bypass_watchlists',
4389 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004390 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004391 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004392 parser.add_option('--message', '-m', dest='message',
4393 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004394 parser.add_option('-b', '--bug',
4395 help='pre-populate the bug number(s) for this issue. '
4396 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004397 parser.add_option('--message-file', dest='message_file',
4398 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004399 parser.add_option('--title', '-t', dest='title',
4400 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004401 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004402 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004403 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004404 parser.add_option('--tbrs',
4405 action='append', default=[],
4406 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004407 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004408 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004409 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004410 parser.add_option('--hashtag', dest='hashtags',
4411 action='append', default=[],
4412 help=('Gerrit hashtag for new CL; '
4413 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004414 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004415 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004416 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004417 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004418 metavar='TARGET',
4419 help='Apply CL to remote ref TARGET. ' +
4420 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004421 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004422 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004423 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004424 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004425 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004426 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004427 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4428 const='TBR', help='add a set of OWNERS to TBR')
4429 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4430 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004431 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004432 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004433 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004434 'implies --send-mail')
4435 parser.add_option('-d', '--cq-dry-run',
4436 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004437 help='Send the patchset to do a CQ dry run right after '
4438 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004439 parser.add_option('--preserve-tryjobs', action='store_true',
4440 help='instruct the CQ to let tryjobs running even after '
4441 'new patchsets are uploaded instead of canceling '
4442 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004443 parser.add_option('--dependencies', action='store_true',
4444 help='Uploads CLs of all the local branches that depend on '
4445 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004446 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4447 help='Sends your change to the CQ after an approval. Only '
4448 'works on repos that have the Auto-Submit label '
4449 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004450 parser.add_option('--parallel', action='store_true',
4451 help='Run all tests specified by input_api.RunTests in all '
4452 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004453 parser.add_option('--no-autocc', action='store_true',
4454 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004455 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004456 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004457 parser.add_option('-R', '--retry-failed', action='store_true',
4458 help='Retry failed tryjobs from old patchset immediately '
4459 'after uploading new patchset. Cannot be used with '
4460 '--use-commit-queue or --cq-dry-run.')
4461 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4462 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004463 parser.add_option('--fixed', '-x',
4464 help='List of bugs that will be commented on and marked '
4465 'fixed (pre-populates "Fixed:" tag). Same format as '
4466 '-b option / "Bug:" tag. If fixing several issues, '
4467 'separate with commas.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004468
rmistry@google.com2dd99862015-06-22 12:22:18 +00004469 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004470 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004471 (options, args) = parser.parse_args(args)
4472
sbc@chromium.org71437c02015-04-09 19:29:40 +00004473 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004474 return 1
4475
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004476 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004477 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004478 options.cc = cleanup_list(options.cc)
4479
tandriib80458a2016-06-23 12:20:07 -07004480 if options.message_file:
4481 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004482 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004483 options.message = gclient_utils.FileRead(options.message_file)
4484 options.message_file = None
4485
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004486 if ([options.cq_dry_run,
4487 options.use_commit_queue,
4488 options.retry_failed].count(True) > 1):
4489 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4490 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004491
Aaron Gableedbc4132017-09-11 13:22:28 -07004492 if options.use_commit_queue:
4493 options.send_mail = True
4494
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004495 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4496 settings.GetIsGerrit()
4497
Edward Lemur934836a2019-09-09 20:16:54 +00004498 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004499 if options.retry_failed and not cl.GetIssue():
4500 print('No previous patchsets, so --retry-failed has no effect.')
4501 options.retry_failed = False
4502 # cl.GetMostRecentPatchset uses cached information, and can return the last
4503 # patchset before upload. Calling it here makes it clear that it's the
4504 # last patchset before upload. Note that GetMostRecentPatchset will fail
4505 # if no CL has been uploaded yet.
4506 if options.retry_failed:
4507 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004508
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004509 ret = cl.CMDUpload(options, args, orig_args)
4510
4511 if options.retry_failed:
4512 if ret != 0:
4513 print('Upload failed, so --retry-failed has no effect.')
4514 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004515 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004516 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004517 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004518 if len(buckets) == 0:
4519 print('No failed tryjobs, so --retry-failed has no effect.')
4520 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004521 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004522
4523 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004524
4525
Francois Dorayd42c6812017-05-30 15:10:20 -04004526@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004527@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004528def CMDsplit(parser, args):
4529 """Splits a branch into smaller branches and uploads CLs.
4530
4531 Creates a branch and uploads a CL for each group of files modified in the
4532 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004533 comment, '$directory' is replaced with the directory containing the changes
4534 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4535 sending out, and '$num_cls' is replaced with the total number of CLs that
4536 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004537 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004538 parser.add_option('-d', '--description', dest='description_file',
4539 help='A text file containing a CL description in which '
4540 '$directory will be replaced by each CL\'s directory.')
4541 parser.add_option('-c', '--comment', dest='comment_file',
4542 help='A text file containing a CL comment.')
4543 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004544 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004545 help='List the files and reviewers for each CL that would '
4546 'be created, but don\'t create branches or CLs.')
4547 parser.add_option('--cq-dry-run', action='store_true',
4548 help='If set, will do a cq dry run for each uploaded CL. '
4549 'Please be careful when doing this; more than ~10 CLs '
4550 'has the potential to overload our build '
4551 'infrastructure. Try to upload these not during high '
4552 'load times (usually 11-3 Mountain View time). Email '
4553 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004554 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4555 default=True,
4556 help='Sends your change to the CQ after an approval. Only '
4557 'works on repos that have the Auto-Submit label '
4558 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004559 options, _ = parser.parse_args(args)
4560
4561 if not options.description_file:
4562 parser.error('No --description flag specified.')
4563
4564 def WrappedCMDupload(args):
4565 return CMDupload(OptionParser(), args)
4566
4567 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004568 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004569 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004570
4571
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004572@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004573@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004574def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004575 """DEPRECATED: Used to commit the current changelist via git-svn."""
4576 message = ('git-cl no longer supports committing to SVN repositories via '
4577 'git-svn. You probably want to use `git cl land` instead.')
4578 print(message)
4579 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004580
4581
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004582@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004583@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004584def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004585 """Commits the current changelist via git.
4586
4587 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4588 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004589 """
4590 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4591 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004592 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004593 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004594 parser.add_option('--parallel', action='store_true',
4595 help='Run all tests specified by input_api.RunTests in all '
4596 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004597 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004598
Edward Lemur934836a2019-09-09 20:16:54 +00004599 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004600
Robert Iannucci2e73d432018-03-14 01:10:47 -07004601 if not cl.GetIssue():
4602 DieWithError('You must upload the change first to Gerrit.\n'
4603 ' If you would rather have `git cl land` upload '
4604 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004605 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004606 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004607
4608
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004609@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004610@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004611def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004612 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004613 parser.add_option('-b', dest='newbranch',
4614 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004615 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004616 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004617 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004618 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004619
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004620 group = optparse.OptionGroup(
4621 parser,
4622 'Options for continuing work on the current issue uploaded from a '
4623 'different clone (e.g. different machine). Must be used independently '
4624 'from the other options. No issue number should be specified, and the '
4625 'branch must have an issue number associated with it')
4626 group.add_option('--reapply', action='store_true', dest='reapply',
4627 help='Reset the branch and reapply the issue.\n'
4628 'CAUTION: This will undo any local changes in this '
4629 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004630
4631 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004632 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004633 parser.add_option_group(group)
4634
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004635 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004636 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004637
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004638 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004639 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004640 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004641 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004642 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004643
Edward Lemur934836a2019-09-09 20:16:54 +00004644 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004645 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004646 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004647
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004648 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004649 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004650 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004651
4652 RunGit(['reset', '--hard', upstream])
4653 if options.pull:
4654 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004655
Edward Lemur678a6842019-10-03 22:25:05 +00004656 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4657 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004658
4659 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004660 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004661
Edward Lemurf38bc172019-09-03 21:02:13 +00004662 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004663 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004664 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004665
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004666 # We don't want uncommitted changes mixed up with the patch.
4667 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004668 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004669
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004670 if options.newbranch:
4671 if options.force:
4672 RunGit(['branch', '-D', options.newbranch],
4673 stderr=subprocess2.PIPE, error_ok=True)
4674 RunGit(['new-branch', options.newbranch])
4675
Edward Lemur678a6842019-10-03 22:25:05 +00004676 cl = Changelist(
4677 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004678
Edward Lemur678a6842019-10-03 22:25:05 +00004679 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004680 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004681
Edward Lemurf38bc172019-09-03 21:02:13 +00004682 return cl.CMDPatchWithParsedIssue(
4683 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004684
4685
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004686def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004687 """Fetches the tree status and returns either 'open', 'closed',
4688 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004689 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004690 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004691 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004692 if status.find('closed') != -1 or status == '0':
4693 return 'closed'
4694 elif status.find('open') != -1 or status == '1':
4695 return 'open'
4696 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004697 return 'unset'
4698
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004699
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004700def GetTreeStatusReason():
4701 """Fetches the tree status from a json url and returns the message
4702 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004703 url = settings.GetTreeStatusUrl()
4704 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004705 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004706 status = json.loads(connection.read())
4707 connection.close()
4708 return status['message']
4709
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004710
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004711@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004712def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004713 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004714 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004715 status = GetTreeStatus()
4716 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004717 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004718 return 2
4719
vapiera7fbd5a2016-06-16 09:17:49 -07004720 print('The tree is %s' % status)
4721 print()
4722 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004723 if status != 'open':
4724 return 1
4725 return 0
4726
4727
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004728@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004729def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004730 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4731 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004732 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004733 '-b', '--bot', action='append',
4734 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4735 'times to specify multiple builders. ex: '
4736 '"-b win_rel -b win_layout". See '
4737 'the try server waterfall for the builders name and the tests '
4738 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004739 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004740 '-B', '--bucket', default='',
4741 help=('Buildbucket bucket to send the try requests.'))
4742 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004743 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004744 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004745 'be determined by the try recipe that builder runs, which usually '
4746 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004747 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004748 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004749 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004750 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004751 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004752 '--category', default='git_cl_try', help='Specify custom build category.')
4753 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004754 '--project',
4755 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004756 'in recipe to determine to which repository or directory to '
4757 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004758 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004759 '-p', '--property', dest='properties', action='append', default=[],
4760 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004761 'key2=value2 etc. The value will be treated as '
4762 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004763 'NOTE: using this may make your tryjob not usable for CQ, '
4764 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004765 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004766 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4767 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004768 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004769 parser.add_option(
4770 '-R', '--retry-failed', action='store_true', default=False,
4771 help='Retry failed jobs from the latest set of tryjobs. '
4772 'Not allowed with --bucket and --bot options.')
Koji Ishii31c14782018-01-08 17:17:33 +09004773 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004774 options, args = parser.parse_args(args)
4775
machenbach@chromium.org45453142015-09-15 08:45:22 +00004776 # Make sure that all properties are prop=value pairs.
4777 bad_params = [x for x in options.properties if '=' not in x]
4778 if bad_params:
4779 parser.error('Got properties with missing "=": %s' % bad_params)
4780
maruel@chromium.org15192402012-09-06 12:38:29 +00004781 if args:
4782 parser.error('Unknown arguments: %s' % args)
4783
Edward Lemur934836a2019-09-09 20:16:54 +00004784 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004785 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004786 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004787
Edward Lemurf38bc172019-09-03 21:02:13 +00004788 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004789 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004790
tandriie113dfd2016-10-11 10:20:12 -07004791 error_message = cl.CannotTriggerTryJobReason()
4792 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004793 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004794
Quinten Yearsley983111f2019-09-26 17:18:48 +00004795 if options.retry_failed:
4796 if options.bot or options.bucket:
4797 print('ERROR: The option --retry-failed is not compatible with '
4798 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4799 return 1
4800 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004801 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004802 if options.verbose:
4803 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004804 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004805 if not buckets:
4806 print('There are no failed jobs in the latest set of jobs '
4807 '(patchset #%d), doing nothing.' % patchset)
4808 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004809 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004810 if num_builders > 10:
4811 confirm_or_exit('There are %d builders with failed builds.'
4812 % num_builders, action='continue')
4813 else:
4814 buckets = _get_bucket_map(cl, options, parser)
4815 if buckets and any(b.startswith('master.') for b in buckets):
4816 print('ERROR: Buildbot masters are not supported.')
4817 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004818
qyearsleydd49f942016-10-28 11:57:22 -07004819 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4820 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004821 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004822 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004823 print('git cl try with no bots now defaults to CQ dry run.')
4824 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4825 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004826
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004827 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004828 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004829 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004830 'of bot requires an initial job from a parent (usually a builder). '
4831 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004832 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004833 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004834
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004835 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004836 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004837 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004838 except BuildbucketResponseException as ex:
4839 print('ERROR: %s' % ex)
4840 return 1
4841 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004842
4843
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004844@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004845def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004846 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004847 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004848 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004849 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004850 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004851 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004852 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004853 '--color', action='store_true', default=setup_color.IS_TTY,
4854 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004855 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004856 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4857 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004858 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004859 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004860 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004861 parser.add_option_group(group)
Stefan Zager27db3f22017-10-10 15:15:01 -07004862 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004863 options, args = parser.parse_args(args)
4864 if args:
4865 parser.error('Unrecognized args: %s' % ' '.join(args))
4866
Edward Lemur934836a2019-09-09 20:16:54 +00004867 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004868 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004869 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004870
tandrii221ab252016-10-06 08:12:04 -07004871 patchset = options.patchset
4872 if not patchset:
4873 patchset = cl.GetMostRecentPatchset()
4874 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004875 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004876 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004877 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004878 cl.GetIssue())
4879
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004880 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004881 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004882 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004883 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004884 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004885 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004886 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004887 else:
4888 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004889 return 0
4890
4891
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004892@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004893@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004894def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004895 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004896 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004897 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004898 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004899
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004900 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004901 if args:
4902 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004903 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004904 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004905 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004906 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004907
4908 # Clear configured merge-base, if there is one.
4909 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004910 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004911 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004912 return 0
4913
4914
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004915@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004916def CMDweb(parser, args):
4917 """Opens the current CL in the web browser."""
4918 _, args = parser.parse_args(args)
4919 if args:
4920 parser.error('Unrecognized args: %s' % ' '.join(args))
4921
4922 issue_url = Changelist().GetIssueURL()
4923 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004924 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004925 return 1
4926
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004927 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004928 # allows us to hide the "Created new window in existing browser session."
4929 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004930 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004931 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004932 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004933 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004934 os.open(os.devnull, os.O_RDWR)
4935 try:
4936 webbrowser.open(issue_url)
4937 finally:
4938 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004939 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004940 return 0
4941
4942
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004943@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004944def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004945 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004946 parser.add_option('-d', '--dry-run', action='store_true',
4947 help='trigger in dry run mode')
4948 parser.add_option('-c', '--clear', action='store_true',
4949 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004950 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004951 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004952 if args:
4953 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004954 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004955 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004956
Edward Lemur934836a2019-09-09 20:16:54 +00004957 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004958 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004959 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004960 elif options.dry_run:
4961 state = _CQState.DRY_RUN
4962 else:
4963 state = _CQState.COMMIT
4964 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004965 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004966 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004967 return 0
4968
4969
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004970@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004971def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004972 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004973 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004974 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004975 if args:
4976 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004977 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004978 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004979 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004980 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004981 cl.CloseIssue()
4982 return 0
4983
4984
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004985@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004986def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004987 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004988 parser.add_option(
4989 '--stat',
4990 action='store_true',
4991 dest='stat',
4992 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004993 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004994 if args:
4995 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004996
Edward Lemur934836a2019-09-09 20:16:54 +00004997 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004998 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004999 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005000 if not issue:
5001 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005002
Aaron Gablea718c3e2017-08-28 17:47:28 -07005003 base = cl._GitGetBranchConfigValue('last-upload-hash')
5004 if not base:
5005 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5006 if not base:
5007 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5008 revision_info = detail['revisions'][detail['current_revision']]
5009 fetch_info = revision_info['fetch']['http']
5010 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5011 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005012
Aaron Gablea718c3e2017-08-28 17:47:28 -07005013 cmd = ['git', 'diff']
5014 if options.stat:
5015 cmd.append('--stat')
5016 cmd.append(base)
5017 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005018
5019 return 0
5020
5021
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005022@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005023def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005024 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005025 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005026 '--ignore-current',
5027 action='store_true',
5028 help='Ignore the CL\'s current reviewers and start from scratch.')
5029 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005030 '--ignore-self',
5031 action='store_true',
5032 help='Do not consider CL\'s author as an owners.')
5033 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005034 '--no-color',
5035 action='store_true',
5036 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005037 parser.add_option(
5038 '--batch',
5039 action='store_true',
5040 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005041 # TODO: Consider moving this to another command, since other
5042 # git-cl owners commands deal with owners for a given CL.
5043 parser.add_option(
5044 '--show-all',
5045 action='store_true',
5046 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005047 options, args = parser.parse_args(args)
5048
5049 author = RunGit(['config', 'user.email']).strip() or None
5050
Edward Lemur934836a2019-09-09 20:16:54 +00005051 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005052
Yang Guo6e269a02019-06-26 11:17:02 +00005053 if options.show_all:
5054 for arg in args:
5055 base_branch = cl.GetCommonAncestorWithUpstream()
5056 change = cl.GetChange(base_branch, None)
5057 database = owners.Database(change.RepositoryRoot(), file, os.path)
5058 database.load_data_needed_for([arg])
5059 print('Owners for %s:' % arg)
5060 for owner in sorted(database.all_possible_owners([arg], None)):
5061 print(' - %s' % owner)
5062 return 0
5063
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005064 if args:
5065 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005066 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005067 base_branch = args[0]
5068 else:
5069 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005070 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005071
5072 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005073 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5074
5075 if options.batch:
5076 db = owners.Database(change.RepositoryRoot(), file, os.path)
5077 print('\n'.join(db.reviewers_for(affected_files, author)))
5078 return 0
5079
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005080 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005081 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005082 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005083 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005084 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005085 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005086 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005087 override_files=change.OriginalOwnersFiles(),
5088 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005089
5090
Aiden Bennerc08566e2018-10-03 17:52:42 +00005091def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005092 """Generates a diff command."""
5093 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005094 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5095
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005096 if allow_prefix:
5097 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5098 # case that diff.noprefix is set in the user's git config.
5099 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5100 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005101 diff_cmd += ['--no-prefix']
5102
5103 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005104
5105 if args:
5106 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005107 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005108 diff_cmd.append(arg)
5109 else:
5110 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005111
5112 return diff_cmd
5113
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005114
Jamie Madill5e96ad12020-01-13 16:08:35 +00005115def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5116 """Runs clang-format-diff and sets a return value if necessary."""
5117
5118 if not clang_diff_files:
5119 return 0
5120
5121 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5122 # formatted. This is used to block during the presubmit.
5123 return_value = 0
5124
5125 # Locate the clang-format binary in the checkout
5126 try:
5127 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5128 except clang_format.NotFoundError as e:
5129 DieWithError(e)
5130
5131 if opts.full or settings.GetFormatFullByDefault():
5132 cmd = [clang_format_tool]
5133 if not opts.dry_run and not opts.diff:
5134 cmd.append('-i')
5135 if opts.dry_run:
5136 for diff_file in clang_diff_files:
5137 with open(diff_file, 'r') as myfile:
5138 code = myfile.read().replace('\r\n', '\n')
5139 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5140 stdout = stdout.replace('\r\n', '\n')
5141 if opts.diff:
5142 sys.stdout.write(stdout)
5143 if code != stdout:
5144 return_value = 2
5145 else:
5146 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5147 if opts.diff:
5148 sys.stdout.write(stdout)
5149 else:
5150 env = os.environ.copy()
5151 env['PATH'] = str(os.path.dirname(clang_format_tool))
5152 try:
5153 script = clang_format.FindClangFormatScriptInChromiumTree(
5154 'clang-format-diff.py')
5155 except clang_format.NotFoundError as e:
5156 DieWithError(e)
5157
5158 cmd = [sys.executable, script, '-p0']
5159 if not opts.dry_run and not opts.diff:
5160 cmd.append('-i')
5161
5162 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5163 diff_output = RunGit(diff_cmd)
5164
5165 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5166 if opts.diff:
5167 sys.stdout.write(stdout)
5168 if opts.dry_run and len(stdout) > 0:
5169 return_value = 2
5170
5171 return return_value
5172
5173
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005174def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005175 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005176 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005177
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005178
enne@chromium.org555cfe42014-01-29 18:21:39 +00005179@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005180@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005181def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005182 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005183 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005184 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005185 parser.add_option('--full', action='store_true',
5186 help='Reformat the full content of all touched files')
5187 parser.add_option('--dry-run', action='store_true',
5188 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005189 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005190 '--no-clang-format',
5191 dest='clang_format',
5192 action='store_false',
5193 default=True,
5194 help='Disables formatting of various file types using clang-format.')
5195 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005196 '--python',
5197 action='store_true',
5198 default=None,
5199 help='Enables python formatting on all python files.')
5200 parser.add_option(
5201 '--no-python',
5202 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005203 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005204 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005205 'If neither --python or --no-python are set, python files that have a '
5206 '.style.yapf file in an ancestor directory will be formatted. '
5207 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005208 parser.add_option(
5209 '--js',
5210 action='store_true',
5211 help='Format javascript code with clang-format. '
5212 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005213 parser.add_option('--diff', action='store_true',
5214 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005215 parser.add_option('--presubmit', action='store_true',
5216 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005217 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005218
Garrett Beaty91a6f332020-01-06 16:57:24 +00005219 if opts.python is not None and opts.no_python:
5220 raise parser.error('Cannot set both --python and --no-python')
5221 if opts.no_python:
5222 opts.python = False
5223
Daniel Chengc55eecf2016-12-30 03:11:02 -08005224 # Normalize any remaining args against the current path, so paths relative to
5225 # the current directory are still resolved as expected.
5226 args = [os.path.join(os.getcwd(), arg) for arg in args]
5227
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005228 # git diff generates paths against the root of the repository. Change
5229 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005230 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005231 if rel_base_path:
5232 os.chdir(rel_base_path)
5233
digit@chromium.org29e47272013-05-17 17:01:46 +00005234 # Grab the merge-base commit, i.e. the upstream commit of the current
5235 # branch when it was created or the last time it was rebased. This is
5236 # to cover the case where the user may have called "git fetch origin",
5237 # moving the origin branch to a newer commit, but hasn't rebased yet.
5238 upstream_commit = None
5239 cl = Changelist()
5240 upstream_branch = cl.GetUpstreamBranch()
5241 if upstream_branch:
5242 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5243 upstream_commit = upstream_commit.strip()
5244
5245 if not upstream_commit:
5246 DieWithError('Could not find base commit for this branch. '
5247 'Are you in detached state?')
5248
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005249 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5250 diff_output = RunGit(changed_files_cmd)
5251 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005252 # Filter out files deleted by this CL
5253 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005254
Christopher Lamc5ba6922017-01-24 11:19:14 +11005255 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005256 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005257
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005258 clang_diff_files = []
5259 if opts.clang_format:
5260 clang_diff_files = [
5261 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5262 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005263 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5264 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005265 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005266
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005267 top_dir = os.path.normpath(
5268 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5269
Jamie Madill5e96ad12020-01-13 16:08:35 +00005270 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5271 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005272
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005273 # Similar code to above, but using yapf on .py files rather than clang-format
5274 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005275 py_explicitly_disabled = opts.python is not None and not opts.python
5276 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005277 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5278 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5279 if sys.platform.startswith('win'):
5280 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005281
Aiden Bennerc08566e2018-10-03 17:52:42 +00005282 # Used for caching.
5283 yapf_configs = {}
5284 for f in python_diff_files:
5285 # Find the yapf style config for the current file, defaults to depot
5286 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005287 _FindYapfConfigFile(f, yapf_configs, top_dir)
5288
5289 # Turn on python formatting by default if a yapf config is specified.
5290 # This breaks in the case of this repo though since the specified
5291 # style file is also the global default.
5292 if opts.python is None:
5293 filtered_py_files = []
5294 for f in python_diff_files:
5295 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5296 filtered_py_files.append(f)
5297 else:
5298 filtered_py_files = python_diff_files
5299
5300 # Note: yapf still seems to fix indentation of the entire file
5301 # even if line ranges are specified.
5302 # See https://github.com/google/yapf/issues/499
5303 if not opts.full and filtered_py_files:
5304 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5305
Brian Sheedyb4307d52019-12-02 19:18:17 +00005306 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5307 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5308 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005309
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005310 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005311 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5312 # Default to pep8 if not .style.yapf is found.
5313 if not yapf_style:
5314 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005315
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005316 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005317
5318 has_formattable_lines = False
5319 if not opts.full:
5320 # Only run yapf over changed line ranges.
5321 for diff_start, diff_len in py_line_diffs[f]:
5322 diff_end = diff_start + diff_len - 1
5323 # Yapf errors out if diff_end < diff_start but this
5324 # is a valid line range diff for a removal.
5325 if diff_end >= diff_start:
5326 has_formattable_lines = True
5327 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5328 # If all line diffs were removals we have nothing to format.
5329 if not has_formattable_lines:
5330 continue
5331
5332 if opts.diff or opts.dry_run:
5333 cmd += ['--diff']
5334 # Will return non-zero exit code if non-empty diff.
5335 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5336 if opts.diff:
5337 sys.stdout.write(stdout)
5338 elif len(stdout) > 0:
5339 return_value = 2
5340 else:
5341 cmd += ['-i']
5342 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005343
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005344 # Dart's formatter does not have the nice property of only operating on
5345 # modified chunks, so hard code full.
5346 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005347 try:
5348 command = [dart_format.FindDartFmtToolInChromiumTree()]
5349 if not opts.dry_run and not opts.diff:
5350 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005351 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005352
ppi@chromium.org6593d932016-03-03 15:41:15 +00005353 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005354 if opts.dry_run and stdout:
5355 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005356 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005357 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5358 'found in this checkout. Files in other languages are still '
5359 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005360
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005361 # Format GN build files. Always run on full build files for canonical form.
5362 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005363 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005364 if opts.dry_run or opts.diff:
5365 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005366 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005367 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5368 shell=sys.platform == 'win32',
5369 cwd=top_dir)
5370 if opts.dry_run and gn_ret == 2:
5371 return_value = 2 # Not formatted.
5372 elif opts.diff and gn_ret == 2:
5373 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005374 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005375 elif gn_ret != 0:
5376 # For non-dry run cases (and non-2 return values for dry-run), a
5377 # nonzero error code indicates a failure, probably because the file
5378 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005379 DieWithError('gn format failed on ' + gn_diff_file +
5380 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005381
Ilya Shermane081cbe2017-08-15 17:51:04 -07005382 # Skip the metrics formatting from the global presubmit hook. These files have
5383 # a separate presubmit hook that issues an error if the files need formatting,
5384 # whereas the top-level presubmit script merely issues a warning. Formatting
5385 # these files is somewhat slow, so it's important not to duplicate the work.
5386 if not opts.presubmit:
5387 for xml_dir in GetDirtyMetricsDirs(diff_files):
5388 tool_dir = os.path.join(top_dir, xml_dir)
5389 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5390 if opts.dry_run or opts.diff:
5391 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005392 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005393 if opts.diff:
5394 sys.stdout.write(stdout)
5395 if opts.dry_run and stdout:
5396 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005397
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005398 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005399
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005400
Steven Holte2e664bf2017-04-21 13:10:47 -07005401def GetDirtyMetricsDirs(diff_files):
5402 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5403 metrics_xml_dirs = [
5404 os.path.join('tools', 'metrics', 'actions'),
5405 os.path.join('tools', 'metrics', 'histograms'),
5406 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005407 os.path.join('tools', 'metrics', 'ukm'),
5408 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005409 for xml_dir in metrics_xml_dirs:
5410 if any(file.startswith(xml_dir) for file in xml_diff_files):
5411 yield xml_dir
5412
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005413
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005414@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005415@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005416def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005417 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005418 _, args = parser.parse_args(args)
5419
5420 if len(args) != 1:
5421 parser.print_help()
5422 return 1
5423
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005424 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005425 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005426 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005427
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005428 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005429
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005430 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005431 output = RunGit(['config', '--local', '--get-regexp',
5432 r'branch\..*\.%s' % issueprefix],
5433 error_ok=True)
5434 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005435 if issue == target_issue:
5436 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005437
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005438 branches = []
5439 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005440 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005441 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005442 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005443 return 1
5444 if len(branches) == 1:
5445 RunGit(['checkout', branches[0]])
5446 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005447 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005448 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005449 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005450 which = raw_input('Choose by index: ')
5451 try:
5452 RunGit(['checkout', branches[int(which)]])
5453 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005454 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005455 return 1
5456
5457 return 0
5458
5459
maruel@chromium.org29404b52014-09-08 22:58:00 +00005460def CMDlol(parser, args):
5461 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005462 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005463 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5464 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5465 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005466 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005467 return 0
5468
5469
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005470class OptionParser(optparse.OptionParser):
5471 """Creates the option parse and add --verbose support."""
5472 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005473 optparse.OptionParser.__init__(
5474 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005475 self.add_option(
5476 '-v', '--verbose', action='count', default=0,
5477 help='Use 2 times for more debugging info')
5478
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005479 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005480 try:
5481 return self._parse_args(args)
5482 finally:
5483 # Regardless of success or failure of args parsing, we want to report
5484 # metrics, but only after logging has been initialized (if parsing
5485 # succeeded).
5486 global settings
5487 settings = Settings()
5488
5489 if not metrics.DISABLE_METRICS_COLLECTION:
5490 # GetViewVCUrl ultimately calls logging method.
5491 project_url = settings.GetViewVCUrl().strip('/+')
5492 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5493 metrics.collector.add('project_urls', [project_url])
5494
5495 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005496 # Create an optparse.Values object that will store only the actual passed
5497 # options, without the defaults.
5498 actual_options = optparse.Values()
5499 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5500 # Create an optparse.Values object with the default options.
5501 options = optparse.Values(self.get_default_values().__dict__)
5502 # Update it with the options passed by the user.
5503 options._update_careful(actual_options.__dict__)
5504 # Store the options passed by the user in an _actual_options attribute.
5505 # We store only the keys, and not the values, since the values can contain
5506 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005507 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005508
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005509 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005510 logging.basicConfig(
5511 level=levels[min(options.verbose, len(levels) - 1)],
5512 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5513 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005514
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005515 return options, args
5516
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005517
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005518def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005519 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005520 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005521 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005522 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005523
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005524 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005525 dispatcher = subcommand.CommandDispatcher(__name__)
5526 try:
5527 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005528 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005529 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005530 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005531 if e.code != 500:
5532 raise
5533 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005534 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005535 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005536 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005537
5538
5539if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005540 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5541 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005542 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005543 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005544 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005545 sys.exit(main(sys.argv[1:]))