blob: 530fd79ebddd8dfd6d2a803606df005137537adc [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 })
Anthony Polito1a5fe232020-01-24 23:17:52 +0000531
532 if options.revision:
533 requests[-1]['scheduleBuild']['gitilesCommit'] = {
534 'host': gerrit_changes[0]['host'],
535 'project': gerrit_changes[0]['project'],
536 'id': options.revision
537 }
538
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000539 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000540
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000541
Edward Lemur5b929a42019-10-21 17:57:39 +0000542def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000543 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000545 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000547 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000548 request = {
549 'predicate': {
550 'gerritChanges': [changelist.GetGerritChange(patchset)],
551 },
552 'fields': ','.join('builds.*.' + field for field in fields),
553 }
tandrii221ab252016-10-06 08:12:04 -0700554
Edward Lemur5b929a42019-10-21 17:57:39 +0000555 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 if authenticator.has_cached_credentials():
557 http = authenticator.authorize(httplib2.Http())
558 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700559 print('Warning: Some results might be missing because %s' %
560 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000561 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000563 http.force_exception_to_status_code = True
564
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000565 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
566 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567
Edward Lemur5b929a42019-10-21 17:57:39 +0000568def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000569 """Fetches builds from the latest patchset that has builds (within
570 the last few patchsets).
571
572 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000573 changelist (Changelist): The CL to fetch builds for
574 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000575 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
576 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000577 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
579 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000580 """
581 assert buildbucket_host
582 assert changelist.GetIssue(), 'CL must be uploaded first'
583 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000584 if latest_patchset is None:
585 assert changelist.GetMostRecentPatchset()
586 ps = changelist.GetMostRecentPatchset()
587 else:
588 assert latest_patchset > 0, latest_patchset
589 ps = latest_patchset
590
Quinten Yearsley983111f2019-09-26 17:18:48 +0000591 min_ps = max(1, ps - 5)
592 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000593 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000594 if len(builds):
595 return builds, ps
596 ps -= 1
597 return [], 0
598
599
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000600def _filter_failed_for_retry(all_builds):
601 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000602
603 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000604 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000605 i.e. a list of buildbucket.v2.Builds which includes status and builder
606 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000607
608 Returns:
609 A dict of bucket to builder to tests (empty list). This is the same format
610 accepted by _trigger_try_jobs and returned by _get_bucket_map.
611 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000612
613 def _builder_of(build):
614 builder = build['builder']
615 return (builder['project'], builder['bucket'], builder['builder'])
616
617 res = collections.defaultdict(dict)
618 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
619 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
620 # If builder had several builds, retry only if the last one failed.
621 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
622 # build, but in case of retrying failed jobs retrying a flaky one makes
623 # sense.
624 builds = list(builds)
625 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
626 continue
627 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
628 for t in builds[-1]['tags']):
629 # Don't retry experimental build previously triggered by CQ.
630 continue
631 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
632 # Don't retry if any are running.
633 continue
634 res[proj + '/' + buck][bldr] = []
635 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000636
637
qyearsleyeab3c042016-08-24 09:18:28 -0700638def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000639 """Prints nicely result of fetch_try_jobs."""
640 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000641 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000642 return
643
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000644 longest_builder = max(len(b['builder']['builder']) for b in builds)
645 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000646 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000647 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
648 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000649
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000650 builds_by_status = {}
651 for b in builds:
652 builds_by_status.setdefault(b['status'], []).append({
653 'id': b['id'],
654 'name': name_fmt.format(
655 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
656 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000657
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000658 sort_key = lambda b: (b['name'], b['id'])
659
660 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000661 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000662 if not builds:
663 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000664
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000665 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000666 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000667 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000668 else:
669 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
670
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000671 print(colorize(title))
672 for b in sorted(builds, key=sort_key):
673 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000674
675 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000676 print_builds(
677 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
678 print_builds(
679 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
680 color=Fore.MAGENTA)
681 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
682 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
683 color=Fore.MAGENTA)
684 print_builds('Started:', builds_by_status.pop('STARTED', []))
685 print_builds(
686 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000687 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000688 print_builds(
689 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000690 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000691
692
Aiden Bennerc08566e2018-10-03 17:52:42 +0000693def _ComputeDiffLineRanges(files, upstream_commit):
694 """Gets the changed line ranges for each file since upstream_commit.
695
696 Parses a git diff on provided files and returns a dict that maps a file name
697 to an ordered list of range tuples in the form (start_line, count).
698 Ranges are in the same format as a git diff.
699 """
700 # If files is empty then diff_output will be a full diff.
701 if len(files) == 0:
702 return {}
703
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000704 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000705 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000706 diff_output = RunGit(diff_cmd)
707
708 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
709 # 2 capture groups
710 # 0 == fname of diff file
711 # 1 == 'diff_start,diff_count' or 'diff_start'
712 # will match each of
713 # diff --git a/foo.foo b/foo.py
714 # @@ -12,2 +14,3 @@
715 # @@ -12,2 +17 @@
716 # running re.findall on the above string with pattern will give
717 # [('foo.py', ''), ('', '14,3'), ('', '17')]
718
719 curr_file = None
720 line_diffs = {}
721 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
722 if match[0] != '':
723 # Will match the second filename in diff --git a/a.py b/b.py.
724 curr_file = match[0]
725 line_diffs[curr_file] = []
726 else:
727 # Matches +14,3
728 if ',' in match[1]:
729 diff_start, diff_count = match[1].split(',')
730 else:
731 # Single line changes are of the form +12 instead of +12,1.
732 diff_start = match[1]
733 diff_count = 1
734
735 diff_start = int(diff_start)
736 diff_count = int(diff_count)
737
738 # If diff_count == 0 this is a removal we can ignore.
739 line_diffs[curr_file].append((diff_start, diff_count))
740
741 return line_diffs
742
743
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000744def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000745 """Checks if a yapf file is in any parent directory of fpath until top_dir.
746
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000747 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000748 is found returns None. Uses yapf_config_cache as a cache for previously found
749 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000750 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000751 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000752 # Return result if we've already computed it.
753 if fpath in yapf_config_cache:
754 return yapf_config_cache[fpath]
755
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000756 parent_dir = os.path.dirname(fpath)
757 if os.path.isfile(fpath):
758 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000759 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000760 # Otherwise fpath is a directory
761 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
762 if os.path.isfile(yapf_file):
763 ret = yapf_file
764 elif fpath == top_dir or parent_dir == fpath:
765 # If we're at the top level directory, or if we're at root
766 # there is no provided style.
767 ret = None
768 else:
769 # Otherwise recurse on the current directory.
770 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000771 yapf_config_cache[fpath] = ret
772 return ret
773
774
Brian Sheedyb4307d52019-12-02 19:18:17 +0000775def _GetYapfIgnorePatterns(top_dir):
776 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000777
778 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
779 but this functionality appears to break when explicitly passing files to
780 yapf for formatting. According to
781 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
782 the .yapfignore file should be in the directory that yapf is invoked from,
783 which we assume to be the top level directory in this case.
784
785 Args:
786 top_dir: The top level directory for the repository being formatted.
787
788 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000789 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000790 """
791 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000792 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000793 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000794 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000795
Brian Sheedyb4307d52019-12-02 19:18:17 +0000796 with open(yapfignore_file) as f:
797 for line in f.readlines():
798 stripped_line = line.strip()
799 # Comments and blank lines should be ignored.
800 if stripped_line.startswith('#') or stripped_line == '':
801 continue
802 ignore_patterns.add(stripped_line)
803 return ignore_patterns
804
805
806def _FilterYapfIgnoredFiles(filepaths, patterns):
807 """Filters out any filepaths that match any of the given patterns.
808
809 Args:
810 filepaths: An iterable of strings containing filepaths to filter.
811 patterns: An iterable of strings containing fnmatch patterns to filter on.
812
813 Returns:
814 A list of strings containing all the elements of |filepaths| that did not
815 match any of the patterns in |patterns|.
816 """
817 # Not inlined so that tests can use the same implementation.
818 return [f for f in filepaths
819 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000820
821
Aaron Gable13101a62018-02-09 13:20:41 -0800822def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000823 """Prints statistics about the change to the user."""
824 # --no-ext-diff is broken in some versions of Git, so try to work around
825 # this by overriding the environment (but there is still a problem if the
826 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000827 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000828 if 'GIT_EXTERNAL_DIFF' in env:
829 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000830
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000831 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800832 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000833 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000834
835
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000836class BuildbucketResponseException(Exception):
837 pass
838
839
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000840class Settings(object):
841 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000842 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000843 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000844 self.tree_status_url = None
845 self.viewvc_url = None
846 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000847 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000848 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000849 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000850 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000851 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000852
853 def LazyUpdateIfNeeded(self):
854 """Updates the settings from a codereview.settings file, if available."""
855 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000856 # The only value that actually changes the behavior is
857 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000858 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000859 error_ok=True
860 ).strip().lower()
861
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000862 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000863 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000864 LoadCodereviewSettingsFromFile(cr_settings_file)
865 self.updated = True
866
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000867 @staticmethod
868 def GetRelativeRoot():
869 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000870
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000871 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000872 if self.root is None:
873 self.root = os.path.abspath(self.GetRelativeRoot())
874 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000875
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000876 def GetTreeStatusUrl(self, error_ok=False):
877 if not self.tree_status_url:
878 error_message = ('You must configure your tree status URL by running '
879 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000880 self.tree_status_url = self._GetConfig(
881 'rietveld.tree-status-url', error_ok=error_ok,
882 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000883 return self.tree_status_url
884
885 def GetViewVCUrl(self):
886 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000887 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000888 return self.viewvc_url
889
rmistry@google.com90752582014-01-14 21:04:50 +0000890 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000891 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000892
rmistry@google.com5626a922015-02-26 14:03:30 +0000893 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000894 run_post_upload_hook = self._GetConfig(
895 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000896 return run_post_upload_hook == "True"
897
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000898 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000899 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000900
ukai@chromium.orge8077812012-02-03 03:41:46 +0000901 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000902 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000903 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700904 self.is_gerrit = (
905 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000906 return self.is_gerrit
907
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000908 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000909 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000910 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700911 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
912 if self.squash_gerrit_uploads is None:
913 # Default is squash now (http://crbug.com/611892#c23).
914 self.squash_gerrit_uploads = not (
915 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
916 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000917 return self.squash_gerrit_uploads
918
tandriia60502f2016-06-20 02:01:53 -0700919 def GetSquashGerritUploadsOverride(self):
920 """Return True or False if codereview.settings should be overridden.
921
922 Returns None if no override has been defined.
923 """
924 # See also http://crbug.com/611892#c23
925 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
926 error_ok=True).strip()
927 if result == 'true':
928 return True
929 if result == 'false':
930 return False
931 return None
932
tandrii@chromium.org28253532016-04-14 13:46:56 +0000933 def GetGerritSkipEnsureAuthenticated(self):
934 """Return True if EnsureAuthenticated should not be done for Gerrit
935 uploads."""
936 if self.gerrit_skip_ensure_authenticated is None:
937 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000938 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000939 error_ok=True).strip() == 'true')
940 return self.gerrit_skip_ensure_authenticated
941
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000942 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000943 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000944 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000945 # Git requires single quotes for paths with spaces. We need to replace
946 # them with double quotes for Windows to treat such paths as a single
947 # path.
948 self.git_editor = self._GetConfig(
949 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000950 return self.git_editor or None
951
thestig@chromium.org44202a22014-03-11 19:22:18 +0000952 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000953 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000954 DEFAULT_LINT_REGEX)
955
956 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000957 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000958 DEFAULT_LINT_IGNORE_REGEX)
959
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000960 def GetFormatFullByDefault(self):
961 if self.format_full_by_default is None:
962 result = (
963 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
964 error_ok=True).strip())
965 self.format_full_by_default = (result == 'true')
966 return self.format_full_by_default
967
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000968 def _GetConfig(self, param, **kwargs):
969 self.LazyUpdateIfNeeded()
970 return RunGit(['config', param], **kwargs).strip()
971
972
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000973def ShortBranchName(branch):
974 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000975 return branch.replace('refs/heads/', '', 1)
976
977
978def GetCurrentBranchRef():
979 """Returns branch ref (e.g., refs/heads/master) or None."""
980 return RunGit(['symbolic-ref', 'HEAD'],
981 stderr=subprocess2.VOID, error_ok=True).strip() or None
982
983
984def GetCurrentBranch():
985 """Returns current branch or None.
986
987 For refs/heads/* branches, returns just last part. For others, full ref.
988 """
989 branchref = GetCurrentBranchRef()
990 if branchref:
991 return ShortBranchName(branchref)
992 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000993
994
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000995class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000996 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000997 NONE = 'none'
998 DRY_RUN = 'dry_run'
999 COMMIT = 'commit'
1000
1001 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1002
1003
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001004class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +00001005 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001006 self.issue = issue
1007 self.patchset = patchset
1008 self.hostname = hostname
1009
1010 @property
1011 def valid(self):
1012 return self.issue is not None
1013
1014
Edward Lemurf38bc172019-09-03 21:02:13 +00001015def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001016 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1017 fail_result = _ParsedIssueNumberArgument()
1018
Edward Lemur678a6842019-10-03 22:25:05 +00001019 if isinstance(arg, int):
1020 return _ParsedIssueNumberArgument(issue=arg)
1021 if not isinstance(arg, basestring):
1022 return fail_result
1023
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001024 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001025 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001026 if not arg.startswith('http'):
1027 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001028
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001029 url = gclient_utils.UpgradeToHttps(arg)
1030 try:
Edward Lemur79d4f992019-11-11 23:49:02 +00001031 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001032 except ValueError:
1033 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001034
Edward Lemur678a6842019-10-03 22:25:05 +00001035 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1036 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1037 # Short urls like https://domain/<issue_number> can be used, but don't allow
1038 # specifying the patchset (you'd 404), but we allow that here.
1039 if parsed_url.path == '/':
1040 part = parsed_url.fragment
1041 else:
1042 part = parsed_url.path
1043
1044 match = re.match(
1045 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1046 if not match:
1047 return fail_result
1048
1049 issue = int(match.group('issue'))
1050 patchset = match.group('patchset')
1051 return _ParsedIssueNumberArgument(
1052 issue=issue,
1053 patchset=int(patchset) if patchset else None,
1054 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001055
1056
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001057def _create_description_from_log(args):
1058 """Pulls out the commit log to use as a base for the CL description."""
1059 log_args = []
1060 if len(args) == 1 and not args[0].endswith('.'):
1061 log_args = [args[0] + '..']
1062 elif len(args) == 1 and args[0].endswith('...'):
1063 log_args = [args[0][:-1]]
1064 elif len(args) == 2:
1065 log_args = [args[0] + '..' + args[1]]
1066 else:
1067 log_args = args[:] # Hope for the best!
1068 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1069
1070
Aaron Gablea45ee112016-11-22 15:14:38 -08001071class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001072 def __init__(self, issue, url):
1073 self.issue = issue
1074 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001075 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001076
1077 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001078 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001079 self.issue, self.url)
1080
1081
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001082_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001083 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001084 # TODO(tandrii): these two aren't known in Gerrit.
1085 'approval', 'disapproval'])
1086
1087
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001089 """Changelist works with one changelist in local branch.
1090
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001091 Notes:
1092 * Not safe for concurrent multi-{thread,process} use.
1093 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001094 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001095 """
1096
Edward Lemur125d60a2019-09-13 18:25:41 +00001097 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001098 """Create a new ChangeList instance.
1099
Edward Lemurf38bc172019-09-03 21:02:13 +00001100 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001101 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001103 global settings
1104 if not settings:
1105 # Happens when git_cl.py is used as a utility library.
1106 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108 self.branchref = branchref
1109 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001110 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111 self.branch = ShortBranchName(self.branchref)
1112 else:
1113 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001114 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001115 self.lookedup_issue = False
1116 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001117 self.has_description = False
1118 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001119 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001121 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001122 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001123 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001124 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001125
Edward Lemur125d60a2019-09-13 18:25:41 +00001126 # Lazily cached values.
1127 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1128 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1129 # Map from change number (issue) to its detail cache.
1130 self._detail_cache = {}
1131
1132 if codereview_host is not None:
1133 assert not codereview_host.startswith('https://'), codereview_host
1134 self._gerrit_host = codereview_host
1135 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001136
1137 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001138 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001139
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001140 The return value is a string suitable for passing to git cl with the --cc
1141 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001142 """
1143 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001144 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001145 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001146 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1147 return self.cc
1148
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001149 def GetCCListWithoutDefault(self):
1150 """Return the users cc'd on this CL excluding default ones."""
1151 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001152 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001153 return self.cc
1154
Daniel Cheng7227d212017-11-17 08:12:37 -08001155 def ExtendCC(self, more_cc):
1156 """Extends the list of users to cc on this CL based on the changed files."""
1157 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001158
1159 def GetBranch(self):
1160 """Returns the short branch name, e.g. 'master'."""
1161 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001162 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001163 if not branchref:
1164 return None
1165 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001166 self.branch = ShortBranchName(self.branchref)
1167 return self.branch
1168
1169 def GetBranchRef(self):
1170 """Returns the full branch name, e.g. 'refs/heads/master'."""
1171 self.GetBranch() # Poke the lazy loader.
1172 return self.branchref
1173
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001174 def ClearBranch(self):
1175 """Clears cached branch data of this object."""
1176 self.branch = self.branchref = None
1177
tandrii5d48c322016-08-18 16:19:37 -07001178 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1179 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1180 kwargs['branch'] = self.GetBranch()
1181 return _git_get_branch_config_value(key, default, **kwargs)
1182
1183 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1184 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1185 assert self.GetBranch(), (
1186 'this CL must have an associated branch to %sset %s%s' %
1187 ('un' if value is None else '',
1188 key,
1189 '' if value is None else ' to %r' % value))
1190 kwargs['branch'] = self.GetBranch()
1191 return _git_set_branch_config_value(key, value, **kwargs)
1192
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 @staticmethod
1194 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001195 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001196 e.g. 'origin', 'refs/heads/master'
1197 """
1198 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001199 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1200
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001201 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001202 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001203 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001204 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1205 error_ok=True).strip()
1206 if upstream_branch:
1207 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001208 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001209 # Else, try to guess the origin remote.
1210 remote_branches = RunGit(['branch', '-r']).split()
1211 if 'origin/master' in remote_branches:
1212 # Fall back on origin/master if it exits.
1213 remote = 'origin'
1214 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001216 DieWithError(
1217 'Unable to determine default branch to diff against.\n'
1218 'Either pass complete "git diff"-style arguments, like\n'
1219 ' git cl upload origin/master\n'
1220 'or verify this branch is set up to track another \n'
1221 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222
1223 return remote, upstream_branch
1224
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001225 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001226 upstream_branch = self.GetUpstreamBranch()
1227 if not BranchExists(upstream_branch):
1228 DieWithError('The upstream for the current branch (%s) does not exist '
1229 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001230 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001231 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001232
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001233 def GetUpstreamBranch(self):
1234 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001235 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001236 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001237 upstream_branch = upstream_branch.replace('refs/heads/',
1238 'refs/remotes/%s/' % remote)
1239 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1240 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001241 self.upstream_branch = upstream_branch
1242 return self.upstream_branch
1243
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001244 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001245 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001246 remote, branch = None, self.GetBranch()
1247 seen_branches = set()
1248 while branch not in seen_branches:
1249 seen_branches.add(branch)
1250 remote, branch = self.FetchUpstreamTuple(branch)
1251 branch = ShortBranchName(branch)
1252 if remote != '.' or branch.startswith('refs/remotes'):
1253 break
1254 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001255 remotes = RunGit(['remote'], error_ok=True).split()
1256 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001257 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001258 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001259 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001260 logging.warn('Could not determine which remote this change is '
1261 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001262 else:
1263 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001264 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001265 branch = 'HEAD'
1266 if branch.startswith('refs/remotes'):
1267 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001268 elif branch.startswith('refs/branch-heads/'):
1269 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001270 else:
1271 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001272 return self._remote
1273
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001274 def GitSanityChecks(self, upstream_git_obj):
1275 """Checks git repo status and ensures diff is from local commits."""
1276
sbc@chromium.org79706062015-01-14 21:18:12 +00001277 if upstream_git_obj is None:
1278 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001279 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001280 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001281 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001282 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001283 return False
1284
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001285 # Verify the commit we're diffing against is in our current branch.
1286 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1287 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1288 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001289 print('ERROR: %s is not in the current branch. You may need to rebase '
1290 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001291 return False
1292
1293 # List the commits inside the diff, and verify they are all local.
1294 commits_in_diff = RunGit(
1295 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1296 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1297 remote_branch = remote_branch.strip()
1298 if code != 0:
1299 _, remote_branch = self.GetRemoteBranch()
1300
1301 commits_in_remote = RunGit(
1302 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1303
1304 common_commits = set(commits_in_diff) & set(commits_in_remote)
1305 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001306 print('ERROR: Your diff contains %d commits already in %s.\n'
1307 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1308 'the diff. If you are using a custom git flow, you can override'
1309 ' the reference used for this check with "git config '
1310 'gitcl.remotebranch <git-ref>".' % (
1311 len(common_commits), remote_branch, upstream_git_obj),
1312 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001313 return False
1314 return True
1315
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001316 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001317 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001318
1319 Returns None if it is not set.
1320 """
tandrii5d48c322016-08-18 16:19:37 -07001321 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001322
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001323 def GetRemoteUrl(self):
1324 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1325
1326 Returns None if there is no remote.
1327 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001328 is_cached, value = self._cached_remote_url
1329 if is_cached:
1330 return value
1331
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001332 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001333 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1334
Edward Lemur298f2cf2019-02-22 21:40:39 +00001335 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001336 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001337 if host:
1338 self._cached_remote_url = (True, url)
1339 return url
1340
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001341 # If it cannot be parsed as an url, assume it is a local directory,
1342 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001343 logging.warning('"%s" doesn\'t appear to point to a git host. '
1344 'Interpreting it as a local directory.', url)
1345 if not os.path.isdir(url):
1346 logging.error(
1347 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001348 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001349 return None
1350
1351 cache_path = url
1352 url = RunGit(['config', 'remote.%s.url' % remote],
1353 error_ok=True,
1354 cwd=url).strip()
1355
Edward Lemur79d4f992019-11-11 23:49:02 +00001356 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001357 if not host:
1358 logging.error(
1359 'Remote "%(remote)s" for branch "%(branch)s" points to '
1360 '"%(cache_path)s", but it is misconfigured.\n'
1361 '"%(cache_path)s" must be a git repo and must have a remote named '
1362 '"%(remote)s" pointing to the git host.', {
1363 'remote': remote,
1364 'cache_path': cache_path,
1365 'branch': self.GetBranch()})
1366 return None
1367
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001368 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001369 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001370
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001371 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001372 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001373 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001374 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001375 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001376 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001377 return self.issue
1378
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001379 def GetIssueURL(self):
1380 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001381 issue = self.GetIssue()
1382 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001383 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001384 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001385
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001386 def GetDescription(self, pretty=False, force=False):
1387 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001388 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001389 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001390 self.has_description = True
1391 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001392 # Set width to 72 columns + 2 space indent.
1393 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001395 lines = self.description.splitlines()
1396 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001397 return self.description
1398
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001399 def GetDescriptionFooters(self):
1400 """Returns (non_footer_lines, footers) for the commit message.
1401
1402 Returns:
1403 non_footer_lines (list(str)) - Simple list of description lines without
1404 any footer. The lines do not contain newlines, nor does the list contain
1405 the empty line between the message and the footers.
1406 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1407 [("Change-Id", "Ideadbeef...."), ...]
1408 """
1409 raw_description = self.GetDescription()
1410 msg_lines, _, footers = git_footers.split_footers(raw_description)
1411 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001412 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001413 return msg_lines, footers
1414
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001416 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001417 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001418 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001419 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001420 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 return self.patchset
1422
1423 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001424 """Set this branch's patchset. If patchset=0, clears the patchset."""
1425 assert self.GetBranch()
1426 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001427 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001428 else:
1429 self.patchset = int(patchset)
1430 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001431 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001432
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001433 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001434 """Set this branch's issue. If issue isn't given, clears the issue."""
1435 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001436 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001437 issue = int(issue)
1438 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001439 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001440 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001441 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001442 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001443 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001444 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001445 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001446 else:
tandrii5d48c322016-08-18 16:19:37 -07001447 # Reset all of these just to be clean.
1448 reset_suffixes = [
1449 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001450 self.IssueConfigKey(),
1451 self.PatchsetConfigKey(),
1452 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001453 ] + self._PostUnsetIssueProperties()
1454 for prop in reset_suffixes:
1455 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001456 msg = RunGit(['log', '-1', '--format=%B']).strip()
1457 if msg and git_footers.get_footer_change_id(msg):
1458 print('WARNING: The change patched into this branch has a Change-Id. '
1459 'Removing it.')
1460 RunGit(['commit', '--amend', '-m',
1461 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001462 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001463 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001464 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001465
dnjba1b0f32016-09-02 12:37:42 -07001466 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001467 if not self.GitSanityChecks(upstream_branch):
1468 DieWithError('\nGit sanity check failure')
1469
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001470 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001471 if not root:
1472 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001473 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001474
1475 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001476 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001477 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001478 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001479 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001480 except subprocess2.CalledProcessError:
1481 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001482 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001483 'This branch probably doesn\'t exist anymore. To reset the\n'
1484 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001485 ' git branch --set-upstream-to origin/master %s\n'
1486 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001487 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001488
maruel@chromium.org52424302012-08-29 15:14:30 +00001489 issue = self.GetIssue()
1490 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001491 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001492 description = self.GetDescription()
1493 else:
1494 # If the change was never uploaded, use the log messages of all commits
1495 # up to the branch point, as git cl upload will prefill the description
1496 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001497 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1498 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001499
1500 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001501 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001502 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001503 name,
1504 description,
1505 absroot,
1506 files,
1507 issue,
1508 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001509 author,
1510 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001511
dsansomee2d6fd92016-09-08 00:10:47 -07001512 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001513 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001514 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001515 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001516
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001517 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1518 """Sets the description for this CL remotely.
1519
1520 You can get description_lines and footers with GetDescriptionFooters.
1521
1522 Args:
1523 description_lines (list(str)) - List of CL description lines without
1524 newline characters.
1525 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1526 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1527 `List-Of-Tokens`). It will be case-normalized so that each token is
1528 title-cased.
1529 """
1530 new_description = '\n'.join(description_lines)
1531 if footers:
1532 new_description += '\n'
1533 for k, v in footers:
1534 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1535 if not git_footers.FOOTER_PATTERN.match(foot):
1536 raise ValueError('Invalid footer %r' % foot)
1537 new_description += foot + '\n'
1538 self.UpdateDescription(new_description, force)
1539
Edward Lesmes8e282792018-04-03 18:50:29 -04001540 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001541 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1542 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001543 start = time_time()
1544 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001545 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1546 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001547 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001548 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001549 metrics.collector.add_repeated('sub_commands', {
1550 'command': 'presubmit',
1551 'execution_time': time_time() - start,
1552 'exit_code': 0 if result.should_continue() else 1,
1553 })
1554 return result
vapierfd77ac72016-06-16 08:33:57 -07001555 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001556 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001557
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001558 def CMDUpload(self, options, git_diff_args, orig_args):
1559 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001560 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001561 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001562 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001563 else:
1564 if self.GetBranch() is None:
1565 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1566
1567 # Default to diffing against common ancestor of upstream branch
1568 base_branch = self.GetCommonAncestorWithUpstream()
1569 git_diff_args = [base_branch, 'HEAD']
1570
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001571 # Fast best-effort checks to abort before running potentially expensive
1572 # hooks if uploading is likely to fail anyway. Passing these checks does
1573 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001574 self.EnsureAuthenticated(force=options.force)
1575 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576
1577 # Apply watchlists on upload.
1578 change = self.GetChange(base_branch, None)
1579 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1580 files = [f.LocalPath() for f in change.AffectedFiles()]
1581 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001582 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583
1584 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001585 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001586 # Set the reviewer list now so that presubmit checks can access it.
1587 change_description = ChangeDescription(change.FullDescriptionText())
1588 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001589 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001590 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001591 change)
1592 change.SetDescriptionText(change_description.description)
1593 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001594 may_prompt=not options.force,
1595 verbose=options.verbose,
1596 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001597 if not hook_results.should_continue():
1598 return 1
1599 if not options.reviewers and hook_results.reviewers:
1600 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001601 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001602
Aaron Gable13101a62018-02-09 13:20:41 -08001603 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001604 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001605 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001606 _git_set_branch_config_value('last-upload-hash',
1607 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001608 # Run post upload hooks, if specified.
1609 if settings.GetRunPostUploadHook():
1610 presubmit_support.DoPostUploadExecuter(
1611 change,
1612 self,
1613 settings.GetRoot(),
1614 options.verbose,
1615 sys.stdout)
1616
1617 # Upload all dependencies if specified.
1618 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001619 print()
1620 print('--dependencies has been specified.')
1621 print('All dependent local branches will be re-uploaded.')
1622 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001623 # Remove the dependencies flag from args so that we do not end up in a
1624 # loop.
1625 orig_args.remove('--dependencies')
1626 ret = upload_branch_deps(self, orig_args)
1627 return ret
1628
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001629 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001630 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001631
1632 Issue must have been already uploaded and known.
1633 """
1634 assert new_state in _CQState.ALL_STATES
1635 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001636 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001637 vote_map = {
1638 _CQState.NONE: 0,
1639 _CQState.DRY_RUN: 1,
1640 _CQState.COMMIT: 2,
1641 }
1642 labels = {'Commit-Queue': vote_map[new_state]}
1643 notify = False if new_state == _CQState.DRY_RUN else None
1644 gerrit_util.SetReview(
1645 self._GetGerritHost(), self._GerritChangeIdentifier(),
1646 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001647 return 0
1648 except KeyboardInterrupt:
1649 raise
1650 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001651 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001652 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001653 ' * Your project has no CQ,\n'
1654 ' * You don\'t have permission to change the CQ state,\n'
1655 ' * There\'s a bug in this code (see stack trace below).\n'
1656 'Consider specifying which bots to trigger manually or asking your '
1657 'project owners for permissions or contacting Chrome Infra at:\n'
1658 'https://www.chromium.org/infra\n\n' %
1659 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001660 # Still raise exception so that stack trace is printed.
1661 raise
1662
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001663 def _GetGerritHost(self):
1664 # Lazy load of configs.
1665 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001666 if self._gerrit_host and '.' not in self._gerrit_host:
1667 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1668 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001669 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001670 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001671 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001672 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001673 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1674 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001675 return self._gerrit_host
1676
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001677 def _GetGitHost(self):
1678 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001679 remote_url = self.GetRemoteUrl()
1680 if not remote_url:
1681 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001682 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001683
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001684 def GetCodereviewServer(self):
1685 if not self._gerrit_server:
1686 # If we're on a branch then get the server potentially associated
1687 # with that branch.
1688 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001689 self._gerrit_server = self._GitGetBranchConfigValue(
1690 self.CodereviewServerConfigKey())
1691 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001692 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001693 if not self._gerrit_server:
1694 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1695 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001696 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001697 parts[0] = parts[0] + '-review'
1698 self._gerrit_host = '.'.join(parts)
1699 self._gerrit_server = 'https://%s' % self._gerrit_host
1700 return self._gerrit_server
1701
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001702 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001703 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001704 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001705 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001706 logging.warn('can\'t detect Gerrit project.')
1707 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001708 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001709 if project.endswith('.git'):
1710 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001711 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1712 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1713 # gitiles/git-over-https protocol. E.g.,
1714 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1715 # as
1716 # https://chromium.googlesource.com/v8/v8
1717 if project.startswith('a/'):
1718 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001719 return project
1720
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001721 def _GerritChangeIdentifier(self):
1722 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1723
1724 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001725 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001726 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001727 project = self._GetGerritProject()
1728 if project:
1729 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1730 # Fall back on still unique, but less efficient change number.
1731 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001732
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001733 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001734 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001735 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001736
tandrii5d48c322016-08-18 16:19:37 -07001737 @classmethod
1738 def PatchsetConfigKey(cls):
1739 return 'gerritpatchset'
1740
1741 @classmethod
1742 def CodereviewServerConfigKey(cls):
1743 return 'gerritserver'
1744
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001745 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001746 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001747 if settings.GetGerritSkipEnsureAuthenticated():
1748 # For projects with unusual authentication schemes.
1749 # See http://crbug.com/603378.
1750 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001751
1752 # Check presence of cookies only if using cookies-based auth method.
1753 cookie_auth = gerrit_util.Authenticator.get()
1754 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001755 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001756
Edward Lemur79d4f992019-11-11 23:49:02 +00001757 if urllib.parse.urlparse(self.GetRemoteUrl()).scheme != 'https':
Daniel Chengcf6269b2019-05-18 01:02:12 +00001758 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001759 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001760 return
1761
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001762 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001763 self.GetCodereviewServer()
1764 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001765 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001766
1767 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1768 git_auth = cookie_auth.get_auth_header(git_host)
1769 if gerrit_auth and git_auth:
1770 if gerrit_auth == git_auth:
1771 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001772 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001773 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001774 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001775 ' %s\n'
1776 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001777 ' Consider running the following command:\n'
1778 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001779 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001780 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001781 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001782 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001783 cookie_auth.get_new_password_message(git_host)))
1784 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001785 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001786 return
1787 else:
1788 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001789 ([] if gerrit_auth else [self._gerrit_host]) +
1790 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001791 DieWithError('Credentials for the following hosts are required:\n'
1792 ' %s\n'
1793 'These are read from %s (or legacy %s)\n'
1794 '%s' % (
1795 '\n '.join(missing),
1796 cookie_auth.get_gitcookies_path(),
1797 cookie_auth.get_netrc_path(),
1798 cookie_auth.get_new_password_message(git_host)))
1799
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001800 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001801 if not self.GetIssue():
1802 return
1803
1804 # Warm change details cache now to avoid RPCs later, reducing latency for
1805 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001806 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001807 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001808
1809 status = self._GetChangeDetail()['status']
1810 if status in ('MERGED', 'ABANDONED'):
1811 DieWithError('Change %s has been %s, new uploads are not allowed' %
1812 (self.GetIssueURL(),
1813 'submitted' if status == 'MERGED' else 'abandoned'))
1814
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001815 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1816 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1817 # Apparently this check is not very important? Otherwise get_auth_email
1818 # could have been added to other implementations of Authenticator.
1819 cookies_auth = gerrit_util.Authenticator.get()
1820 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001821 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001822
1823 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001824 if self.GetIssueOwner() == cookies_user:
1825 return
1826 logging.debug('change %s owner is %s, cookies user is %s',
1827 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001828 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001829 # so ask what Gerrit thinks of this user.
1830 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1831 if details['email'] == self.GetIssueOwner():
1832 return
1833 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001834 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001835 'as %s.\n'
1836 'Uploading may fail due to lack of permissions.' %
1837 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1838 confirm_or_exit(action='upload')
1839
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001840 def _PostUnsetIssueProperties(self):
1841 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001842 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001843
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001844 def GetGerritObjForPresubmit(self):
1845 return presubmit_support.GerritAccessor(self._GetGerritHost())
1846
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001847 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001848 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001849 or CQ status, assuming adherence to a common workflow.
1850
1851 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001852 * 'error' - error from review tool (including deleted issues)
1853 * 'unsent' - no reviewers added
1854 * 'waiting' - waiting for review
1855 * 'reply' - waiting for uploader to reply to review
1856 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001857 * 'dry-run' - dry-running in the CQ
1858 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001859 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001860 """
1861 if not self.GetIssue():
1862 return None
1863
1864 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001865 data = self._GetChangeDetail([
1866 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001867 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001868 return 'error'
1869
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001870 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001871 return 'closed'
1872
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001873 cq_label = data['labels'].get('Commit-Queue', {})
1874 max_cq_vote = 0
1875 for vote in cq_label.get('all', []):
1876 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1877 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001878 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001879 if max_cq_vote == 1:
1880 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001881
Aaron Gable9ab38c62017-04-06 14:36:33 -07001882 if data['labels'].get('Code-Review', {}).get('approved'):
1883 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001884
1885 if not data.get('reviewers', {}).get('REVIEWER', []):
1886 return 'unsent'
1887
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001888 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001889 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001890 last_message_author = messages.pop().get('author', {})
1891 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001892 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1893 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001894 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001895 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001896 if last_message_author.get('_account_id') == owner:
1897 # Most recent message was by owner.
1898 return 'waiting'
1899 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001900 # Some reply from non-owner.
1901 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001902
1903 # Somehow there are no messages even though there are reviewers.
1904 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001905
1906 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001907 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001908 patchset = data['revisions'][data['current_revision']]['_number']
1909 self.SetPatchset(patchset)
1910 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001912 def FetchDescription(self, force=False):
1913 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1914 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001915 current_rev = data['current_revision']
Edward Lemur79d4f992019-11-11 23:49:02 +00001916 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001917
dsansomee2d6fd92016-09-08 00:10:47 -07001918 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001919 if gerrit_util.HasPendingChangeEdit(
1920 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001921 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001922 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001923 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001924 'unpublished edit. Either publish the edit in the Gerrit web UI '
1925 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001926
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001927 gerrit_util.DeletePendingChangeEdit(
1928 self._GetGerritHost(), self._GerritChangeIdentifier())
1929 gerrit_util.SetCommitMessage(
1930 self._GetGerritHost(), self._GerritChangeIdentifier(),
1931 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001932
Aaron Gable636b13f2017-07-14 10:42:48 -07001933 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001934 gerrit_util.SetReview(
1935 self._GetGerritHost(), self._GerritChangeIdentifier(),
1936 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001937
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001938 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001939 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001940 # CURRENT_REVISION is included to get the latest patchset so that
1941 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001942 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001943 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1944 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001945 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001946 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001947 robot_file_comments = gerrit_util.GetChangeRobotComments(
1948 self._GetGerritHost(), self._GerritChangeIdentifier())
1949
1950 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001951 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001952 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001953 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001954 line_comments = file_comments.setdefault(path, [])
1955 line_comments.extend(
1956 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001957
1958 # Build dictionary of file comments for easy access and sorting later.
1959 # {author+date: {path: {patchset: {line: url+message}}}}
1960 comments = collections.defaultdict(
1961 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001962 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001963 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001964 tag = comment.get('tag', '')
1965 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001966 continue
1967 key = (comment['author']['email'], comment['updated'])
1968 if comment.get('side', 'REVISION') == 'PARENT':
1969 patchset = 'Base'
1970 else:
1971 patchset = 'PS%d' % comment['patch_set']
1972 line = comment.get('line', 0)
1973 url = ('https://%s/c/%s/%s/%s#%s%s' %
1974 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1975 'b' if comment.get('side') == 'PARENT' else '',
1976 str(line) if line else ''))
1977 comments[key][path][patchset][line] = (url, comment['message'])
1978
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001979 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001980 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001981 summary = self._BuildCommentSummary(msg, comments, readable)
1982 if summary:
1983 summaries.append(summary)
1984 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001985
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001986 @staticmethod
1987 def _BuildCommentSummary(msg, comments, readable):
1988 key = (msg['author']['email'], msg['date'])
1989 # Don't bother showing autogenerated messages that don't have associated
1990 # file or line comments. this will filter out most autogenerated
1991 # messages, but will keep robot comments like those from Tricium.
1992 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1993 if is_autogenerated and not comments.get(key):
1994 return None
1995 message = msg['message']
1996 # Gerrit spits out nanoseconds.
1997 assert len(msg['date'].split('.')[-1]) == 9
1998 date = datetime.datetime.strptime(msg['date'][:-3],
1999 '%Y-%m-%d %H:%M:%S.%f')
2000 if key in comments:
2001 message += '\n'
2002 for path, patchsets in sorted(comments.get(key, {}).items()):
2003 if readable:
2004 message += '\n%s' % path
2005 for patchset, lines in sorted(patchsets.items()):
2006 for line, (url, content) in sorted(lines.items()):
2007 if line:
2008 line_str = 'Line %d' % line
2009 path_str = '%s:%d:' % (path, line)
2010 else:
2011 line_str = 'File comment'
2012 path_str = '%s:0:' % path
2013 if readable:
2014 message += '\n %s, %s: %s' % (patchset, line_str, url)
2015 message += '\n %s\n' % content
2016 else:
2017 message += '\n%s ' % path_str
2018 message += '\n%s\n' % content
2019
2020 return _CommentSummary(
2021 date=date,
2022 message=message,
2023 sender=msg['author']['email'],
2024 autogenerated=is_autogenerated,
2025 # These could be inferred from the text messages and correlated with
2026 # Code-Review label maximum, however this is not reliable.
2027 # Leaving as is until the need arises.
2028 approval=False,
2029 disapproval=False,
2030 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002031
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002032 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002033 gerrit_util.AbandonChange(
2034 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002035
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002036 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002037 gerrit_util.SubmitChange(
2038 self._GetGerritHost(), self._GerritChangeIdentifier(),
2039 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002040
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002041 def _GetChangeDetail(self, options=None, no_cache=False):
2042 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002043
2044 If fresh data is needed, set no_cache=True which will clear cache and
2045 thus new data will be fetched from Gerrit.
2046 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002047 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002048 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002049
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002050 # Optimization to avoid multiple RPCs:
2051 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2052 'CURRENT_COMMIT' not in options):
2053 options.append('CURRENT_COMMIT')
2054
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002055 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002056 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002057 options = [o.upper() for o in options]
2058
2059 # Check in cache first unless no_cache is True.
2060 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002061 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002062 else:
2063 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002064 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002065 # Assumption: data fetched before with extra options is suitable
2066 # for return for a smaller set of options.
2067 # For example, if we cached data for
2068 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2069 # and request is for options=[CURRENT_REVISION],
2070 # THEN we can return prior cached data.
2071 if options_set.issubset(cached_options_set):
2072 return data
2073
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002074 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002075 data = gerrit_util.GetChangeDetail(
2076 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002077 except gerrit_util.GerritError as e:
2078 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002079 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002080 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002081
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002082 self._detail_cache.setdefault(cache_key, []).append(
2083 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002084 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002085
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002086 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002087 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002088 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002089 data = gerrit_util.GetChangeCommit(
2090 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002091 except gerrit_util.GerritError as e:
2092 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002093 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002094 raise
agable32978d92016-11-01 12:55:02 -07002095 return data
2096
Karen Qian40c19422019-03-13 21:28:29 +00002097 def _IsCqConfigured(self):
2098 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002099 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002100
Olivier Robin75ee7252018-04-13 10:02:56 +02002101 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002102 if git_common.is_dirty_git_tree('land'):
2103 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002104
tandriid60367b2016-06-22 05:25:12 -07002105 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002106 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002107 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002108 'which can test and land changes for you. '
2109 'Are you sure you wish to bypass it?\n',
2110 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002111 differs = True
tandriic4344b52016-08-29 06:04:54 -07002112 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002113 # Note: git diff outputs nothing if there is no diff.
2114 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002115 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002116 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002117 if detail['current_revision'] == last_upload:
2118 differs = False
2119 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002120 print('WARNING: Local branch contents differ from latest uploaded '
2121 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002122 if differs:
2123 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002124 confirm_or_exit(
2125 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2126 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002127 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002128 elif not bypass_hooks:
2129 hook_results = self.RunHook(
2130 committing=True,
2131 may_prompt=not force,
2132 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002133 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2134 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002135 if not hook_results.should_continue():
2136 return 1
2137
2138 self.SubmitIssue(wait_for_merge=True)
2139 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002140 links = self._GetChangeCommit().get('web_links', [])
2141 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002142 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002143 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002144 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002145 return 0
2146
Edward Lemurf38bc172019-09-03 21:02:13 +00002147 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002148 assert parsed_issue_arg.valid
2149
Edward Lemur125d60a2019-09-13 18:25:41 +00002150 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002151
2152 if parsed_issue_arg.hostname:
2153 self._gerrit_host = parsed_issue_arg.hostname
2154 self._gerrit_server = 'https://%s' % self._gerrit_host
2155
tandriic2405f52016-10-10 08:13:15 -07002156 try:
2157 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002158 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002159 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002160
2161 if not parsed_issue_arg.patchset:
2162 # Use current revision by default.
2163 revision_info = detail['revisions'][detail['current_revision']]
2164 patchset = int(revision_info['_number'])
2165 else:
2166 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002167 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002168 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2169 break
2170 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002171 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002172 (parsed_issue_arg.patchset, self.GetIssue()))
2173
Edward Lemur125d60a2019-09-13 18:25:41 +00002174 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002175 if remote_url.endswith('.git'):
2176 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002177 remote_url = remote_url.rstrip('/')
2178
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002179 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002180 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002181
2182 if remote_url != fetch_info['url']:
2183 DieWithError('Trying to patch a change from %s but this repo appears '
2184 'to be %s.' % (fetch_info['url'], remote_url))
2185
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002186 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002187
Aaron Gable62619a32017-06-16 08:22:09 -07002188 if force:
2189 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2190 print('Checked out commit for change %i patchset %i locally' %
2191 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002192 elif nocommit:
2193 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2194 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002195 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002196 RunGit(['cherry-pick', 'FETCH_HEAD'])
2197 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002198 (parsed_issue_arg.issue, patchset))
2199 print('Note: this created a local commit which does not have '
2200 'the same hash as the one uploaded for review. This will make '
2201 'uploading changes based on top of this branch difficult.\n'
2202 'If you want to do that, use "git cl patch --force" instead.')
2203
Stefan Zagerd08043c2017-10-12 12:07:02 -07002204 if self.GetBranch():
2205 self.SetIssue(parsed_issue_arg.issue)
2206 self.SetPatchset(patchset)
2207 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2208 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2209 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2210 else:
2211 print('WARNING: You are in detached HEAD state.\n'
2212 'The patch has been applied to your checkout, but you will not be '
2213 'able to upload a new patch set to the gerrit issue.\n'
2214 'Try using the \'-b\' option if you would like to work on a '
2215 'branch and/or upload a new patch set.')
2216
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002217 return 0
2218
tandrii16e0b4e2016-06-07 10:34:28 -07002219 def _GerritCommitMsgHookCheck(self, offer_removal):
2220 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2221 if not os.path.exists(hook):
2222 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002223 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2224 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002225 data = gclient_utils.FileRead(hook)
2226 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2227 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002228 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002229 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002230 'and may interfere with it in subtle ways.\n'
2231 'We recommend you remove the commit-msg hook.')
2232 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002233 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002234 gclient_utils.rm_file_or_tree(hook)
2235 print('Gerrit commit-msg hook removed.')
2236 else:
2237 print('OK, will keep Gerrit commit-msg hook in place.')
2238
Edward Lemur1b52d872019-05-09 21:12:12 +00002239 def _CleanUpOldTraces(self):
2240 """Keep only the last |MAX_TRACES| traces."""
2241 try:
2242 traces = sorted([
2243 os.path.join(TRACES_DIR, f)
2244 for f in os.listdir(TRACES_DIR)
2245 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2246 and not f.startswith('tmp'))
2247 ])
2248 traces_to_delete = traces[:-MAX_TRACES]
2249 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002250 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002251 except OSError:
2252 print('WARNING: Failed to remove old git traces from\n'
2253 ' %s'
2254 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002255
Edward Lemur5737f022019-05-17 01:24:00 +00002256 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002257 """Zip and write the git push traces stored in traces_dir."""
2258 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002259 traces_zip = trace_name + '-traces'
2260 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002261 # Create a temporary dir to store git config and gitcookies in. It will be
2262 # compressed and stored next to the traces.
2263 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002264 git_info_zip = trace_name + '-git-info'
2265
Edward Lemur5737f022019-05-17 01:24:00 +00002266 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002267 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002268 git_push_metadata['now'] = git_push_metadata['now'].decode(
2269 sys.stdin.encoding)
2270
Edward Lemur1b52d872019-05-09 21:12:12 +00002271 git_push_metadata['trace_name'] = trace_name
2272 gclient_utils.FileWrite(
2273 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2274
2275 # Keep only the first 6 characters of the git hashes on the packet
2276 # trace. This greatly decreases size after compression.
2277 packet_traces = os.path.join(traces_dir, 'trace-packet')
2278 if os.path.isfile(packet_traces):
2279 contents = gclient_utils.FileRead(packet_traces)
2280 gclient_utils.FileWrite(
2281 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2282 shutil.make_archive(traces_zip, 'zip', traces_dir)
2283
2284 # Collect and compress the git config and gitcookies.
2285 git_config = RunGit(['config', '-l'])
2286 gclient_utils.FileWrite(
2287 os.path.join(git_info_dir, 'git-config'),
2288 git_config)
2289
2290 cookie_auth = gerrit_util.Authenticator.get()
2291 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2292 gitcookies_path = cookie_auth.get_gitcookies_path()
2293 if os.path.isfile(gitcookies_path):
2294 gitcookies = gclient_utils.FileRead(gitcookies_path)
2295 gclient_utils.FileWrite(
2296 os.path.join(git_info_dir, 'gitcookies'),
2297 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2298 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2299
Edward Lemur1b52d872019-05-09 21:12:12 +00002300 gclient_utils.rmtree(git_info_dir)
2301
2302 def _RunGitPushWithTraces(
2303 self, change_desc, refspec, refspec_opts, git_push_metadata):
2304 """Run git push and collect the traces resulting from the execution."""
2305 # Create a temporary directory to store traces in. Traces will be compressed
2306 # and stored in a 'traces' dir inside depot_tools.
2307 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002308 trace_name = os.path.join(
2309 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002310
2311 env = os.environ.copy()
2312 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2313 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002314 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002315 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2316 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2317 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2318
2319 try:
2320 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002321 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002322 before_push = time_time()
2323 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002324 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002325 env=env,
2326 print_stdout=True,
2327 # Flush after every line: useful for seeing progress when running as
2328 # recipe.
2329 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002330 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002331 except subprocess2.CalledProcessError as e:
2332 push_returncode = e.returncode
2333 DieWithError('Failed to create a change. Please examine output above '
2334 'for the reason of the failure.\n'
2335 'Hint: run command below to diagnose common Git/Gerrit '
2336 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002337 ' git cl creds-check\n'
2338 '\n'
2339 'If git-cl is not working correctly, file a bug under the '
2340 'Infra>SDK component including the files below.\n'
2341 'Review the files before upload, since they might contain '
2342 'sensitive information.\n'
2343 'Set the Restrict-View-Google label so that they are not '
2344 'publicly accessible.\n'
2345 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002346 change_desc)
2347 finally:
2348 execution_time = time_time() - before_push
2349 metrics.collector.add_repeated('sub_commands', {
2350 'command': 'git push',
2351 'execution_time': execution_time,
2352 'exit_code': push_returncode,
2353 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2354 })
2355
Edward Lemur1b52d872019-05-09 21:12:12 +00002356 git_push_metadata['execution_time'] = execution_time
2357 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002358 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002359
Edward Lemur1b52d872019-05-09 21:12:12 +00002360 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002361 gclient_utils.rmtree(traces_dir)
2362
2363 return push_stdout
2364
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002365 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002366 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002367 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002368 # Load default for user, repo, squash=true, in this order.
2369 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002370
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002371 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002372 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002373 # This may be None; default fallback value is determined in logic below.
2374 title = options.title
2375
Dominic Battre7d1c4842017-10-27 09:17:28 +02002376 # Extract bug number from branch name.
2377 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002378 fixed = options.fixed
2379 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2380 self.GetBranch())
2381 if not bug and not fixed and match:
2382 if match.group('type') == 'bug':
2383 bug = match.group('bugnum')
2384 else:
2385 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002386
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002387 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002388 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002389 if self.GetIssue():
2390 # Try to get the message from a previous upload.
2391 message = self.GetDescription()
2392 if not message:
2393 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002394 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002395 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002396 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002397 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002398 # When uploading a subsequent patchset, -m|--message is taken
2399 # as the patchset title if --title was not provided.
2400 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002401 else:
2402 default_title = RunGit(
2403 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002404 if options.force:
2405 title = default_title
2406 else:
2407 title = ask_for_data(
2408 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002409
2410 # User requested to change description
2411 if options.edit_description:
2412 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2413 change_desc.prompt()
2414 message = change_desc.description
2415
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002416 change_id = self._GetChangeDetail()['change_id']
2417 while True:
2418 footer_change_ids = git_footers.get_footer_change_id(message)
2419 if footer_change_ids == [change_id]:
2420 break
2421 if not footer_change_ids:
2422 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002423 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002424 continue
2425 # There is already a valid footer but with different or several ids.
2426 # Doing this automatically is non-trivial as we don't want to lose
2427 # existing other footers, yet we want to append just 1 desired
2428 # Change-Id. Thus, just create a new footer, but let user verify the
2429 # new description.
2430 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002431 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002432 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002433 print(
2434 'WARNING: change %s has Change-Id footer(s):\n'
2435 ' %s\n'
2436 'but change has Change-Id %s, according to Gerrit.\n'
2437 'Please, check the proposed correction to the description, '
2438 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2439 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2440 change_id))
2441 confirm_or_exit(action='edit')
2442 change_desc.prompt()
2443
2444 message = change_desc.description
2445 if not message:
2446 DieWithError("Description is empty. Aborting...")
2447
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002448 # Continue the while loop.
2449 # Sanity check of this code - we should end up with proper message
2450 # footer.
2451 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002452 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002453 else: # if not self.GetIssue()
2454 if options.message:
2455 message = options.message
2456 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002457 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002458 if options.title:
2459 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002460 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002461 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002462 change_desc.prompt()
2463
Aaron Gableb56ad332017-01-06 15:24:31 -08002464 # On first upload, patchset title is always this string, while
2465 # --title flag gets converted to first line of message.
2466 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002467 if not change_desc.description:
2468 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002469 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002470 if len(change_ids) > 1:
2471 DieWithError('too many Change-Id footers, at most 1 allowed.')
2472 if not change_ids:
2473 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002474 change_desc.set_description(git_footers.add_footer_change_id(
2475 change_desc.description,
2476 GenerateGerritChangeId(change_desc.description)))
2477 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002478 assert len(change_ids) == 1
2479 change_id = change_ids[0]
2480
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002481 if options.reviewers or options.tbrs or options.add_owners_to:
2482 change_desc.update_reviewers(options.reviewers, options.tbrs,
2483 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002484 if options.preserve_tryjobs:
2485 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002486
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002487 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002488 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2489 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002490 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lesmesf6a22322019-11-04 22:14:39 +00002491 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
Edward Lemur79d4f992019-11-11 23:49:02 +00002492 desc_tempfile.write(change_desc.description.encode('utf-8', 'replace'))
Aaron Gable9a03ae02017-11-03 11:31:07 -07002493 desc_tempfile.close()
2494 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2495 '-F', desc_tempfile.name]).strip()
2496 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002497 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002498 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002499 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002500 if not change_desc.description:
2501 DieWithError("Description is empty. Aborting...")
2502
2503 if not git_footers.get_footer_change_id(change_desc.description):
2504 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002505 change_desc.set_description(
2506 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002507 if options.reviewers or options.tbrs or options.add_owners_to:
2508 change_desc.update_reviewers(options.reviewers, options.tbrs,
2509 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002510 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002511 # For no-squash mode, we assume the remote called "origin" is the one we
2512 # want. It is not worthwhile to support different workflows for
2513 # no-squash mode.
2514 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002515 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2516
2517 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002518 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002519 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2520 ref_to_push)]).splitlines()
2521 if len(commits) > 1:
2522 print('WARNING: This will upload %d commits. Run the following command '
2523 'to see which commits will be uploaded: ' % len(commits))
2524 print('git log %s..%s' % (parent, ref_to_push))
2525 print('You can also use `git squash-branch` to squash these into a '
2526 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002527 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002528
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002529 if options.reviewers or options.tbrs or options.add_owners_to:
2530 change_desc.update_reviewers(options.reviewers, options.tbrs,
2531 options.add_owners_to, change)
2532
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002533 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002534 cc = []
2535 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2536 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2537 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002538 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002539 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002540 if options.cc:
2541 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002542 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002543 if change_desc.get_cced():
2544 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002545 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2546 valid_accounts = set(reviewers + cc)
2547 # TODO(crbug/877717): relax this for all hosts.
2548 else:
2549 valid_accounts = gerrit_util.ValidAccounts(
2550 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002551 logging.info('accounts %s are recognized, %s invalid',
2552 sorted(valid_accounts),
2553 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002554
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002555 # Extra options that can be specified at push time. Doc:
2556 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002557 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002558
Aaron Gable844cf292017-06-28 11:32:59 -07002559 # By default, new changes are started in WIP mode, and subsequent patchsets
2560 # don't send email. At any time, passing --send-mail will mark the change
2561 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002562 if options.send_mail:
2563 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002564 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002565 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002566 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002567 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002568 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002569
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002570 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002571 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002572
Aaron Gable9b713dd2016-12-14 16:04:21 -08002573 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002574 # Punctuation and whitespace in |title| must be percent-encoded.
2575 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002576
agablec6787972016-09-09 16:13:34 -07002577 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002578 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002579
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002580 for r in sorted(reviewers):
2581 if r in valid_accounts:
2582 refspec_opts.append('r=%s' % r)
2583 reviewers.remove(r)
2584 else:
2585 # TODO(tandrii): this should probably be a hard failure.
2586 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2587 % r)
2588 for c in sorted(cc):
2589 # refspec option will be rejected if cc doesn't correspond to an
2590 # account, even though REST call to add such arbitrary cc may succeed.
2591 if c in valid_accounts:
2592 refspec_opts.append('cc=%s' % c)
2593 cc.remove(c)
2594
rmistry9eadede2016-09-19 11:22:43 -07002595 if options.topic:
2596 # Documentation on Gerrit topics is here:
2597 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002598 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002599
Edward Lemur687ca902018-12-05 02:30:30 +00002600 if options.enable_auto_submit:
2601 refspec_opts.append('l=Auto-Submit+1')
2602 if options.use_commit_queue:
2603 refspec_opts.append('l=Commit-Queue+2')
2604 elif options.cq_dry_run:
2605 refspec_opts.append('l=Commit-Queue+1')
2606
2607 if change_desc.get_reviewers(tbr_only=True):
2608 score = gerrit_util.GetCodeReviewTbrScore(
2609 self._GetGerritHost(),
2610 self._GetGerritProject())
2611 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002612
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002613 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002614 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002615 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002616 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002617 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2618
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002619 refspec_suffix = ''
2620 if refspec_opts:
2621 refspec_suffix = '%' + ','.join(refspec_opts)
2622 assert ' ' not in refspec_suffix, (
2623 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2624 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2625
Edward Lemur1b52d872019-05-09 21:12:12 +00002626 git_push_metadata = {
2627 'gerrit_host': self._GetGerritHost(),
2628 'title': title or '<untitled>',
2629 'change_id': change_id,
2630 'description': change_desc.description,
2631 }
2632 push_stdout = self._RunGitPushWithTraces(
2633 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002634
2635 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002636 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002637 change_numbers = [m.group(1)
2638 for m in map(regex.match, push_stdout.splitlines())
2639 if m]
2640 if len(change_numbers) != 1:
2641 DieWithError(
2642 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002643 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002644 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002645 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002646
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002647 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002648 # GetIssue() is not set in case of non-squash uploads according to tests.
2649 # TODO(agable): non-squash uploads in git cl should be removed.
2650 gerrit_util.AddReviewers(
2651 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002652 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002653 reviewers, cc,
2654 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002655
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002656 return 0
2657
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002658 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2659 change_desc):
2660 """Computes parent of the generated commit to be uploaded to Gerrit.
2661
2662 Returns revision or a ref name.
2663 """
2664 if custom_cl_base:
2665 # Try to avoid creating additional unintended CLs when uploading, unless
2666 # user wants to take this risk.
2667 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2668 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2669 local_ref_of_target_remote])
2670 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002671 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002672 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2673 'If you proceed with upload, more than 1 CL may be created by '
2674 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2675 'If you are certain that specified base `%s` has already been '
2676 'uploaded to Gerrit as another CL, you may proceed.\n' %
2677 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2678 if not force:
2679 confirm_or_exit(
2680 'Do you take responsibility for cleaning up potential mess '
2681 'resulting from proceeding with upload?',
2682 action='upload')
2683 return custom_cl_base
2684
Aaron Gablef97e33d2017-03-30 15:44:27 -07002685 if remote != '.':
2686 return self.GetCommonAncestorWithUpstream()
2687
2688 # If our upstream branch is local, we base our squashed commit on its
2689 # squashed version.
2690 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2691
Aaron Gablef97e33d2017-03-30 15:44:27 -07002692 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002693 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002694
2695 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002696 # TODO(tandrii): consider checking parent change in Gerrit and using its
2697 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2698 # the tree hash of the parent branch. The upside is less likely bogus
2699 # requests to reupload parent change just because it's uploadhash is
2700 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002701 parent = RunGit(['config',
2702 'branch.%s.gerritsquashhash' % upstream_branch_name],
2703 error_ok=True).strip()
2704 # Verify that the upstream branch has been uploaded too, otherwise
2705 # Gerrit will create additional CLs when uploading.
2706 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2707 RunGitSilent(['rev-parse', parent + ':'])):
2708 DieWithError(
2709 '\nUpload upstream branch %s first.\n'
2710 'It is likely that this branch has been rebased since its last '
2711 'upload, so you just need to upload it again.\n'
2712 '(If you uploaded it with --no-squash, then branch dependencies '
2713 'are not supported, and you should reupload with --squash.)'
2714 % upstream_branch_name,
2715 change_desc)
2716 return parent
2717
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002718 def _AddChangeIdToCommitMessage(self, options, args):
2719 """Re-commits using the current message, assumes the commit hook is in
2720 place.
2721 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002722 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002723 git_command = ['commit', '--amend', '-m', log_desc]
2724 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002725 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002726 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002727 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002728 return new_log_desc
2729 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002730 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002731
tandriie113dfd2016-10-11 10:20:12 -07002732 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002733 try:
2734 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002735 except GerritChangeNotExists:
2736 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002737
2738 if data['status'] in ('ABANDONED', 'MERGED'):
2739 return 'CL %s is closed' % self.GetIssue()
2740
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002741 def GetGerritChange(self, patchset=None):
2742 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002743 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002744 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002745 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002746 data = self._GetChangeDetail(['ALL_REVISIONS'])
2747
2748 assert host and issue and patchset, 'CL must be uploaded first'
2749
2750 has_patchset = any(
2751 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002752 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002753 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002754 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002755 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002756
tandrii8c5a3532016-11-04 07:52:02 -07002757 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002758 'host': host,
2759 'change': issue,
2760 'project': data['project'],
2761 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002762 }
tandriie113dfd2016-10-11 10:20:12 -07002763
tandriide281ae2016-10-12 06:02:30 -07002764 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002765 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002766
Edward Lemur707d70b2018-02-07 00:50:14 +01002767 def GetReviewers(self):
2768 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002769 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002770
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002771
2772_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002773 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002774}
2775
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002776
iannuccie53c9352016-08-17 14:40:40 -07002777def _add_codereview_issue_select_options(parser, extra=""):
2778 _add_codereview_select_options(parser)
2779
2780 text = ('Operate on this issue number instead of the current branch\'s '
2781 'implicit issue.')
2782 if extra:
2783 text += ' '+extra
2784 parser.add_option('-i', '--issue', type=int, help=text)
2785
2786
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002787def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002788 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002789 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002790 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002791 parser.add_option_group(parser.codereview_group)
2792 parser.codereview_group.add_option(
2793 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002794 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002795
2796
tandriif9aefb72016-07-01 09:06:51 -07002797def _get_bug_line_values(default_project, bugs):
2798 """Given default_project and comma separated list of bugs, yields bug line
2799 values.
2800
2801 Each bug can be either:
2802 * a number, which is combined with default_project
2803 * string, which is left as is.
2804
2805 This function may produce more than one line, because bugdroid expects one
2806 project per line.
2807
2808 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2809 ['v8:123', 'chromium:789']
2810 """
2811 default_bugs = []
2812 others = []
2813 for bug in bugs.split(','):
2814 bug = bug.strip()
2815 if bug:
2816 try:
2817 default_bugs.append(int(bug))
2818 except ValueError:
2819 others.append(bug)
2820
2821 if default_bugs:
2822 default_bugs = ','.join(map(str, default_bugs))
2823 if default_project:
2824 yield '%s:%s' % (default_project, default_bugs)
2825 else:
2826 yield default_bugs
2827 for other in sorted(others):
2828 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2829 yield other
2830
2831
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002832class ChangeDescription(object):
2833 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002834 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002835 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002836 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002837 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002838 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002839 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2840 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002841 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002842 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002843
Dan Beamd8b04ca2019-10-10 21:23:26 +00002844 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002845 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002846 if bug:
2847 regexp = re.compile(self.BUG_LINE)
2848 prefix = settings.GetBugPrefix()
2849 if not any((regexp.match(line) for line in self._description_lines)):
2850 values = list(_get_bug_line_values(prefix, bug))
2851 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002852 if fixed:
2853 regexp = re.compile(self.FIXED_LINE)
2854 prefix = settings.GetBugPrefix()
2855 if not any((regexp.match(line) for line in self._description_lines)):
2856 values = list(_get_bug_line_values(prefix, fixed))
2857 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002858
agable@chromium.org42c20792013-09-12 17:34:49 +00002859 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002860 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002861 return '\n'.join(self._description_lines)
2862
2863 def set_description(self, desc):
2864 if isinstance(desc, basestring):
2865 lines = desc.splitlines()
2866 else:
2867 lines = [line.rstrip() for line in desc]
2868 while lines and not lines[0]:
2869 lines.pop(0)
2870 while lines and not lines[-1]:
2871 lines.pop(-1)
2872 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002873
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002874 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2875 """Rewrites the R=/TBR= line(s) as a single line each.
2876
2877 Args:
2878 reviewers (list(str)) - list of additional emails to use for reviewers.
2879 tbrs (list(str)) - list of additional emails to use for TBRs.
2880 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2881 the change that are missing OWNER coverage. If this is not None, you
2882 must also pass a value for `change`.
2883 change (Change) - The Change that should be used for OWNERS lookups.
2884 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002885 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002886 assert isinstance(tbrs, list), tbrs
2887
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002888 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002889 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002890
2891 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002893
2894 reviewers = set(reviewers)
2895 tbrs = set(tbrs)
2896 LOOKUP = {
2897 'TBR': tbrs,
2898 'R': reviewers,
2899 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002900
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002901 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002902 regexp = re.compile(self.R_LINE)
2903 matches = [regexp.match(line) for line in self._description_lines]
2904 new_desc = [l for i, l in enumerate(self._description_lines)
2905 if not matches[i]]
2906 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002907
agable@chromium.org42c20792013-09-12 17:34:49 +00002908 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002909
2910 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002911 for match in matches:
2912 if not match:
2913 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002914 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2915
2916 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002917 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002918 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002919 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002920 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002921 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002922 LOOKUP[add_owners_to].update(
2923 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002924
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002925 # If any folks ended up in both groups, remove them from tbrs.
2926 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002927
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002928 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2929 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002930
2931 # Put the new lines in the description where the old first R= line was.
2932 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2933 if 0 <= line_loc < len(self._description_lines):
2934 if new_tbr_line:
2935 self._description_lines.insert(line_loc, new_tbr_line)
2936 if new_r_line:
2937 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002938 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002939 if new_r_line:
2940 self.append_footer(new_r_line)
2941 if new_tbr_line:
2942 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002943
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002944 def set_preserve_tryjobs(self):
2945 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2946 footers = git_footers.parse_footers(self.description)
2947 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2948 if v.lower() == 'true':
2949 return
2950 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2951
Anthony Polito8b955342019-09-24 19:01:36 +00002952 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002953 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002954 self.set_description([
2955 '# Enter a description of the change.',
2956 '# This will be displayed on the codereview site.',
2957 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002958 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002959 '--------------------',
2960 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002961 bug_regexp = re.compile(self.BUG_LINE)
2962 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002963 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002964 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2965 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002966 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002967
agable@chromium.org42c20792013-09-12 17:34:49 +00002968 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002969 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002970 if not content:
2971 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002972 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002973
Bruce Dawson2377b012018-01-11 16:46:49 -08002974 # Strip off comments and default inserted "Bug:" line.
2975 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002976 (line.startswith('#') or
2977 line.rstrip() == "Bug:" or
2978 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002979 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002980 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002981 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002982
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002983 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002984 """Adds a footer line to the description.
2985
2986 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2987 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2988 that Gerrit footers are always at the end.
2989 """
2990 parsed_footer_line = git_footers.parse_footer(line)
2991 if parsed_footer_line:
2992 # Line is a gerrit footer in the form: Footer-Key: any value.
2993 # Thus, must be appended observing Gerrit footer rules.
2994 self.set_description(
2995 git_footers.add_footer(self.description,
2996 key=parsed_footer_line[0],
2997 value=parsed_footer_line[1]))
2998 return
2999
3000 if not self._description_lines:
3001 self._description_lines.append(line)
3002 return
3003
3004 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3005 if gerrit_footers:
3006 # git_footers.split_footers ensures that there is an empty line before
3007 # actual (gerrit) footers, if any. We have to keep it that way.
3008 assert top_lines and top_lines[-1] == ''
3009 top_lines, separator = top_lines[:-1], top_lines[-1:]
3010 else:
3011 separator = [] # No need for separator if there are no gerrit_footers.
3012
3013 prev_line = top_lines[-1] if top_lines else ''
3014 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3015 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3016 top_lines.append('')
3017 top_lines.append(line)
3018 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003019
tandrii99a72f22016-08-17 14:33:24 -07003020 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003021 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003022 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003023 reviewers = [match.group(2).strip()
3024 for match in matches
3025 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003026 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003027
bradnelsond975b302016-10-23 12:20:23 -07003028 def get_cced(self):
3029 """Retrieves the list of reviewers."""
3030 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3031 cced = [match.group(2).strip() for match in matches if match]
3032 return cleanup_list(cced)
3033
Nodir Turakulov23b82142017-11-16 11:04:25 -08003034 def get_hash_tags(self):
3035 """Extracts and sanitizes a list of Gerrit hashtags."""
3036 subject = (self._description_lines or ('',))[0]
3037 subject = re.sub(
3038 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3039
3040 tags = []
3041 start = 0
3042 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3043 while True:
3044 m = bracket_exp.match(subject, start)
3045 if not m:
3046 break
3047 tags.append(self.sanitize_hash_tag(m.group(1)))
3048 start = m.end()
3049
3050 if not tags:
3051 # Try "Tag: " prefix.
3052 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3053 if m:
3054 tags.append(self.sanitize_hash_tag(m.group(1)))
3055 return tags
3056
3057 @classmethod
3058 def sanitize_hash_tag(cls, tag):
3059 """Returns a sanitized Gerrit hash tag.
3060
3061 A sanitized hashtag can be used as a git push refspec parameter value.
3062 """
3063 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3064
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003065 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3066 """Updates this commit description given the parent.
3067
3068 This is essentially what Gnumbd used to do.
3069 Consult https://goo.gl/WMmpDe for more details.
3070 """
3071 assert parent_msg # No, orphan branch creation isn't supported.
3072 assert parent_hash
3073 assert dest_ref
3074 parent_footer_map = git_footers.parse_footers(parent_msg)
3075 # This will also happily parse svn-position, which GnumbD is no longer
3076 # supporting. While we'd generate correct footers, the verifier plugin
3077 # installed in Gerrit will block such commit (ie git push below will fail).
3078 parent_position = git_footers.get_position(parent_footer_map)
3079
3080 # Cherry-picks may have last line obscuring their prior footers,
3081 # from git_footers perspective. This is also what Gnumbd did.
3082 cp_line = None
3083 if (self._description_lines and
3084 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3085 cp_line = self._description_lines.pop()
3086
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003087 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003088
3089 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3090 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003091 for i, line in enumerate(footer_lines):
3092 k, v = git_footers.parse_footer(line) or (None, None)
3093 if k and k.startswith('Cr-'):
3094 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003095
3096 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003097 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003098 if parent_position[0] == dest_ref:
3099 # Same branch as parent.
3100 number = int(parent_position[1]) + 1
3101 else:
3102 number = 1 # New branch, and extra lineage.
3103 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3104 int(parent_position[1])))
3105
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003106 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3107 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003108
3109 self._description_lines = top_lines
3110 if cp_line:
3111 self._description_lines.append(cp_line)
3112 if self._description_lines[-1] != '':
3113 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003114 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003115
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003116
Aaron Gablea1bab272017-04-11 16:38:18 -07003117def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003118 """Retrieves the reviewers that approved a CL from the issue properties with
3119 messages.
3120
3121 Note that the list may contain reviewers that are not committer, thus are not
3122 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003123
3124 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003125 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003126 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003127 return sorted(
3128 set(
3129 message['sender']
3130 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003131 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003132 )
3133 )
3134
3135
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003136def FindCodereviewSettingsFile(filename='codereview.settings'):
3137 """Finds the given file starting in the cwd and going up.
3138
3139 Only looks up to the top of the repository unless an
3140 'inherit-review-settings-ok' file exists in the root of the repository.
3141 """
3142 inherit_ok_file = 'inherit-review-settings-ok'
3143 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003144 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003145 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3146 root = '/'
3147 while True:
3148 if filename in os.listdir(cwd):
3149 if os.path.isfile(os.path.join(cwd, filename)):
3150 return open(os.path.join(cwd, filename))
3151 if cwd == root:
3152 break
3153 cwd = os.path.dirname(cwd)
3154
3155
3156def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003157 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003158 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003159
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003160 def SetProperty(name, setting, unset_error_ok=False):
3161 fullname = 'rietveld.' + name
3162 if setting in keyvals:
3163 RunGit(['config', fullname, keyvals[setting]])
3164 else:
3165 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3166
tandrii48df5812016-10-17 03:55:37 -07003167 if not keyvals.get('GERRIT_HOST', False):
3168 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003169 # Only server setting is required. Other settings can be absent.
3170 # In that case, we ignore errors raised during option deletion attempt.
3171 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3172 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3173 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003174 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003175 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3176 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003177 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3178 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003179 SetProperty(
3180 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003181
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003182 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003183 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003184
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003185 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003186 RunGit(['config', 'gerrit.squash-uploads',
3187 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003188
tandrii@chromium.org28253532016-04-14 13:46:56 +00003189 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003190 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003191 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3192
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003193 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003194 # should be of the form
3195 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3196 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003197 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3198 keyvals['ORIGIN_URL_CONFIG']])
3199
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003200
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003201def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003202 """Downloads a network object to a local file, like urllib.urlretrieve.
3203
3204 This is necessary because urllib is broken for SSL connections via a proxy.
3205 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003206 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003207 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003208
3209
ukai@chromium.org712d6102013-11-27 00:52:58 +00003210def hasSheBang(fname):
3211 """Checks fname is a #! script."""
3212 with open(fname) as f:
3213 return f.read(2).startswith('#!')
3214
3215
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003216# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3217def DownloadHooks(*args, **kwargs):
3218 pass
3219
3220
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003221def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003222 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003223
3224 Args:
3225 force: True to update hooks. False to install hooks if not present.
3226 """
3227 if not settings.GetIsGerrit():
3228 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003229 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003230 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3231 if not os.access(dst, os.X_OK):
3232 if os.path.exists(dst):
3233 if not force:
3234 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003235 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003236 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003237 if not hasSheBang(dst):
3238 DieWithError('Not a script: %s\n'
3239 'You need to download from\n%s\n'
3240 'into .git/hooks/commit-msg and '
3241 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003242 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3243 except Exception:
3244 if os.path.exists(dst):
3245 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003246 DieWithError('\nFailed to download hooks.\n'
3247 'You need to download from\n%s\n'
3248 'into .git/hooks/commit-msg and '
3249 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003250
3251
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003252class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003253 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003254
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003255 _GOOGLESOURCE = 'googlesource.com'
3256
3257 def __init__(self):
3258 # Cached list of [host, identity, source], where source is either
3259 # .gitcookies or .netrc.
3260 self._all_hosts = None
3261
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003262 def ensure_configured_gitcookies(self):
3263 """Runs checks and suggests fixes to make git use .gitcookies from default
3264 path."""
3265 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3266 configured_path = RunGitSilent(
3267 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003268 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003269 if configured_path:
3270 self._ensure_default_gitcookies_path(configured_path, default)
3271 else:
3272 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003273
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003274 @staticmethod
3275 def _ensure_default_gitcookies_path(configured_path, default_path):
3276 assert configured_path
3277 if configured_path == default_path:
3278 print('git is already configured to use your .gitcookies from %s' %
3279 configured_path)
3280 return
3281
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003282 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003283 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3284 (configured_path, default_path))
3285
3286 if not os.path.exists(configured_path):
3287 print('However, your configured .gitcookies file is missing.')
3288 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3289 action='reconfigure')
3290 RunGit(['config', '--global', 'http.cookiefile', default_path])
3291 return
3292
3293 if os.path.exists(default_path):
3294 print('WARNING: default .gitcookies file already exists %s' %
3295 default_path)
3296 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3297 default_path)
3298
3299 confirm_or_exit('Move existing .gitcookies to default location?',
3300 action='move')
3301 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003302 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003303 print('Moved and reconfigured git to use .gitcookies from %s' %
3304 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003305
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003306 @staticmethod
3307 def _configure_gitcookies_path(default_path):
3308 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3309 if os.path.exists(netrc_path):
3310 print('You seem to be using outdated .netrc for git credentials: %s' %
3311 netrc_path)
3312 print('This tool will guide you through setting up recommended '
3313 '.gitcookies store for git credentials.\n'
3314 '\n'
3315 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3316 ' git config --global --unset http.cookiefile\n'
3317 ' mv %s %s.backup\n\n' % (default_path, default_path))
3318 confirm_or_exit(action='setup .gitcookies')
3319 RunGit(['config', '--global', 'http.cookiefile', default_path])
3320 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003321
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003322 def get_hosts_with_creds(self, include_netrc=False):
3323 if self._all_hosts is None:
3324 a = gerrit_util.CookiesAuthenticator()
3325 self._all_hosts = [
3326 (h, u, s)
3327 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003328 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3329 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003330 )
3331 if h.endswith(self._GOOGLESOURCE)
3332 ]
3333
3334 if include_netrc:
3335 return self._all_hosts
3336 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3337
3338 def print_current_creds(self, include_netrc=False):
3339 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3340 if not hosts:
3341 print('No Git/Gerrit credentials found')
3342 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003343 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003344 header = [('Host', 'User', 'Which file'),
3345 ['=' * l for l in lengths]]
3346 for row in (header + hosts):
3347 print('\t'.join((('%%+%ds' % l) % s)
3348 for l, s in zip(lengths, row)))
3349
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003350 @staticmethod
3351 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003352 """Parses identity "git-<username>.domain" into <username> and domain."""
3353 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003354 # distinguishable from sub-domains. But we do know typical domains:
3355 if identity.endswith('.chromium.org'):
3356 domain = 'chromium.org'
3357 username = identity[:-len('.chromium.org')]
3358 else:
3359 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003360 if username.startswith('git-'):
3361 username = username[len('git-'):]
3362 return username, domain
3363
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003364 def _canonical_git_googlesource_host(self, host):
3365 """Normalizes Gerrit hosts (with '-review') to Git host."""
3366 assert host.endswith(self._GOOGLESOURCE)
3367 # Prefix doesn't include '.' at the end.
3368 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3369 if prefix.endswith('-review'):
3370 prefix = prefix[:-len('-review')]
3371 return prefix + '.' + self._GOOGLESOURCE
3372
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003373 def _canonical_gerrit_googlesource_host(self, host):
3374 git_host = self._canonical_git_googlesource_host(host)
3375 prefix = git_host.split('.', 1)[0]
3376 return prefix + '-review.' + self._GOOGLESOURCE
3377
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003378 def _get_counterpart_host(self, host):
3379 assert host.endswith(self._GOOGLESOURCE)
3380 git = self._canonical_git_googlesource_host(host)
3381 gerrit = self._canonical_gerrit_googlesource_host(git)
3382 return git if gerrit == host else gerrit
3383
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003384 def has_generic_host(self):
3385 """Returns whether generic .googlesource.com has been configured.
3386
3387 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3388 """
3389 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3390 if host == '.' + self._GOOGLESOURCE:
3391 return True
3392 return False
3393
3394 def _get_git_gerrit_identity_pairs(self):
3395 """Returns map from canonic host to pair of identities (Git, Gerrit).
3396
3397 One of identities might be None, meaning not configured.
3398 """
3399 host_to_identity_pairs = {}
3400 for host, identity, _ in self.get_hosts_with_creds():
3401 canonical = self._canonical_git_googlesource_host(host)
3402 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3403 idx = 0 if canonical == host else 1
3404 pair[idx] = identity
3405 return host_to_identity_pairs
3406
3407 def get_partially_configured_hosts(self):
3408 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003409 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003410 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003411 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003412
3413 def get_conflicting_hosts(self):
3414 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003415 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003416 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003417 if None not in (i1, i2) and i1 != i2)
3418
3419 def get_duplicated_hosts(self):
3420 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003421 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003422
3423 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3424 'chromium.googlesource.com': 'chromium.org',
3425 'chrome-internal.googlesource.com': 'google.com',
3426 }
3427
3428 def get_hosts_with_wrong_identities(self):
3429 """Finds hosts which **likely** reference wrong identities.
3430
3431 Note: skips hosts which have conflicting identities for Git and Gerrit.
3432 """
3433 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003434 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003435 pair = self._get_git_gerrit_identity_pairs().get(host)
3436 if pair and pair[0] == pair[1]:
3437 _, domain = self._parse_identity(pair[0])
3438 if domain != expected:
3439 hosts.add(host)
3440 return hosts
3441
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003442 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003443 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003444 hosts = sorted(hosts)
3445 assert hosts
3446 if extra_column_func is None:
3447 extras = [''] * len(hosts)
3448 else:
3449 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003450 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3451 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003452 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003453 lines.append(tmpl % he)
3454 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003455
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003456 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003457 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003458 yield ('.googlesource.com wildcard record detected',
3459 ['Chrome Infrastructure team recommends to list full host names '
3460 'explicitly.'],
3461 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003462
3463 dups = self.get_duplicated_hosts()
3464 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003465 yield ('The following hosts were defined twice',
3466 self._format_hosts(dups),
3467 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003468
3469 partial = self.get_partially_configured_hosts()
3470 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003471 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3472 'These hosts are missing',
3473 self._format_hosts(partial, lambda host: 'but %s defined' %
3474 self._get_counterpart_host(host)),
3475 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003476
3477 conflicting = self.get_conflicting_hosts()
3478 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003479 yield ('The following Git hosts have differing credentials from their '
3480 'Gerrit counterparts',
3481 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3482 tuple(self._get_git_gerrit_identity_pairs()[host])),
3483 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003484
3485 wrong = self.get_hosts_with_wrong_identities()
3486 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003487 yield ('These hosts likely use wrong identity',
3488 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3489 (self._get_git_gerrit_identity_pairs()[host][0],
3490 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3491 wrong)
3492
3493 def find_and_report_problems(self):
3494 """Returns True if there was at least one problem, else False."""
3495 found = False
3496 bad_hosts = set()
3497 for title, sublines, hosts in self._find_problems():
3498 if not found:
3499 found = True
3500 print('\n\n.gitcookies problem report:\n')
3501 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003502 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003503 if sublines:
3504 print()
3505 print(' %s' % '\n '.join(sublines))
3506 print()
3507
3508 if bad_hosts:
3509 assert found
3510 print(' You can manually remove corresponding lines in your %s file and '
3511 'visit the following URLs with correct account to generate '
3512 'correct credential lines:\n' %
3513 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3514 print(' %s' % '\n '.join(sorted(set(
3515 gerrit_util.CookiesAuthenticator().get_new_password_url(
3516 self._canonical_git_googlesource_host(host))
3517 for host in bad_hosts
3518 ))))
3519 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003520
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003521
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003522@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003523def CMDcreds_check(parser, args):
3524 """Checks credentials and suggests changes."""
3525 _, _ = parser.parse_args(args)
3526
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003527 # Code below checks .gitcookies. Abort if using something else.
3528 authn = gerrit_util.Authenticator.get()
3529 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3530 if isinstance(authn, gerrit_util.GceAuthenticator):
3531 DieWithError(
3532 'This command is not designed for GCE, are you on a bot?\n'
3533 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3534 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003535 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003536 'This command is not designed for bot environment. It checks '
3537 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003538
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003539 checker = _GitCookiesChecker()
3540 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003541
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003542 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003543 checker.print_current_creds(include_netrc=True)
3544
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003545 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003546 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003547 return 0
3548 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003549
3550
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003551@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003552def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003553 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003554 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3555 branch = ShortBranchName(branchref)
3556 _, args = parser.parse_args(args)
3557 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003558 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003559 return RunGit(['config', 'branch.%s.base-url' % branch],
3560 error_ok=False).strip()
3561 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003562 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003563 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3564 error_ok=False).strip()
3565
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003566
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003567def color_for_status(status):
3568 """Maps a Changelist status to color, for CMDstatus and other tools."""
3569 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003570 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003571 'waiting': Fore.BLUE,
3572 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003573 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003574 'lgtm': Fore.GREEN,
3575 'commit': Fore.MAGENTA,
3576 'closed': Fore.CYAN,
3577 'error': Fore.WHITE,
3578 }.get(status, Fore.WHITE)
3579
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003580
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003581def get_cl_statuses(changes, fine_grained, max_processes=None):
3582 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003583
3584 If fine_grained is true, this will fetch CL statuses from the server.
3585 Otherwise, simply indicate if there's a matching url for the given branches.
3586
3587 If max_processes is specified, it is used as the maximum number of processes
3588 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3589 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003590
3591 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003592 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003593 if not changes:
3594 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003595
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003596 if not fine_grained:
3597 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003598 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003599 for cl in changes:
3600 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003601 return
3602
3603 # First, sort out authentication issues.
3604 logging.debug('ensuring credentials exist')
3605 for cl in changes:
3606 cl.EnsureAuthenticated(force=False, refresh=True)
3607
3608 def fetch(cl):
3609 try:
3610 return (cl, cl.GetStatus())
3611 except:
3612 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003613 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003614 raise
3615
3616 threads_count = len(changes)
3617 if max_processes:
3618 threads_count = max(1, min(threads_count, max_processes))
3619 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3620
3621 pool = ThreadPool(threads_count)
3622 fetched_cls = set()
3623 try:
3624 it = pool.imap_unordered(fetch, changes).__iter__()
3625 while True:
3626 try:
3627 cl, status = it.next(timeout=5)
3628 except multiprocessing.TimeoutError:
3629 break
3630 fetched_cls.add(cl)
3631 yield cl, status
3632 finally:
3633 pool.close()
3634
3635 # Add any branches that failed to fetch.
3636 for cl in set(changes) - fetched_cls:
3637 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003638
rmistry@google.com2dd99862015-06-22 12:22:18 +00003639
3640def upload_branch_deps(cl, args):
3641 """Uploads CLs of local branches that are dependents of the current branch.
3642
3643 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003644
3645 test1 -> test2.1 -> test3.1
3646 -> test3.2
3647 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003648
3649 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3650 run on the dependent branches in this order:
3651 test2.1, test3.1, test3.2, test2.2, test3.3
3652
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003653 Note: This function does not rebase your local dependent branches. Use it
3654 when you make a change to the parent branch that will not conflict
3655 with its dependent branches, and you would like their dependencies
3656 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003657 """
3658 if git_common.is_dirty_git_tree('upload-branch-deps'):
3659 return 1
3660
3661 root_branch = cl.GetBranch()
3662 if root_branch is None:
3663 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3664 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003665 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003666 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3667 'patchset dependencies without an uploaded CL.')
3668
3669 branches = RunGit(['for-each-ref',
3670 '--format=%(refname:short) %(upstream:short)',
3671 'refs/heads'])
3672 if not branches:
3673 print('No local branches found.')
3674 return 0
3675
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003676 # Create a dictionary of all local branches to the branches that are
3677 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003678 tracked_to_dependents = collections.defaultdict(list)
3679 for b in branches.splitlines():
3680 tokens = b.split()
3681 if len(tokens) == 2:
3682 branch_name, tracked = tokens
3683 tracked_to_dependents[tracked].append(branch_name)
3684
vapiera7fbd5a2016-06-16 09:17:49 -07003685 print()
3686 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003687 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003688
rmistry@google.com2dd99862015-06-22 12:22:18 +00003689 def traverse_dependents_preorder(branch, padding=''):
3690 dependents_to_process = tracked_to_dependents.get(branch, [])
3691 padding += ' '
3692 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003693 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003694 dependents.append(dependent)
3695 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003696
rmistry@google.com2dd99862015-06-22 12:22:18 +00003697 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003698 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003699
3700 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003701 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003702 return 0
3703
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003704 confirm_or_exit('This command will checkout all dependent branches and run '
3705 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003706
rmistry@google.com2dd99862015-06-22 12:22:18 +00003707 # Record all dependents that failed to upload.
3708 failures = {}
3709 # Go through all dependents, checkout the branch and upload.
3710 try:
3711 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003712 print()
3713 print('--------------------------------------')
3714 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003715 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003716 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003717 try:
3718 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003719 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003720 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003721 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003722 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003723 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003724 finally:
3725 # Swap back to the original root branch.
3726 RunGit(['checkout', '-q', root_branch])
3727
vapiera7fbd5a2016-06-16 09:17:49 -07003728 print()
3729 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003730 for dependent_branch in dependents:
3731 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003732 print(' %s : %s' % (dependent_branch, upload_status))
3733 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003734
3735 return 0
3736
3737
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003738def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3739 """Given a proposed tag name, returns a tag name that is guaranteed to be
3740 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3741 or 'foo-3', and so on."""
3742
3743 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3744 for suffix_num in itertools.count(1):
3745 if suffix_num == 1:
3746 to_check = proposed_tag
3747 else:
3748 to_check = '%s-%d' % (proposed_tag, suffix_num)
3749
3750 if to_check not in existing_tags:
3751 return to_check
3752
3753
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003754@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003755def CMDarchive(parser, args):
3756 """Archives and deletes branches associated with closed changelists."""
3757 parser.add_option(
3758 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003759 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003760 parser.add_option(
3761 '-f', '--force', action='store_true',
3762 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003763 parser.add_option(
3764 '-d', '--dry-run', action='store_true',
3765 help='Skip the branch tagging and removal steps.')
3766 parser.add_option(
3767 '-t', '--notags', action='store_true',
3768 help='Do not tag archived branches. '
3769 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003770
kmarshall3bff56b2016-06-06 18:31:47 -07003771 options, args = parser.parse_args(args)
3772 if args:
3773 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003774
3775 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3776 if not branches:
3777 return 0
3778
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003779 tags = RunGit(['for-each-ref', '--format=%(refname)',
3780 'refs/tags']).splitlines() or []
3781 tags = [t.split('/')[-1] for t in tags]
3782
vapiera7fbd5a2016-06-16 09:17:49 -07003783 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003784 changes = [Changelist(branchref=b)
3785 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003786 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3787 statuses = get_cl_statuses(changes,
3788 fine_grained=True,
3789 max_processes=options.maxjobs)
3790 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003791 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3792 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003793 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003794 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003795 proposal.sort()
3796
3797 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003798 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003799 return 0
3800
3801 current_branch = GetCurrentBranch()
3802
vapiera7fbd5a2016-06-16 09:17:49 -07003803 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003804 if options.notags:
3805 for next_item in proposal:
3806 print(' ' + next_item[0])
3807 else:
3808 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3809 for next_item in proposal:
3810 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003811
kmarshall9249e012016-08-23 12:02:16 -07003812 # Quit now on precondition failure or if instructed by the user, either
3813 # via an interactive prompt or by command line flags.
3814 if options.dry_run:
3815 print('\nNo changes were made (dry run).\n')
3816 return 0
3817 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003818 print('You are currently on a branch \'%s\' which is associated with a '
3819 'closed codereview issue, so archive cannot proceed. Please '
3820 'checkout another branch and run this command again.' %
3821 current_branch)
3822 return 1
kmarshall9249e012016-08-23 12:02:16 -07003823 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003824 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3825 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003826 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003827 return 1
3828
3829 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003830 if not options.notags:
3831 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003832
3833 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3834 # Clean up the tag if we failed to delete the branch.
3835 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003836
vapiera7fbd5a2016-06-16 09:17:49 -07003837 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003838
3839 return 0
3840
3841
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003842@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003843def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003844 """Show status of changelists.
3845
3846 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003847 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003848 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003849 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003850 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003851 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003852 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003853 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003854
3855 Also see 'git cl comments'.
3856 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003857 parser.add_option(
3858 '--no-branch-color',
3859 action='store_true',
3860 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003861 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003862 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003863 parser.add_option('-f', '--fast', action='store_true',
3864 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003865 parser.add_option(
3866 '-j', '--maxjobs', action='store', type=int,
3867 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003868
iannuccie53c9352016-08-17 14:40:40 -07003869 _add_codereview_issue_select_options(
3870 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003871 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003872 if args:
3873 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003874
iannuccie53c9352016-08-17 14:40:40 -07003875 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003876 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003877
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003878 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003879 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003880 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003881 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003882 elif options.field == 'id':
3883 issueid = cl.GetIssue()
3884 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003885 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003886 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003887 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003888 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003890 elif options.field == 'status':
3891 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003892 elif options.field == 'url':
3893 url = cl.GetIssueURL()
3894 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003895 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003896 return 0
3897
3898 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3899 if not branches:
3900 print('No local branch found.')
3901 return 0
3902
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003903 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003904 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003905 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003906 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003907 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003908 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003909 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003910
Daniel McArdlea23bf592019-02-12 00:25:12 +00003911 current_branch = GetCurrentBranch()
3912
3913 def FormatBranchName(branch, colorize=False):
3914 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3915 an asterisk when it is the current branch."""
3916
3917 asterisk = ""
3918 color = Fore.RESET
3919 if branch == current_branch:
3920 asterisk = "* "
3921 color = Fore.GREEN
3922 branch_name = ShortBranchName(branch)
3923
3924 if colorize:
3925 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003926 return asterisk + branch_name
3927
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003928 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003929
3930 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003931 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3932 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003933 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003934 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003935 branch_statuses[c.GetBranch()] = status
3936 status = branch_statuses.pop(branch)
3937 url = cl.GetIssueURL()
3938 if url and (not status or status == 'error'):
3939 # The issue probably doesn't exist anymore.
3940 url += ' (broken)'
3941
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003942 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003943 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003944 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003945 color = ''
3946 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003947 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003948
Alan Cuttera3be9a52019-03-04 18:50:33 +00003949 branch_display = FormatBranchName(branch)
3950 padding = ' ' * (alignment - len(branch_display))
3951 if not options.no_branch_color:
3952 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003953
Alan Cuttera3be9a52019-03-04 18:50:33 +00003954 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3955 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003956
vapiera7fbd5a2016-06-16 09:17:49 -07003957 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003958 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003959 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003960 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003961 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003962 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003963 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003964 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003965 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003966 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003967 print('Issue description:')
3968 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003969 return 0
3970
3971
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003972def colorize_CMDstatus_doc():
3973 """To be called once in main() to add colors to git cl status help."""
3974 colors = [i for i in dir(Fore) if i[0].isupper()]
3975
3976 def colorize_line(line):
3977 for color in colors:
3978 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003979 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003980 indent = len(line) - len(line.lstrip(' ')) + 1
3981 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3982 return line
3983
3984 lines = CMDstatus.__doc__.splitlines()
3985 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3986
3987
phajdan.jre328cf92016-08-22 04:12:17 -07003988def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003989 if path == '-':
3990 json.dump(contents, sys.stdout)
3991 else:
3992 with open(path, 'w') as f:
3993 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003994
3995
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003996@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003997@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003998def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003999 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004000
4001 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004002 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004003 parser.add_option('-r', '--reverse', action='store_true',
4004 help='Lookup the branch(es) for the specified issues. If '
4005 'no issues are specified, all branches with mapped '
4006 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004007 parser.add_option('--json',
4008 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004009 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004010 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004011
dnj@chromium.org406c4402015-03-03 17:22:28 +00004012 if options.reverse:
4013 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004014 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004015 # Reverse issue lookup.
4016 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004017
4018 git_config = {}
4019 for config in RunGit(['config', '--get-regexp',
4020 r'branch\..*issue']).splitlines():
4021 name, _space, val = config.partition(' ')
4022 git_config[name] = val
4023
dnj@chromium.org406c4402015-03-03 17:22:28 +00004024 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004025 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4026 config_key = _git_branch_config_key(ShortBranchName(branch),
4027 cls.IssueConfigKey())
4028 issue = git_config.get(config_key)
4029 if issue:
4030 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004031 if not args:
4032 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004033 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004034 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004035 try:
4036 issue_num = int(issue)
4037 except ValueError:
4038 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004039 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004040 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004041 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004042 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004043 if options.json:
4044 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004045 return 0
4046
4047 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004048 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004049 if not issue.valid:
4050 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4051 'or no argument to list it.\n'
4052 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004053 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004054 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004055 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004056 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004057 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4058 if options.json:
4059 write_json(options.json, {
4060 'issue': cl.GetIssue(),
4061 'issue_url': cl.GetIssueURL(),
4062 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004063 return 0
4064
4065
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004066@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004067def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004068 """Shows or posts review comments for any changelist."""
4069 parser.add_option('-a', '--add-comment', dest='comment',
4070 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004071 parser.add_option('-p', '--publish', action='store_true',
4072 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004073 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004074 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004075 parser.add_option('-m', '--machine-readable', dest='readable',
4076 action='store_false', default=True,
4077 help='output comments in a format compatible with '
4078 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004079 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004080 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004081 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004082 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004083
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004084 issue = None
4085 if options.issue:
4086 try:
4087 issue = int(options.issue)
4088 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004089 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004090
Edward Lemur934836a2019-09-09 20:16:54 +00004091 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004092
4093 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004094 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004095 return 0
4096
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004097 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4098 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004099 for comment in summary:
4100 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004101 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004102 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004103 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004104 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004105 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004106 elif comment.autogenerated:
4107 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004108 else:
4109 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004110 print('\n%s%s %s%s\n%s' % (
4111 color,
4112 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4113 comment.sender,
4114 Fore.RESET,
4115 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4116
smut@google.comc85ac942015-09-15 16:34:43 +00004117 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004118 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004119 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004120 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4121 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004122 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004123 return 0
4124
4125
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004126@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004127@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004128def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004129 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004130 parser.add_option('-d', '--display', action='store_true',
4131 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004132 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004133 help='New description to set for this issue (- for stdin, '
4134 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004135 parser.add_option('-f', '--force', action='store_true',
4136 help='Delete any unpublished Gerrit edits for this issue '
4137 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004138
4139 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004140 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004141
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004142 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004143 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004144 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004145 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004146 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004147
Edward Lemur934836a2019-09-09 20:16:54 +00004148 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004149 if target_issue_arg:
4150 kwargs['issue'] = target_issue_arg.issue
4151 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004152
4153 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004154 if not cl.GetIssue():
4155 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004156
Edward Lemur678a6842019-10-03 22:25:05 +00004157 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004158 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004159
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004160 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004161
smut@google.com34fb6b12015-07-13 20:03:26 +00004162 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004163 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004164 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004165
4166 if options.new_description:
4167 text = options.new_description
4168 if text == '-':
4169 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004170 elif text == '+':
4171 base_branch = cl.GetCommonAncestorWithUpstream()
4172 change = cl.GetChange(base_branch, None, local_description=True)
4173 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004174
4175 description.set_description(text)
4176 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004177 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004178 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004179 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004180 return 0
4181
4182
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004183@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004184def CMDlint(parser, args):
4185 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004186 parser.add_option('--filter', action='append', metavar='-x,+y',
4187 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004188 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004189
4190 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004191 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004192 try:
4193 import cpplint
4194 import cpplint_chromium
4195 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004196 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004197 return 1
4198
4199 # Change the current working directory before calling lint so that it
4200 # shows the correct base.
4201 previous_cwd = os.getcwd()
4202 os.chdir(settings.GetRoot())
4203 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004204 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004205 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4206 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004207 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004208 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004209 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004210
4211 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004212 command = args + files
4213 if options.filter:
4214 command = ['--filter=' + ','.join(options.filter)] + command
4215 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004216
4217 white_regex = re.compile(settings.GetLintRegex())
4218 black_regex = re.compile(settings.GetLintIgnoreRegex())
4219 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4220 for filename in filenames:
4221 if white_regex.match(filename):
4222 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004223 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004224 else:
4225 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4226 extra_check_functions)
4227 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004228 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004229 finally:
4230 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004231 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004232 if cpplint._cpplint_state.error_count != 0:
4233 return 1
4234 return 0
4235
4236
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004237@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004238def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004239 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004240 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004241 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004242 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004243 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004244 parser.add_option('--all', action='store_true',
4245 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004246 parser.add_option('--parallel', action='store_true',
4247 help='Run all tests specified by input_api.RunTests in all '
4248 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004249 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004250
sbc@chromium.org71437c02015-04-09 19:29:40 +00004251 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004252 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004253 return 1
4254
Edward Lemur934836a2019-09-09 20:16:54 +00004255 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004256 if args:
4257 base_branch = args[0]
4258 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004259 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004260 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004261
Aaron Gable8076c282017-11-29 14:39:41 -08004262 if options.all:
4263 base_change = cl.GetChange(base_branch, None)
4264 files = [('M', f) for f in base_change.AllFiles()]
4265 change = presubmit_support.GitChange(
4266 base_change.Name(),
4267 base_change.FullDescriptionText(),
4268 base_change.RepositoryRoot(),
4269 files,
4270 base_change.issue,
4271 base_change.patchset,
4272 base_change.author_email,
4273 base_change._upstream)
4274 else:
4275 change = cl.GetChange(base_branch, None)
4276
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004277 cl.RunHook(
4278 committing=not options.upload,
4279 may_prompt=False,
4280 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004281 change=change,
4282 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004283 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004284
4285
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004286def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004287 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004288
4289 Works the same way as
4290 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4291 but can be called on demand on all platforms.
4292
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004293 The basic idea is to generate git hash of a state of the tree, original
4294 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004295 """
4296 lines = []
4297 tree_hash = RunGitSilent(['write-tree'])
4298 lines.append('tree %s' % tree_hash.strip())
4299 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4300 if code == 0:
4301 lines.append('parent %s' % parent.strip())
4302 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4303 lines.append('author %s' % author.strip())
4304 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4305 lines.append('committer %s' % committer.strip())
4306 lines.append('')
4307 # Note: Gerrit's commit-hook actually cleans message of some lines and
4308 # whitespace. This code is not doing this, but it clearly won't decrease
4309 # entropy.
4310 lines.append(message)
4311 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004312 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004313 return 'I%s' % change_hash.strip()
4314
4315
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004316def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004317 """Computes the remote branch ref to use for the CL.
4318
4319 Args:
4320 remote (str): The git remote for the CL.
4321 remote_branch (str): The git remote branch for the CL.
4322 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004323 """
4324 if not (remote and remote_branch):
4325 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004326
wittman@chromium.org455dc922015-01-26 20:15:50 +00004327 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004328 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004329 # refs, which are then translated into the remote full symbolic refs
4330 # below.
4331 if '/' not in target_branch:
4332 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4333 else:
4334 prefix_replacements = (
4335 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4336 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4337 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4338 )
4339 match = None
4340 for regex, replacement in prefix_replacements:
4341 match = re.search(regex, target_branch)
4342 if match:
4343 remote_branch = target_branch.replace(match.group(0), replacement)
4344 break
4345 if not match:
4346 # This is a branch path but not one we recognize; use as-is.
4347 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004348 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4349 # Handle the refs that need to land in different refs.
4350 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004351
wittman@chromium.org455dc922015-01-26 20:15:50 +00004352 # Create the true path to the remote branch.
4353 # Does the following translation:
4354 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4355 # * refs/remotes/origin/master -> refs/heads/master
4356 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4357 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4358 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4359 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4360 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4361 'refs/heads/')
4362 elif remote_branch.startswith('refs/remotes/branch-heads'):
4363 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004364
wittman@chromium.org455dc922015-01-26 20:15:50 +00004365 return remote_branch
4366
4367
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004368def cleanup_list(l):
4369 """Fixes a list so that comma separated items are put as individual items.
4370
4371 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4372 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4373 """
4374 items = sum((i.split(',') for i in l), [])
4375 stripped_items = (i.strip() for i in items)
4376 return sorted(filter(None, stripped_items))
4377
4378
Aaron Gable4db38df2017-11-03 14:59:07 -07004379@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004380@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004381def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004382 """Uploads the current changelist to codereview.
4383
4384 Can skip dependency patchset uploads for a branch by running:
4385 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004386 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004387 git config --unset branch.branch_name.skip-deps-uploads
4388 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004389
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004390 If the name of the checked out branch starts with "bug-" or "fix-" followed
4391 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004392 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004393
4394 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004395 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004396 [git-cl] add support for hashtags
4397 Foo bar: implement foo
4398 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004399 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004400 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4401 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004402 parser.add_option('--bypass-watchlists', action='store_true',
4403 dest='bypass_watchlists',
4404 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004405 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004406 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004407 parser.add_option('--message', '-m', dest='message',
4408 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004409 parser.add_option('-b', '--bug',
4410 help='pre-populate the bug number(s) for this issue. '
4411 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004412 parser.add_option('--message-file', dest='message_file',
4413 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004414 parser.add_option('--title', '-t', dest='title',
4415 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004416 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004417 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004418 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004419 parser.add_option('--tbrs',
4420 action='append', default=[],
4421 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004422 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004423 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004424 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004425 parser.add_option('--hashtag', dest='hashtags',
4426 action='append', default=[],
4427 help=('Gerrit hashtag for new CL; '
4428 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004429 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004430 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004431 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004432 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004433 metavar='TARGET',
4434 help='Apply CL to remote ref TARGET. ' +
4435 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004436 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004437 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004438 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004439 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004440 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004441 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004442 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4443 const='TBR', help='add a set of OWNERS to TBR')
4444 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4445 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004446 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004447 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004448 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004449 'implies --send-mail')
4450 parser.add_option('-d', '--cq-dry-run',
4451 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004452 help='Send the patchset to do a CQ dry run right after '
4453 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004454 parser.add_option('--preserve-tryjobs', action='store_true',
4455 help='instruct the CQ to let tryjobs running even after '
4456 'new patchsets are uploaded instead of canceling '
4457 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004458 parser.add_option('--dependencies', action='store_true',
4459 help='Uploads CLs of all the local branches that depend on '
4460 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004461 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4462 help='Sends your change to the CQ after an approval. Only '
4463 'works on repos that have the Auto-Submit label '
4464 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004465 parser.add_option('--parallel', action='store_true',
4466 help='Run all tests specified by input_api.RunTests in all '
4467 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004468 parser.add_option('--no-autocc', action='store_true',
4469 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004470 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004471 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004472 parser.add_option('-R', '--retry-failed', action='store_true',
4473 help='Retry failed tryjobs from old patchset immediately '
4474 'after uploading new patchset. Cannot be used with '
4475 '--use-commit-queue or --cq-dry-run.')
4476 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4477 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004478 parser.add_option('--fixed', '-x',
4479 help='List of bugs that will be commented on and marked '
4480 'fixed (pre-populates "Fixed:" tag). Same format as '
4481 '-b option / "Bug:" tag. If fixing several issues, '
4482 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004483 parser.add_option('--edit-description', action='store_true', default=False,
4484 help='Modify description before upload. Cannot be used '
4485 'with --force. It is a noop when --no-squash is set '
4486 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004487
rmistry@google.com2dd99862015-06-22 12:22:18 +00004488 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004489 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004490 (options, args) = parser.parse_args(args)
4491
sbc@chromium.org71437c02015-04-09 19:29:40 +00004492 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004493 return 1
4494
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004495 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004496 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004497 options.cc = cleanup_list(options.cc)
4498
Josipe827b0f2020-01-30 00:07:20 +00004499 if options.edit_description and options.force:
4500 parser.error('Only one of --force and --edit-description allowed')
4501
tandriib80458a2016-06-23 12:20:07 -07004502 if options.message_file:
4503 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004504 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004505 options.message = gclient_utils.FileRead(options.message_file)
4506 options.message_file = None
4507
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004508 if ([options.cq_dry_run,
4509 options.use_commit_queue,
4510 options.retry_failed].count(True) > 1):
4511 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4512 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004513
Aaron Gableedbc4132017-09-11 13:22:28 -07004514 if options.use_commit_queue:
4515 options.send_mail = True
4516
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004517 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4518 settings.GetIsGerrit()
4519
Edward Lemur934836a2019-09-09 20:16:54 +00004520 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004521 if options.retry_failed and not cl.GetIssue():
4522 print('No previous patchsets, so --retry-failed has no effect.')
4523 options.retry_failed = False
4524 # cl.GetMostRecentPatchset uses cached information, and can return the last
4525 # patchset before upload. Calling it here makes it clear that it's the
4526 # last patchset before upload. Note that GetMostRecentPatchset will fail
4527 # if no CL has been uploaded yet.
4528 if options.retry_failed:
4529 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004530
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004531 ret = cl.CMDUpload(options, args, orig_args)
4532
4533 if options.retry_failed:
4534 if ret != 0:
4535 print('Upload failed, so --retry-failed has no effect.')
4536 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004537 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004538 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004539 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004540 if len(buckets) == 0:
4541 print('No failed tryjobs, so --retry-failed has no effect.')
4542 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004543 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004544
4545 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004546
4547
Francois Dorayd42c6812017-05-30 15:10:20 -04004548@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004549@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004550def CMDsplit(parser, args):
4551 """Splits a branch into smaller branches and uploads CLs.
4552
4553 Creates a branch and uploads a CL for each group of files modified in the
4554 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004555 comment, '$directory' is replaced with the directory containing the changes
4556 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4557 sending out, and '$num_cls' is replaced with the total number of CLs that
4558 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004559 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004560 parser.add_option('-d', '--description', dest='description_file',
4561 help='A text file containing a CL description in which '
4562 '$directory will be replaced by each CL\'s directory.')
4563 parser.add_option('-c', '--comment', dest='comment_file',
4564 help='A text file containing a CL comment.')
4565 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004566 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004567 help='List the files and reviewers for each CL that would '
4568 'be created, but don\'t create branches or CLs.')
4569 parser.add_option('--cq-dry-run', action='store_true',
4570 help='If set, will do a cq dry run for each uploaded CL. '
4571 'Please be careful when doing this; more than ~10 CLs '
4572 'has the potential to overload our build '
4573 'infrastructure. Try to upload these not during high '
4574 'load times (usually 11-3 Mountain View time). Email '
4575 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004576 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4577 default=True,
4578 help='Sends your change to the CQ after an approval. Only '
4579 'works on repos that have the Auto-Submit label '
4580 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004581 options, _ = parser.parse_args(args)
4582
4583 if not options.description_file:
4584 parser.error('No --description flag specified.')
4585
4586 def WrappedCMDupload(args):
4587 return CMDupload(OptionParser(), args)
4588
4589 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004590 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004591 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004592
4593
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004594@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004595@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004596def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004597 """DEPRECATED: Used to commit the current changelist via git-svn."""
4598 message = ('git-cl no longer supports committing to SVN repositories via '
4599 'git-svn. You probably want to use `git cl land` instead.')
4600 print(message)
4601 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004602
4603
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004604@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004605@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004606def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004607 """Commits the current changelist via git.
4608
4609 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4610 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004611 """
4612 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4613 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004614 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004615 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004616 parser.add_option('--parallel', action='store_true',
4617 help='Run all tests specified by input_api.RunTests in all '
4618 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004619 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004620
Edward Lemur934836a2019-09-09 20:16:54 +00004621 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004622
Robert Iannucci2e73d432018-03-14 01:10:47 -07004623 if not cl.GetIssue():
4624 DieWithError('You must upload the change first to Gerrit.\n'
4625 ' If you would rather have `git cl land` upload '
4626 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004627 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004628 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004629
4630
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004631@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004632@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004633def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004634 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004635 parser.add_option('-b', dest='newbranch',
4636 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004637 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004638 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004639 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004640 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004641
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004642 group = optparse.OptionGroup(
4643 parser,
4644 'Options for continuing work on the current issue uploaded from a '
4645 'different clone (e.g. different machine). Must be used independently '
4646 'from the other options. No issue number should be specified, and the '
4647 'branch must have an issue number associated with it')
4648 group.add_option('--reapply', action='store_true', dest='reapply',
4649 help='Reset the branch and reapply the issue.\n'
4650 'CAUTION: This will undo any local changes in this '
4651 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004652
4653 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004654 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004655 parser.add_option_group(group)
4656
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004657 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004658 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004659
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004660 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004661 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004662 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004663 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004664 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004665
Edward Lemur934836a2019-09-09 20:16:54 +00004666 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004667 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004668 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004669
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004670 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004671 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004672 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004673
4674 RunGit(['reset', '--hard', upstream])
4675 if options.pull:
4676 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004677
Edward Lemur678a6842019-10-03 22:25:05 +00004678 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4679 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004680
4681 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004682 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004683
Edward Lemurf38bc172019-09-03 21:02:13 +00004684 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004685 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004686 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004687
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004688 # We don't want uncommitted changes mixed up with the patch.
4689 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004690 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004691
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004692 if options.newbranch:
4693 if options.force:
4694 RunGit(['branch', '-D', options.newbranch],
4695 stderr=subprocess2.PIPE, error_ok=True)
4696 RunGit(['new-branch', options.newbranch])
4697
Edward Lemur678a6842019-10-03 22:25:05 +00004698 cl = Changelist(
4699 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004700
Edward Lemur678a6842019-10-03 22:25:05 +00004701 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004702 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004703
Edward Lemurf38bc172019-09-03 21:02:13 +00004704 return cl.CMDPatchWithParsedIssue(
4705 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004706
4707
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004708def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004709 """Fetches the tree status and returns either 'open', 'closed',
4710 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004711 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004712 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004713 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004714 if status.find('closed') != -1 or status == '0':
4715 return 'closed'
4716 elif status.find('open') != -1 or status == '1':
4717 return 'open'
4718 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004719 return 'unset'
4720
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004721
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004722def GetTreeStatusReason():
4723 """Fetches the tree status from a json url and returns the message
4724 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004725 url = settings.GetTreeStatusUrl()
4726 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004727 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004728 status = json.loads(connection.read())
4729 connection.close()
4730 return status['message']
4731
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004732
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004733@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004734def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004735 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004736 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004737 status = GetTreeStatus()
4738 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004739 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004740 return 2
4741
vapiera7fbd5a2016-06-16 09:17:49 -07004742 print('The tree is %s' % status)
4743 print()
4744 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004745 if status != 'open':
4746 return 1
4747 return 0
4748
4749
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004750@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004751def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004752 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4753 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004754 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004755 '-b', '--bot', action='append',
4756 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4757 'times to specify multiple builders. ex: '
4758 '"-b win_rel -b win_layout". See '
4759 'the try server waterfall for the builders name and the tests '
4760 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004761 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004762 '-B', '--bucket', default='',
4763 help=('Buildbucket bucket to send the try requests.'))
4764 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004765 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004766 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004767 'be determined by the try recipe that builder runs, which usually '
4768 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004769 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004770 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004771 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004772 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004773 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004774 '--category', default='git_cl_try', help='Specify custom build category.')
4775 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004776 '--project',
4777 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004778 'in recipe to determine to which repository or directory to '
4779 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004780 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004781 '-p', '--property', dest='properties', action='append', default=[],
4782 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004783 'key2=value2 etc. The value will be treated as '
4784 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004785 'NOTE: using this may make your tryjob not usable for CQ, '
4786 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004787 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004788 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4789 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004790 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004791 parser.add_option(
4792 '-R', '--retry-failed', action='store_true', default=False,
4793 help='Retry failed jobs from the latest set of tryjobs. '
4794 'Not allowed with --bucket and --bot options.')
Koji Ishii31c14782018-01-08 17:17:33 +09004795 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004796 options, args = parser.parse_args(args)
4797
machenbach@chromium.org45453142015-09-15 08:45:22 +00004798 # Make sure that all properties are prop=value pairs.
4799 bad_params = [x for x in options.properties if '=' not in x]
4800 if bad_params:
4801 parser.error('Got properties with missing "=": %s' % bad_params)
4802
maruel@chromium.org15192402012-09-06 12:38:29 +00004803 if args:
4804 parser.error('Unknown arguments: %s' % args)
4805
Edward Lemur934836a2019-09-09 20:16:54 +00004806 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004807 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004808 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004809
Edward Lemurf38bc172019-09-03 21:02:13 +00004810 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004811 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004812
tandriie113dfd2016-10-11 10:20:12 -07004813 error_message = cl.CannotTriggerTryJobReason()
4814 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004815 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004816
Quinten Yearsley983111f2019-09-26 17:18:48 +00004817 if options.retry_failed:
4818 if options.bot or options.bucket:
4819 print('ERROR: The option --retry-failed is not compatible with '
4820 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4821 return 1
4822 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004823 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004824 if options.verbose:
4825 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004826 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004827 if not buckets:
4828 print('There are no failed jobs in the latest set of jobs '
4829 '(patchset #%d), doing nothing.' % patchset)
4830 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004831 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004832 if num_builders > 10:
4833 confirm_or_exit('There are %d builders with failed builds.'
4834 % num_builders, action='continue')
4835 else:
4836 buckets = _get_bucket_map(cl, options, parser)
4837 if buckets and any(b.startswith('master.') for b in buckets):
4838 print('ERROR: Buildbot masters are not supported.')
4839 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004840
qyearsleydd49f942016-10-28 11:57:22 -07004841 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4842 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004843 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004844 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004845 print('git cl try with no bots now defaults to CQ dry run.')
4846 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4847 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004848
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004849 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004850 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004851 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004852 'of bot requires an initial job from a parent (usually a builder). '
4853 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004854 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004855 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004856
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004857 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004858 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004859 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004860 except BuildbucketResponseException as ex:
4861 print('ERROR: %s' % ex)
4862 return 1
4863 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004864
4865
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004866@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004867def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004868 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004869 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004870 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004871 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004872 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004873 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004874 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004875 '--color', action='store_true', default=setup_color.IS_TTY,
4876 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004877 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004878 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4879 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004880 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004881 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004882 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004883 parser.add_option_group(group)
Stefan Zager27db3f22017-10-10 15:15:01 -07004884 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004885 options, args = parser.parse_args(args)
4886 if args:
4887 parser.error('Unrecognized args: %s' % ' '.join(args))
4888
Edward Lemur934836a2019-09-09 20:16:54 +00004889 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004890 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004891 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004892
tandrii221ab252016-10-06 08:12:04 -07004893 patchset = options.patchset
4894 if not patchset:
4895 patchset = cl.GetMostRecentPatchset()
4896 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004897 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004898 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004899 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004900 cl.GetIssue())
4901
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004902 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004903 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004904 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004905 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004906 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004907 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004908 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004909 else:
4910 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004911 return 0
4912
4913
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004914@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004915@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004916def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004917 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004918 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004919 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004920 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004921
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004922 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004923 if args:
4924 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004925 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004926 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004927 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004928 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004929
4930 # Clear configured merge-base, if there is one.
4931 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004932 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004933 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004934 return 0
4935
4936
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004937@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004938def CMDweb(parser, args):
4939 """Opens the current CL in the web browser."""
4940 _, args = parser.parse_args(args)
4941 if args:
4942 parser.error('Unrecognized args: %s' % ' '.join(args))
4943
4944 issue_url = Changelist().GetIssueURL()
4945 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004946 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004947 return 1
4948
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004949 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004950 # allows us to hide the "Created new window in existing browser session."
4951 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004952 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004953 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004954 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004955 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004956 os.open(os.devnull, os.O_RDWR)
4957 try:
4958 webbrowser.open(issue_url)
4959 finally:
4960 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004961 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004962 return 0
4963
4964
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004965@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004966def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004967 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004968 parser.add_option('-d', '--dry-run', action='store_true',
4969 help='trigger in dry run mode')
4970 parser.add_option('-c', '--clear', action='store_true',
4971 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004972 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004973 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004974 if args:
4975 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004976 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004977 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004978
Edward Lemur934836a2019-09-09 20:16:54 +00004979 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004980 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004981 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004982 elif options.dry_run:
4983 state = _CQState.DRY_RUN
4984 else:
4985 state = _CQState.COMMIT
4986 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004987 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004988 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004989 return 0
4990
4991
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004992@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004993def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004994 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004995 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004996 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004997 if args:
4998 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004999 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005000 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005001 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005002 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005003 cl.CloseIssue()
5004 return 0
5005
5006
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005007@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005008def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005009 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005010 parser.add_option(
5011 '--stat',
5012 action='store_true',
5013 dest='stat',
5014 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005015 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005016 if args:
5017 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005018
Edward Lemur934836a2019-09-09 20:16:54 +00005019 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005020 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005021 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005022 if not issue:
5023 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005024
Aaron Gablea718c3e2017-08-28 17:47:28 -07005025 base = cl._GitGetBranchConfigValue('last-upload-hash')
5026 if not base:
5027 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5028 if not base:
5029 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5030 revision_info = detail['revisions'][detail['current_revision']]
5031 fetch_info = revision_info['fetch']['http']
5032 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5033 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005034
Aaron Gablea718c3e2017-08-28 17:47:28 -07005035 cmd = ['git', 'diff']
5036 if options.stat:
5037 cmd.append('--stat')
5038 cmd.append(base)
5039 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005040
5041 return 0
5042
5043
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005044@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005045def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005046 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005047 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005048 '--ignore-current',
5049 action='store_true',
5050 help='Ignore the CL\'s current reviewers and start from scratch.')
5051 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005052 '--ignore-self',
5053 action='store_true',
5054 help='Do not consider CL\'s author as an owners.')
5055 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005056 '--no-color',
5057 action='store_true',
5058 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005059 parser.add_option(
5060 '--batch',
5061 action='store_true',
5062 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005063 # TODO: Consider moving this to another command, since other
5064 # git-cl owners commands deal with owners for a given CL.
5065 parser.add_option(
5066 '--show-all',
5067 action='store_true',
5068 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005069 options, args = parser.parse_args(args)
5070
5071 author = RunGit(['config', 'user.email']).strip() or None
5072
Edward Lemur934836a2019-09-09 20:16:54 +00005073 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005074
Yang Guo6e269a02019-06-26 11:17:02 +00005075 if options.show_all:
5076 for arg in args:
5077 base_branch = cl.GetCommonAncestorWithUpstream()
5078 change = cl.GetChange(base_branch, None)
5079 database = owners.Database(change.RepositoryRoot(), file, os.path)
5080 database.load_data_needed_for([arg])
5081 print('Owners for %s:' % arg)
5082 for owner in sorted(database.all_possible_owners([arg], None)):
5083 print(' - %s' % owner)
5084 return 0
5085
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005086 if args:
5087 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005088 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005089 base_branch = args[0]
5090 else:
5091 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005092 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005093
5094 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005095 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5096
5097 if options.batch:
5098 db = owners.Database(change.RepositoryRoot(), file, os.path)
5099 print('\n'.join(db.reviewers_for(affected_files, author)))
5100 return 0
5101
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005102 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005103 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005104 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005105 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005106 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005107 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005108 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005109 override_files=change.OriginalOwnersFiles(),
5110 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005111
5112
Aiden Bennerc08566e2018-10-03 17:52:42 +00005113def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005114 """Generates a diff command."""
5115 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005116 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5117
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005118 if allow_prefix:
5119 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5120 # case that diff.noprefix is set in the user's git config.
5121 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5122 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005123 diff_cmd += ['--no-prefix']
5124
5125 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005126
5127 if args:
5128 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005129 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005130 diff_cmd.append(arg)
5131 else:
5132 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005133
5134 return diff_cmd
5135
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005136
Jamie Madill5e96ad12020-01-13 16:08:35 +00005137def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5138 """Runs clang-format-diff and sets a return value if necessary."""
5139
5140 if not clang_diff_files:
5141 return 0
5142
5143 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5144 # formatted. This is used to block during the presubmit.
5145 return_value = 0
5146
5147 # Locate the clang-format binary in the checkout
5148 try:
5149 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5150 except clang_format.NotFoundError as e:
5151 DieWithError(e)
5152
5153 if opts.full or settings.GetFormatFullByDefault():
5154 cmd = [clang_format_tool]
5155 if not opts.dry_run and not opts.diff:
5156 cmd.append('-i')
5157 if opts.dry_run:
5158 for diff_file in clang_diff_files:
5159 with open(diff_file, 'r') as myfile:
5160 code = myfile.read().replace('\r\n', '\n')
5161 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5162 stdout = stdout.replace('\r\n', '\n')
5163 if opts.diff:
5164 sys.stdout.write(stdout)
5165 if code != stdout:
5166 return_value = 2
5167 else:
5168 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5169 if opts.diff:
5170 sys.stdout.write(stdout)
5171 else:
5172 env = os.environ.copy()
5173 env['PATH'] = str(os.path.dirname(clang_format_tool))
5174 try:
5175 script = clang_format.FindClangFormatScriptInChromiumTree(
5176 'clang-format-diff.py')
5177 except clang_format.NotFoundError as e:
5178 DieWithError(e)
5179
5180 cmd = [sys.executable, script, '-p0']
5181 if not opts.dry_run and not opts.diff:
5182 cmd.append('-i')
5183
5184 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5185 diff_output = RunGit(diff_cmd)
5186
5187 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5188 if opts.diff:
5189 sys.stdout.write(stdout)
5190 if opts.dry_run and len(stdout) > 0:
5191 return_value = 2
5192
5193 return return_value
5194
5195
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005196def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005197 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005198 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005199
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005200
enne@chromium.org555cfe42014-01-29 18:21:39 +00005201@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005202@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005203def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005204 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005205 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005206 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005207 parser.add_option('--full', action='store_true',
5208 help='Reformat the full content of all touched files')
5209 parser.add_option('--dry-run', action='store_true',
5210 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005211 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005212 '--no-clang-format',
5213 dest='clang_format',
5214 action='store_false',
5215 default=True,
5216 help='Disables formatting of various file types using clang-format.')
5217 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005218 '--python',
5219 action='store_true',
5220 default=None,
5221 help='Enables python formatting on all python files.')
5222 parser.add_option(
5223 '--no-python',
5224 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005225 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005226 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005227 'If neither --python or --no-python are set, python files that have a '
5228 '.style.yapf file in an ancestor directory will be formatted. '
5229 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005230 parser.add_option(
5231 '--js',
5232 action='store_true',
5233 help='Format javascript code with clang-format. '
5234 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005235 parser.add_option('--diff', action='store_true',
5236 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005237 parser.add_option('--presubmit', action='store_true',
5238 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005239 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005240
Garrett Beaty91a6f332020-01-06 16:57:24 +00005241 if opts.python is not None and opts.no_python:
5242 raise parser.error('Cannot set both --python and --no-python')
5243 if opts.no_python:
5244 opts.python = False
5245
Daniel Chengc55eecf2016-12-30 03:11:02 -08005246 # Normalize any remaining args against the current path, so paths relative to
5247 # the current directory are still resolved as expected.
5248 args = [os.path.join(os.getcwd(), arg) for arg in args]
5249
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005250 # git diff generates paths against the root of the repository. Change
5251 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005252 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005253 if rel_base_path:
5254 os.chdir(rel_base_path)
5255
digit@chromium.org29e47272013-05-17 17:01:46 +00005256 # Grab the merge-base commit, i.e. the upstream commit of the current
5257 # branch when it was created or the last time it was rebased. This is
5258 # to cover the case where the user may have called "git fetch origin",
5259 # moving the origin branch to a newer commit, but hasn't rebased yet.
5260 upstream_commit = None
5261 cl = Changelist()
5262 upstream_branch = cl.GetUpstreamBranch()
5263 if upstream_branch:
5264 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5265 upstream_commit = upstream_commit.strip()
5266
5267 if not upstream_commit:
5268 DieWithError('Could not find base commit for this branch. '
5269 'Are you in detached state?')
5270
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005271 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5272 diff_output = RunGit(changed_files_cmd)
5273 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005274 # Filter out files deleted by this CL
5275 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005276
Christopher Lamc5ba6922017-01-24 11:19:14 +11005277 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005278 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005279
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005280 clang_diff_files = []
5281 if opts.clang_format:
5282 clang_diff_files = [
5283 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5284 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005285 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5286 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005287 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005288
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005289 top_dir = os.path.normpath(
5290 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5291
Jamie Madill5e96ad12020-01-13 16:08:35 +00005292 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5293 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005294
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005295 # Similar code to above, but using yapf on .py files rather than clang-format
5296 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005297 py_explicitly_disabled = opts.python is not None and not opts.python
5298 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005299 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5300 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5301 if sys.platform.startswith('win'):
5302 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005303
Aiden Bennerc08566e2018-10-03 17:52:42 +00005304 # Used for caching.
5305 yapf_configs = {}
5306 for f in python_diff_files:
5307 # Find the yapf style config for the current file, defaults to depot
5308 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005309 _FindYapfConfigFile(f, yapf_configs, top_dir)
5310
5311 # Turn on python formatting by default if a yapf config is specified.
5312 # This breaks in the case of this repo though since the specified
5313 # style file is also the global default.
5314 if opts.python is None:
5315 filtered_py_files = []
5316 for f in python_diff_files:
5317 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5318 filtered_py_files.append(f)
5319 else:
5320 filtered_py_files = python_diff_files
5321
5322 # Note: yapf still seems to fix indentation of the entire file
5323 # even if line ranges are specified.
5324 # See https://github.com/google/yapf/issues/499
5325 if not opts.full and filtered_py_files:
5326 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5327
Brian Sheedyb4307d52019-12-02 19:18:17 +00005328 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5329 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5330 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005331
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005332 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005333 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5334 # Default to pep8 if not .style.yapf is found.
5335 if not yapf_style:
5336 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005337
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005338 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005339
5340 has_formattable_lines = False
5341 if not opts.full:
5342 # Only run yapf over changed line ranges.
5343 for diff_start, diff_len in py_line_diffs[f]:
5344 diff_end = diff_start + diff_len - 1
5345 # Yapf errors out if diff_end < diff_start but this
5346 # is a valid line range diff for a removal.
5347 if diff_end >= diff_start:
5348 has_formattable_lines = True
5349 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5350 # If all line diffs were removals we have nothing to format.
5351 if not has_formattable_lines:
5352 continue
5353
5354 if opts.diff or opts.dry_run:
5355 cmd += ['--diff']
5356 # Will return non-zero exit code if non-empty diff.
5357 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5358 if opts.diff:
5359 sys.stdout.write(stdout)
5360 elif len(stdout) > 0:
5361 return_value = 2
5362 else:
5363 cmd += ['-i']
5364 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005365
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005366 # Dart's formatter does not have the nice property of only operating on
5367 # modified chunks, so hard code full.
5368 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005369 try:
5370 command = [dart_format.FindDartFmtToolInChromiumTree()]
5371 if not opts.dry_run and not opts.diff:
5372 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005373 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005374
ppi@chromium.org6593d932016-03-03 15:41:15 +00005375 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005376 if opts.dry_run and stdout:
5377 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005378 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005379 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5380 'found in this checkout. Files in other languages are still '
5381 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005382
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005383 # Format GN build files. Always run on full build files for canonical form.
5384 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005385 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005386 if opts.dry_run or opts.diff:
5387 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005388 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005389 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5390 shell=sys.platform == 'win32',
5391 cwd=top_dir)
5392 if opts.dry_run and gn_ret == 2:
5393 return_value = 2 # Not formatted.
5394 elif opts.diff and gn_ret == 2:
5395 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005396 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005397 elif gn_ret != 0:
5398 # For non-dry run cases (and non-2 return values for dry-run), a
5399 # nonzero error code indicates a failure, probably because the file
5400 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005401 DieWithError('gn format failed on ' + gn_diff_file +
5402 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005403
Ilya Shermane081cbe2017-08-15 17:51:04 -07005404 # Skip the metrics formatting from the global presubmit hook. These files have
5405 # a separate presubmit hook that issues an error if the files need formatting,
5406 # whereas the top-level presubmit script merely issues a warning. Formatting
5407 # these files is somewhat slow, so it's important not to duplicate the work.
5408 if not opts.presubmit:
5409 for xml_dir in GetDirtyMetricsDirs(diff_files):
5410 tool_dir = os.path.join(top_dir, xml_dir)
5411 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5412 if opts.dry_run or opts.diff:
5413 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005414 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005415 if opts.diff:
5416 sys.stdout.write(stdout)
5417 if opts.dry_run and stdout:
5418 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005419
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005420 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005421
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005422
Steven Holte2e664bf2017-04-21 13:10:47 -07005423def GetDirtyMetricsDirs(diff_files):
5424 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5425 metrics_xml_dirs = [
5426 os.path.join('tools', 'metrics', 'actions'),
5427 os.path.join('tools', 'metrics', 'histograms'),
5428 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005429 os.path.join('tools', 'metrics', 'ukm'),
5430 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005431 for xml_dir in metrics_xml_dirs:
5432 if any(file.startswith(xml_dir) for file in xml_diff_files):
5433 yield xml_dir
5434
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005435
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005436@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005437@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005438def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005439 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005440 _, args = parser.parse_args(args)
5441
5442 if len(args) != 1:
5443 parser.print_help()
5444 return 1
5445
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005446 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005447 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005448 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005449
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005450 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005451
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005452 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005453 output = RunGit(['config', '--local', '--get-regexp',
5454 r'branch\..*\.%s' % issueprefix],
5455 error_ok=True)
5456 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005457 if issue == target_issue:
5458 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005459
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005460 branches = []
5461 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005462 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005463 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005464 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005465 return 1
5466 if len(branches) == 1:
5467 RunGit(['checkout', branches[0]])
5468 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005469 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005470 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005471 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005472 which = raw_input('Choose by index: ')
5473 try:
5474 RunGit(['checkout', branches[int(which)]])
5475 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005476 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005477 return 1
5478
5479 return 0
5480
5481
maruel@chromium.org29404b52014-09-08 22:58:00 +00005482def CMDlol(parser, args):
5483 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005484 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005485 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5486 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5487 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005488 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005489 return 0
5490
5491
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005492class OptionParser(optparse.OptionParser):
5493 """Creates the option parse and add --verbose support."""
5494 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005495 optparse.OptionParser.__init__(
5496 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005497 self.add_option(
5498 '-v', '--verbose', action='count', default=0,
5499 help='Use 2 times for more debugging info')
5500
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005501 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005502 try:
5503 return self._parse_args(args)
5504 finally:
5505 # Regardless of success or failure of args parsing, we want to report
5506 # metrics, but only after logging has been initialized (if parsing
5507 # succeeded).
5508 global settings
5509 settings = Settings()
5510
5511 if not metrics.DISABLE_METRICS_COLLECTION:
5512 # GetViewVCUrl ultimately calls logging method.
5513 project_url = settings.GetViewVCUrl().strip('/+')
5514 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5515 metrics.collector.add('project_urls', [project_url])
5516
5517 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005518 # Create an optparse.Values object that will store only the actual passed
5519 # options, without the defaults.
5520 actual_options = optparse.Values()
5521 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5522 # Create an optparse.Values object with the default options.
5523 options = optparse.Values(self.get_default_values().__dict__)
5524 # Update it with the options passed by the user.
5525 options._update_careful(actual_options.__dict__)
5526 # Store the options passed by the user in an _actual_options attribute.
5527 # We store only the keys, and not the values, since the values can contain
5528 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005529 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005530
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005531 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005532 logging.basicConfig(
5533 level=levels[min(options.verbose, len(levels) - 1)],
5534 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5535 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005536
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005537 return options, args
5538
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005539
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005540def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005541 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005542 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005543 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005544 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005545
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005546 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005547 dispatcher = subcommand.CommandDispatcher(__name__)
5548 try:
5549 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005550 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005551 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005552 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005553 if e.code != 500:
5554 raise
5555 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005556 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005557 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005558 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005559
5560
5561if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005562 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5563 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005564 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005565 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005566 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005567 sys.exit(main(sys.argv[1:]))