blob: af4b843619626a27d30076a3dcb8002db228eb8c [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 Sheedy59b06a82019-10-14 17:03:29 +000017import glob
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'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +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):
141 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000142 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100143 backup_file = open(backup_path, 'w')
144 backup_file.write(change_desc.description)
145 backup_file.close()
146
147
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000148def GetNoGitPagerEnv():
149 env = os.environ.copy()
150 # 'cat' is a magical git string that disables pagers on all platforms.
151 env['GIT_PAGER'] = 'cat'
152 return env
153
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000154
bsep@chromium.org627d9002016-04-29 00:00:52 +0000155def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000156 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000157 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
158 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000159 except subprocess2.CalledProcessError as e:
160 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000161 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000163 'Command "%s" failed.\n%s' % (
164 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000165 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000166
167
168def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000169 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000170 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000171
172
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000173def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000174 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700175 if suppress_stderr:
176 stderr = subprocess2.VOID
177 else:
178 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000179 try:
tandrii5d48c322016-08-18 16:19:37 -0700180 (out, _), code = subprocess2.communicate(['git'] + args,
181 env=GetNoGitPagerEnv(),
182 stdout=subprocess2.PIPE,
183 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000184 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700185 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900186 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000187 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000188
189
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000190def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000191 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000192 return RunGitWithCode(args, suppress_stderr=True)[1]
193
194
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000195def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000196 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000197 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000198 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000199 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000200
201
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000202def BranchExists(branch):
203 """Return True if specified branch exists."""
204 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
205 suppress_stderr=True)
206 return not code
207
208
tandrii2a16b952016-10-19 07:09:44 -0700209def time_sleep(seconds):
210 # Use this so that it can be mocked in tests without interfering with python
211 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700212 return time.sleep(seconds)
213
214
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000215def time_time():
216 # Use this so that it can be mocked in tests without interfering with python
217 # system machinery.
218 return time.time()
219
220
Edward Lemur1b52d872019-05-09 21:12:12 +0000221def datetime_now():
222 # Use this so that it can be mocked in tests without interfering with python
223 # system machinery.
224 return datetime.datetime.now()
225
226
maruel@chromium.org90541732011-04-01 17:54:18 +0000227def ask_for_data(prompt):
228 try:
229 return raw_input(prompt)
230 except KeyboardInterrupt:
231 # Hide the exception.
232 sys.exit(1)
233
234
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100235def confirm_or_exit(prefix='', action='confirm'):
236 """Asks user to press enter to continue or press Ctrl+C to abort."""
237 if not prefix or prefix.endswith('\n'):
238 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100239 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240 mid = ' Press'
241 elif prefix.endswith(' '):
242 mid = 'press'
243 else:
244 mid = ' press'
245 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
246
247
248def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000249 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100250 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
251 while True:
252 if 'yes'.startswith(result):
253 return True
254 if 'no'.startswith(result):
255 return False
256 result = ask_for_data('Please, type yes or no: ').lower()
257
258
tandrii5d48c322016-08-18 16:19:37 -0700259def _git_branch_config_key(branch, key):
260 """Helper method to return Git config key for a branch."""
261 assert branch, 'branch name is required to set git config for it'
262 return 'branch.%s.%s' % (branch, key)
263
264
265def _git_get_branch_config_value(key, default=None, value_type=str,
266 branch=False):
267 """Returns git config value of given or current branch if any.
268
269 Returns default in all other cases.
270 """
271 assert value_type in (int, str, bool)
272 if branch is False: # Distinguishing default arg value from None.
273 branch = GetCurrentBranch()
274
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000275 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700276 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000277
tandrii5d48c322016-08-18 16:19:37 -0700278 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700279 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700280 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000281 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700282 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700283 args.append(_git_branch_config_key(branch, key))
284 code, out = RunGitWithCode(args)
285 if code == 0:
286 value = out.strip()
287 if value_type == int:
288 return int(value)
289 if value_type == bool:
290 return bool(value.lower() == 'true')
291 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000292 return default
293
294
tandrii5d48c322016-08-18 16:19:37 -0700295def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000296 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700297
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000298 If value is None, the key will be unset, otherwise it will be set.
299 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700300 """
301 if not branch:
302 branch = GetCurrentBranch()
303 assert branch, 'a branch name OR currently checked out branch is required'
304 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700305 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700306 if value is None:
307 args.append('--unset')
308 elif isinstance(value, bool):
309 args.append('--bool')
310 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700311 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000312 # `git config` also has --int, but apparently git config suffers from
313 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700314 value = str(value)
315 args.append(_git_branch_config_key(branch, key))
316 if value is not None:
317 args.append(value)
318 RunGit(args, **kwargs)
319
320
machenbach@chromium.org45453142015-09-15 08:45:22 +0000321def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000322 prop_list = getattr(options, 'properties', [])
323 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000324 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000325 try:
326 properties[key] = json.loads(val)
327 except ValueError:
328 pass # If a value couldn't be evaluated, treat it as a string.
329 return properties
330
331
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000332# TODO(crbug.com/976104): Remove this function once git-cl try-results has
333# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000334def _buildbucket_retry(operation_name, http, *args, **kwargs):
335 """Retries requests to buildbucket service and returns parsed json content."""
336 try_count = 0
337 while True:
338 response, content = http.request(*args, **kwargs)
339 try:
340 content_json = json.loads(content)
341 except ValueError:
342 content_json = None
343
344 # Buildbucket could return an error even if status==200.
345 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000346 error = content_json.get('error')
347 if error.get('code') == 403:
348 raise BuildbucketResponseException(
349 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000350 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000351 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000352 raise BuildbucketResponseException(msg)
353
354 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700355 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000356 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000357 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700358 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000359 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000360 content)
361 return content_json
362 if response.status < 500 or try_count >= 2:
363 raise httplib2.HttpLib2Error(content)
364
365 # status >= 500 means transient failures.
366 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000367 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000368 try_count += 1
369 assert False, 'unreachable'
370
371
Edward Lemur4c707a22019-09-24 21:13:43 +0000372def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373 """Calls a buildbucket v2 method and returns the parsed json response."""
374 headers = {
375 'Accept': 'application/json',
376 'Content-Type': 'application/json',
377 }
378 request = json.dumps(request)
379 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
380
381 logging.info('POST %s with %s' % (url, request))
382
383 attempts = 1
384 time_to_sleep = 1
385 while True:
386 response, content = http.request(url, 'POST', body=request, headers=headers)
387 if response.status == 200:
388 return json.loads(content[4:])
389 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
390 msg = '%s error when calling POST %s with %s: %s' % (
391 response.status, url, request, content)
392 raise BuildbucketResponseException(msg)
393 logging.debug(
394 '%s error when calling POST %s with %s. '
395 'Sleeping for %d seconds and retrying...' % (
396 response.status, url, request, time_to_sleep))
397 time.sleep(time_to_sleep)
398 time_to_sleep *= 2
399 attempts += 1
400
401 assert False, 'unreachable'
402
403
qyearsley1fdfcb62016-10-24 13:22:03 -0700404def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700405 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000406 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700407 """
qyearsleydd49f942016-10-28 11:57:22 -0700408 # If no bots are listed, we try to get a set of builders and tests based
409 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 if not options.bot:
411 change = changelist.GetChange(
412 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700413 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700414 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700415 change=change,
416 changed_files=change.LocalPaths(),
417 repository_root=settings.GetRoot(),
418 default_presubmit=None,
419 project=None,
420 verbose=options.verbose,
421 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700422 if masters is None:
423 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000424 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700425
qyearsley1fdfcb62016-10-24 13:22:03 -0700426 if options.bucket:
427 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000428 option_parser.error(
Edward Lemur5ef16a32019-11-11 21:13:25 +0000429 'Please specify the bucket, e.g. "-B chromium/try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700430
431
Edward Lemur6215c792019-10-03 21:59:05 +0000432def _parse_bucket(raw_bucket):
433 legacy = True
434 project = bucket = None
435 if '/' in raw_bucket:
436 legacy = False
437 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000438 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000439 elif raw_bucket.startswith('luci.'):
440 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000441 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000442 elif '.' in raw_bucket:
443 project = raw_bucket.split('.')[0]
444 bucket = raw_bucket
445 # Legacy buckets.
446 if legacy:
447 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
448 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000449
450
Edward Lemur5b929a42019-10-21 17:57:39 +0000451def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000452 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700453
454 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000455 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700456 buckets: A nested dict mapping bucket names to builders to tests.
457 options: Command-line options.
458 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000459 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000460 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000461 print('Bucket:', bucket)
462 print('\n'.join(
463 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000464 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000465 print('To see results here, run: git cl try-results')
466 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700467
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000468 requests = _make_try_job_schedule_requests(
469 changelist, buckets, options, patchset)
470 if not requests:
471 return
472
Edward Lemur5b929a42019-10-21 17:57:39 +0000473 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000474 http.force_exception_to_status_code = True
475
476 batch_request = {'requests': requests}
477 batch_response = _call_buildbucket(
478 http, options.buildbucket_host, 'Batch', batch_request)
479
480 errors = [
481 ' ' + response['error']['message']
482 for response in batch_response.get('responses', [])
483 if 'error' in response
484 ]
485 if errors:
486 raise BuildbucketResponseException(
487 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
488
489
490def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000491 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000492 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000493 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000494 shared_properties['clobber'] = True
495 shared_properties.update(_get_properties_from_options(options) or {})
496
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000497 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
498 if options.retry_failed:
499 shared_tags.append({'key': 'retry_failed',
500 'value': '1'})
501
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000502 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000503 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000504 project, bucket = _parse_bucket(raw_bucket)
505 if not project or not bucket:
506 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
507 continue
508
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000509 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000510 properties = shared_properties.copy()
511 if 'presubmit' in builder.lower():
512 properties['dry_run'] = 'true'
513 if tests:
514 properties['testfilter'] = tests
515
516 requests.append({
517 'scheduleBuild': {
518 'requestId': str(uuid.uuid4()),
519 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000520 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000521 'bucket': bucket,
522 'builder': builder,
523 },
524 'gerritChanges': gerrit_changes,
525 'properties': properties,
526 'tags': [
527 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000528 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000529 }
530 })
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000531 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000532
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000533
Edward Lemur5b929a42019-10-21 17:57:39 +0000534def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000535 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000536
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000538 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000539 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000540 request = {
541 'predicate': {
542 'gerritChanges': [changelist.GetGerritChange(patchset)],
543 },
544 'fields': ','.join('builds.*.' + field for field in fields),
545 }
tandrii221ab252016-10-06 08:12:04 -0700546
Edward Lemur5b929a42019-10-21 17:57:39 +0000547 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000548 if authenticator.has_cached_credentials():
549 http = authenticator.authorize(httplib2.Http())
550 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700551 print('Warning: Some results might be missing because %s' %
552 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000553 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000555 http.force_exception_to_status_code = True
556
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000557 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
558 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000559
Edward Lemur5b929a42019-10-21 17:57:39 +0000560def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000561 """Fetches builds from the latest patchset that has builds (within
562 the last few patchsets).
563
564 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000565 changelist (Changelist): The CL to fetch builds for
566 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000567 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
568 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000569 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
571 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000572 """
573 assert buildbucket_host
574 assert changelist.GetIssue(), 'CL must be uploaded first'
575 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000576 if latest_patchset is None:
577 assert changelist.GetMostRecentPatchset()
578 ps = changelist.GetMostRecentPatchset()
579 else:
580 assert latest_patchset > 0, latest_patchset
581 ps = latest_patchset
582
Quinten Yearsley983111f2019-09-26 17:18:48 +0000583 min_ps = max(1, ps - 5)
584 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000585 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000586 if len(builds):
587 return builds, ps
588 ps -= 1
589 return [], 0
590
591
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000592def _filter_failed_for_retry(all_builds):
593 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000594
595 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000596 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000597 i.e. a list of buildbucket.v2.Builds which includes status and builder
598 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000599
600 Returns:
601 A dict of bucket to builder to tests (empty list). This is the same format
602 accepted by _trigger_try_jobs and returned by _get_bucket_map.
603 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000604
605 def _builder_of(build):
606 builder = build['builder']
607 return (builder['project'], builder['bucket'], builder['builder'])
608
609 res = collections.defaultdict(dict)
610 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
611 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
612 # If builder had several builds, retry only if the last one failed.
613 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
614 # build, but in case of retrying failed jobs retrying a flaky one makes
615 # sense.
616 builds = list(builds)
617 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
618 continue
619 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
620 for t in builds[-1]['tags']):
621 # Don't retry experimental build previously triggered by CQ.
622 continue
623 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
624 # Don't retry if any are running.
625 continue
626 res[proj + '/' + buck][bldr] = []
627 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000628
629
qyearsleyeab3c042016-08-24 09:18:28 -0700630def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 """Prints nicely result of fetch_try_jobs."""
632 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000633 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000634 return
635
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000636 longest_builder = max(len(b['builder']['builder']) for b in builds)
637 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000638 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000639 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
640 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000641
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000642 builds_by_status = {}
643 for b in builds:
644 builds_by_status.setdefault(b['status'], []).append({
645 'id': b['id'],
646 'name': name_fmt.format(
647 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
648 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000649
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000650 sort_key = lambda b: (b['name'], b['id'])
651
652 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000653 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000654 if not builds:
655 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000656
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000657 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000658 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000659 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 else:
661 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
662
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000663 print(colorize(title))
664 for b in sorted(builds, key=sort_key):
665 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000666
667 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000668 print_builds(
669 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
670 print_builds(
671 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
672 color=Fore.MAGENTA)
673 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
674 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
675 color=Fore.MAGENTA)
676 print_builds('Started:', builds_by_status.pop('STARTED', []))
677 print_builds(
678 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000679 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000680 print_builds(
681 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000682 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000683
684
Aiden Bennerc08566e2018-10-03 17:52:42 +0000685def _ComputeDiffLineRanges(files, upstream_commit):
686 """Gets the changed line ranges for each file since upstream_commit.
687
688 Parses a git diff on provided files and returns a dict that maps a file name
689 to an ordered list of range tuples in the form (start_line, count).
690 Ranges are in the same format as a git diff.
691 """
692 # If files is empty then diff_output will be a full diff.
693 if len(files) == 0:
694 return {}
695
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000696 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000697 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000698 diff_output = RunGit(diff_cmd)
699
700 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
701 # 2 capture groups
702 # 0 == fname of diff file
703 # 1 == 'diff_start,diff_count' or 'diff_start'
704 # will match each of
705 # diff --git a/foo.foo b/foo.py
706 # @@ -12,2 +14,3 @@
707 # @@ -12,2 +17 @@
708 # running re.findall on the above string with pattern will give
709 # [('foo.py', ''), ('', '14,3'), ('', '17')]
710
711 curr_file = None
712 line_diffs = {}
713 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
714 if match[0] != '':
715 # Will match the second filename in diff --git a/a.py b/b.py.
716 curr_file = match[0]
717 line_diffs[curr_file] = []
718 else:
719 # Matches +14,3
720 if ',' in match[1]:
721 diff_start, diff_count = match[1].split(',')
722 else:
723 # Single line changes are of the form +12 instead of +12,1.
724 diff_start = match[1]
725 diff_count = 1
726
727 diff_start = int(diff_start)
728 diff_count = int(diff_count)
729
730 # If diff_count == 0 this is a removal we can ignore.
731 line_diffs[curr_file].append((diff_start, diff_count))
732
733 return line_diffs
734
735
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000736def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000737 """Checks if a yapf file is in any parent directory of fpath until top_dir.
738
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000739 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000740 is found returns None. Uses yapf_config_cache as a cache for previously found
741 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000742 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000743 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000744 # Return result if we've already computed it.
745 if fpath in yapf_config_cache:
746 return yapf_config_cache[fpath]
747
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000748 parent_dir = os.path.dirname(fpath)
749 if os.path.isfile(fpath):
750 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000751 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000752 # Otherwise fpath is a directory
753 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
754 if os.path.isfile(yapf_file):
755 ret = yapf_file
756 elif fpath == top_dir or parent_dir == fpath:
757 # If we're at the top level directory, or if we're at root
758 # there is no provided style.
759 ret = None
760 else:
761 # Otherwise recurse on the current directory.
762 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000763 yapf_config_cache[fpath] = ret
764 return ret
765
766
Brian Sheedy59b06a82019-10-14 17:03:29 +0000767def _GetYapfIgnoreFilepaths(top_dir):
768 """Returns all filepaths that match the ignored files in the .yapfignore file.
769
770 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
771 but this functionality appears to break when explicitly passing files to
772 yapf for formatting. According to
773 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
774 the .yapfignore file should be in the directory that yapf is invoked from,
775 which we assume to be the top level directory in this case.
776
777 Args:
778 top_dir: The top level directory for the repository being formatted.
779
780 Returns:
781 A set of all filepaths that should be ignored by yapf.
782 """
783 yapfignore_file = os.path.join(top_dir, '.yapfignore')
784 ignore_filepaths = set()
785 if not os.path.exists(yapfignore_file):
786 return ignore_filepaths
787
788 # glob works relative to the current working directory, so we need to ensure
789 # that we're at the top level directory.
790 old_cwd = os.getcwd()
791 try:
792 os.chdir(top_dir)
793 with open(yapfignore_file) as f:
794 for line in f.readlines():
795 stripped_line = line.strip()
796 # Comments and blank lines should be ignored.
797 if stripped_line.startswith('#') or stripped_line == '':
798 continue
799 ignore_filepaths |= set(glob.glob(stripped_line))
800 return ignore_filepaths
801 finally:
802 os.chdir(old_cwd)
803
804
Aaron Gable13101a62018-02-09 13:20:41 -0800805def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000806 """Prints statistics about the change to the user."""
807 # --no-ext-diff is broken in some versions of Git, so try to work around
808 # this by overriding the environment (but there is still a problem if the
809 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000810 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000811 if 'GIT_EXTERNAL_DIFF' in env:
812 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000813
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000814 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800815 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000816 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000817
818
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000819class BuildbucketResponseException(Exception):
820 pass
821
822
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000823class Settings(object):
824 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000825 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000826 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000827 self.tree_status_url = None
828 self.viewvc_url = None
829 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000830 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000831 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000832 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000833 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000834 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000835
836 def LazyUpdateIfNeeded(self):
837 """Updates the settings from a codereview.settings file, if available."""
838 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000839 # The only value that actually changes the behavior is
840 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000841 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000842 error_ok=True
843 ).strip().lower()
844
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000845 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000846 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000847 LoadCodereviewSettingsFromFile(cr_settings_file)
848 self.updated = True
849
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000850 @staticmethod
851 def GetRelativeRoot():
852 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000853
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000854 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000855 if self.root is None:
856 self.root = os.path.abspath(self.GetRelativeRoot())
857 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000858
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000859 def GetTreeStatusUrl(self, error_ok=False):
860 if not self.tree_status_url:
861 error_message = ('You must configure your tree status URL by running '
862 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000863 self.tree_status_url = self._GetConfig(
864 'rietveld.tree-status-url', error_ok=error_ok,
865 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000866 return self.tree_status_url
867
868 def GetViewVCUrl(self):
869 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000870 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000871 return self.viewvc_url
872
rmistry@google.com90752582014-01-14 21:04:50 +0000873 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000874 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000875
rmistry@google.com5626a922015-02-26 14:03:30 +0000876 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000877 run_post_upload_hook = self._GetConfig(
878 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000879 return run_post_upload_hook == "True"
880
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000881 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000882 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000883
ukai@chromium.orge8077812012-02-03 03:41:46 +0000884 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000885 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000886 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700887 self.is_gerrit = (
888 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000889 return self.is_gerrit
890
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000891 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000892 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000893 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700894 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
895 if self.squash_gerrit_uploads is None:
896 # Default is squash now (http://crbug.com/611892#c23).
897 self.squash_gerrit_uploads = not (
898 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
899 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000900 return self.squash_gerrit_uploads
901
tandriia60502f2016-06-20 02:01:53 -0700902 def GetSquashGerritUploadsOverride(self):
903 """Return True or False if codereview.settings should be overridden.
904
905 Returns None if no override has been defined.
906 """
907 # See also http://crbug.com/611892#c23
908 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
909 error_ok=True).strip()
910 if result == 'true':
911 return True
912 if result == 'false':
913 return False
914 return None
915
tandrii@chromium.org28253532016-04-14 13:46:56 +0000916 def GetGerritSkipEnsureAuthenticated(self):
917 """Return True if EnsureAuthenticated should not be done for Gerrit
918 uploads."""
919 if self.gerrit_skip_ensure_authenticated is None:
920 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000921 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000922 error_ok=True).strip() == 'true')
923 return self.gerrit_skip_ensure_authenticated
924
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000925 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000926 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000927 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000928 # Git requires single quotes for paths with spaces. We need to replace
929 # them with double quotes for Windows to treat such paths as a single
930 # path.
931 self.git_editor = self._GetConfig(
932 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000933 return self.git_editor or None
934
thestig@chromium.org44202a22014-03-11 19:22:18 +0000935 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000936 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000937 DEFAULT_LINT_REGEX)
938
939 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000940 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000941 DEFAULT_LINT_IGNORE_REGEX)
942
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000943 def GetFormatFullByDefault(self):
944 if self.format_full_by_default is None:
945 result = (
946 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
947 error_ok=True).strip())
948 self.format_full_by_default = (result == 'true')
949 return self.format_full_by_default
950
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000951 def _GetConfig(self, param, **kwargs):
952 self.LazyUpdateIfNeeded()
953 return RunGit(['config', param], **kwargs).strip()
954
955
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000956def ShortBranchName(branch):
957 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000958 return branch.replace('refs/heads/', '', 1)
959
960
961def GetCurrentBranchRef():
962 """Returns branch ref (e.g., refs/heads/master) or None."""
963 return RunGit(['symbolic-ref', 'HEAD'],
964 stderr=subprocess2.VOID, error_ok=True).strip() or None
965
966
967def GetCurrentBranch():
968 """Returns current branch or None.
969
970 For refs/heads/* branches, returns just last part. For others, full ref.
971 """
972 branchref = GetCurrentBranchRef()
973 if branchref:
974 return ShortBranchName(branchref)
975 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000976
977
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000978class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000979 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000980 NONE = 'none'
981 DRY_RUN = 'dry_run'
982 COMMIT = 'commit'
983
984 ALL_STATES = [NONE, DRY_RUN, COMMIT]
985
986
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000987class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000988 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000989 self.issue = issue
990 self.patchset = patchset
991 self.hostname = hostname
992
993 @property
994 def valid(self):
995 return self.issue is not None
996
997
Edward Lemurf38bc172019-09-03 21:02:13 +0000998def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000999 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1000 fail_result = _ParsedIssueNumberArgument()
1001
Edward Lemur678a6842019-10-03 22:25:05 +00001002 if isinstance(arg, int):
1003 return _ParsedIssueNumberArgument(issue=arg)
1004 if not isinstance(arg, basestring):
1005 return fail_result
1006
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001007 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001008 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001009 if not arg.startswith('http'):
1010 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001011
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001012 url = gclient_utils.UpgradeToHttps(arg)
1013 try:
Edward Lemur79d4f992019-11-11 23:49:02 +00001014 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001015 except ValueError:
1016 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001017
Edward Lemur678a6842019-10-03 22:25:05 +00001018 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1019 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1020 # Short urls like https://domain/<issue_number> can be used, but don't allow
1021 # specifying the patchset (you'd 404), but we allow that here.
1022 if parsed_url.path == '/':
1023 part = parsed_url.fragment
1024 else:
1025 part = parsed_url.path
1026
1027 match = re.match(
1028 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1029 if not match:
1030 return fail_result
1031
1032 issue = int(match.group('issue'))
1033 patchset = match.group('patchset')
1034 return _ParsedIssueNumberArgument(
1035 issue=issue,
1036 patchset=int(patchset) if patchset else None,
1037 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001038
1039
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001040def _create_description_from_log(args):
1041 """Pulls out the commit log to use as a base for the CL description."""
1042 log_args = []
1043 if len(args) == 1 and not args[0].endswith('.'):
1044 log_args = [args[0] + '..']
1045 elif len(args) == 1 and args[0].endswith('...'):
1046 log_args = [args[0][:-1]]
1047 elif len(args) == 2:
1048 log_args = [args[0] + '..' + args[1]]
1049 else:
1050 log_args = args[:] # Hope for the best!
1051 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1052
1053
Aaron Gablea45ee112016-11-22 15:14:38 -08001054class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001055 def __init__(self, issue, url):
1056 self.issue = issue
1057 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001058 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001059
1060 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001061 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001062 self.issue, self.url)
1063
1064
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001065_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001066 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001067 # TODO(tandrii): these two aren't known in Gerrit.
1068 'approval', 'disapproval'])
1069
1070
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001071class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001072 """Changelist works with one changelist in local branch.
1073
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001074 Notes:
1075 * Not safe for concurrent multi-{thread,process} use.
1076 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001077 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001078 """
1079
Edward Lemur125d60a2019-09-13 18:25:41 +00001080 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001081 """Create a new ChangeList instance.
1082
Edward Lemurf38bc172019-09-03 21:02:13 +00001083 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001084 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001086 global settings
1087 if not settings:
1088 # Happens when git_cl.py is used as a utility library.
1089 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001090
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001091 self.branchref = branchref
1092 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001093 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001094 self.branch = ShortBranchName(self.branchref)
1095 else:
1096 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001097 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001098 self.lookedup_issue = False
1099 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001100 self.has_description = False
1101 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001102 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001104 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001105 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001106 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001107 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001108
Edward Lemur125d60a2019-09-13 18:25:41 +00001109 # Lazily cached values.
1110 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1111 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1112 # Map from change number (issue) to its detail cache.
1113 self._detail_cache = {}
1114
1115 if codereview_host is not None:
1116 assert not codereview_host.startswith('https://'), codereview_host
1117 self._gerrit_host = codereview_host
1118 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001119
1120 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001121 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001122
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001123 The return value is a string suitable for passing to git cl with the --cc
1124 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001125 """
1126 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001127 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001128 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001129 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1130 return self.cc
1131
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001132 def GetCCListWithoutDefault(self):
1133 """Return the users cc'd on this CL excluding default ones."""
1134 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001135 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001136 return self.cc
1137
Daniel Cheng7227d212017-11-17 08:12:37 -08001138 def ExtendCC(self, more_cc):
1139 """Extends the list of users to cc on this CL based on the changed files."""
1140 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141
1142 def GetBranch(self):
1143 """Returns the short branch name, e.g. 'master'."""
1144 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001145 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001146 if not branchref:
1147 return None
1148 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149 self.branch = ShortBranchName(self.branchref)
1150 return self.branch
1151
1152 def GetBranchRef(self):
1153 """Returns the full branch name, e.g. 'refs/heads/master'."""
1154 self.GetBranch() # Poke the lazy loader.
1155 return self.branchref
1156
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001157 def ClearBranch(self):
1158 """Clears cached branch data of this object."""
1159 self.branch = self.branchref = None
1160
tandrii5d48c322016-08-18 16:19:37 -07001161 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1162 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1163 kwargs['branch'] = self.GetBranch()
1164 return _git_get_branch_config_value(key, default, **kwargs)
1165
1166 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1167 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1168 assert self.GetBranch(), (
1169 'this CL must have an associated branch to %sset %s%s' %
1170 ('un' if value is None else '',
1171 key,
1172 '' if value is None else ' to %r' % value))
1173 kwargs['branch'] = self.GetBranch()
1174 return _git_set_branch_config_value(key, value, **kwargs)
1175
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001176 @staticmethod
1177 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001178 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001179 e.g. 'origin', 'refs/heads/master'
1180 """
1181 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001182 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1183
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001184 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001185 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001186 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001187 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1188 error_ok=True).strip()
1189 if upstream_branch:
1190 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001191 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001192 # Else, try to guess the origin remote.
1193 remote_branches = RunGit(['branch', '-r']).split()
1194 if 'origin/master' in remote_branches:
1195 # Fall back on origin/master if it exits.
1196 remote = 'origin'
1197 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001198 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001199 DieWithError(
1200 'Unable to determine default branch to diff against.\n'
1201 'Either pass complete "git diff"-style arguments, like\n'
1202 ' git cl upload origin/master\n'
1203 'or verify this branch is set up to track another \n'
1204 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001205
1206 return remote, upstream_branch
1207
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001208 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001209 upstream_branch = self.GetUpstreamBranch()
1210 if not BranchExists(upstream_branch):
1211 DieWithError('The upstream for the current branch (%s) does not exist '
1212 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001213 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001214 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001215
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001216 def GetUpstreamBranch(self):
1217 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001218 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001219 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001220 upstream_branch = upstream_branch.replace('refs/heads/',
1221 'refs/remotes/%s/' % remote)
1222 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1223 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001224 self.upstream_branch = upstream_branch
1225 return self.upstream_branch
1226
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001227 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001228 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001229 remote, branch = None, self.GetBranch()
1230 seen_branches = set()
1231 while branch not in seen_branches:
1232 seen_branches.add(branch)
1233 remote, branch = self.FetchUpstreamTuple(branch)
1234 branch = ShortBranchName(branch)
1235 if remote != '.' or branch.startswith('refs/remotes'):
1236 break
1237 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001238 remotes = RunGit(['remote'], error_ok=True).split()
1239 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001240 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001241 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001242 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001243 logging.warn('Could not determine which remote this change is '
1244 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001245 else:
1246 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001247 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001248 branch = 'HEAD'
1249 if branch.startswith('refs/remotes'):
1250 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001251 elif branch.startswith('refs/branch-heads/'):
1252 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001253 else:
1254 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001255 return self._remote
1256
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001257 def GitSanityChecks(self, upstream_git_obj):
1258 """Checks git repo status and ensures diff is from local commits."""
1259
sbc@chromium.org79706062015-01-14 21:18:12 +00001260 if upstream_git_obj is None:
1261 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001262 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001263 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001264 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001265 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001266 return False
1267
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001268 # Verify the commit we're diffing against is in our current branch.
1269 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1270 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1271 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001272 print('ERROR: %s is not in the current branch. You may need to rebase '
1273 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001274 return False
1275
1276 # List the commits inside the diff, and verify they are all local.
1277 commits_in_diff = RunGit(
1278 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1279 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1280 remote_branch = remote_branch.strip()
1281 if code != 0:
1282 _, remote_branch = self.GetRemoteBranch()
1283
1284 commits_in_remote = RunGit(
1285 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1286
1287 common_commits = set(commits_in_diff) & set(commits_in_remote)
1288 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001289 print('ERROR: Your diff contains %d commits already in %s.\n'
1290 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1291 'the diff. If you are using a custom git flow, you can override'
1292 ' the reference used for this check with "git config '
1293 'gitcl.remotebranch <git-ref>".' % (
1294 len(common_commits), remote_branch, upstream_git_obj),
1295 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001296 return False
1297 return True
1298
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001299 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001300 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001301
1302 Returns None if it is not set.
1303 """
tandrii5d48c322016-08-18 16:19:37 -07001304 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001305
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001306 def GetRemoteUrl(self):
1307 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1308
1309 Returns None if there is no remote.
1310 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001311 is_cached, value = self._cached_remote_url
1312 if is_cached:
1313 return value
1314
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001315 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001316 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1317
Edward Lemur298f2cf2019-02-22 21:40:39 +00001318 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001319 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001320 if host:
1321 self._cached_remote_url = (True, url)
1322 return url
1323
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001324 # If it cannot be parsed as an url, assume it is a local directory,
1325 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001326 logging.warning('"%s" doesn\'t appear to point to a git host. '
1327 'Interpreting it as a local directory.', url)
1328 if not os.path.isdir(url):
1329 logging.error(
1330 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001331 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001332 return None
1333
1334 cache_path = url
1335 url = RunGit(['config', 'remote.%s.url' % remote],
1336 error_ok=True,
1337 cwd=url).strip()
1338
Edward Lemur79d4f992019-11-11 23:49:02 +00001339 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001340 if not host:
1341 logging.error(
1342 'Remote "%(remote)s" for branch "%(branch)s" points to '
1343 '"%(cache_path)s", but it is misconfigured.\n'
1344 '"%(cache_path)s" must be a git repo and must have a remote named '
1345 '"%(remote)s" pointing to the git host.', {
1346 'remote': remote,
1347 'cache_path': cache_path,
1348 'branch': self.GetBranch()})
1349 return None
1350
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001351 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001352 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001353
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001354 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001355 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001356 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001357 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001358 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001359 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001360 return self.issue
1361
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001362 def GetIssueURL(self):
1363 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001364 issue = self.GetIssue()
1365 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001366 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001367 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001368
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001369 def GetDescription(self, pretty=False, force=False):
1370 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001371 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001372 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001373 self.has_description = True
1374 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001375 # Set width to 72 columns + 2 space indent.
1376 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001377 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001378 lines = self.description.splitlines()
1379 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001380 return self.description
1381
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001382 def GetDescriptionFooters(self):
1383 """Returns (non_footer_lines, footers) for the commit message.
1384
1385 Returns:
1386 non_footer_lines (list(str)) - Simple list of description lines without
1387 any footer. The lines do not contain newlines, nor does the list contain
1388 the empty line between the message and the footers.
1389 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1390 [("Change-Id", "Ideadbeef...."), ...]
1391 """
1392 raw_description = self.GetDescription()
1393 msg_lines, _, footers = git_footers.split_footers(raw_description)
1394 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001395 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001396 return msg_lines, footers
1397
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001398 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001399 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001400 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001401 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001402 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001403 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001404 return self.patchset
1405
1406 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001407 """Set this branch's patchset. If patchset=0, clears the patchset."""
1408 assert self.GetBranch()
1409 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001410 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001411 else:
1412 self.patchset = int(patchset)
1413 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001414 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001416 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001417 """Set this branch's issue. If issue isn't given, clears the issue."""
1418 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001419 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001420 issue = int(issue)
1421 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001422 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001423 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001424 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001425 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001426 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001427 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001428 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001429 else:
tandrii5d48c322016-08-18 16:19:37 -07001430 # Reset all of these just to be clean.
1431 reset_suffixes = [
1432 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001433 self.IssueConfigKey(),
1434 self.PatchsetConfigKey(),
1435 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001436 ] + self._PostUnsetIssueProperties()
1437 for prop in reset_suffixes:
1438 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001439 msg = RunGit(['log', '-1', '--format=%B']).strip()
1440 if msg and git_footers.get_footer_change_id(msg):
1441 print('WARNING: The change patched into this branch has a Change-Id. '
1442 'Removing it.')
1443 RunGit(['commit', '--amend', '-m',
1444 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001445 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001446 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001447 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001448
dnjba1b0f32016-09-02 12:37:42 -07001449 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001450 if not self.GitSanityChecks(upstream_branch):
1451 DieWithError('\nGit sanity check failure')
1452
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001453 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001454 if not root:
1455 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001456 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001457
1458 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001459 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001460 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001461 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001462 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001463 except subprocess2.CalledProcessError:
1464 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001465 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001466 'This branch probably doesn\'t exist anymore. To reset the\n'
1467 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001468 ' git branch --set-upstream-to origin/master %s\n'
1469 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001470 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001471
maruel@chromium.org52424302012-08-29 15:14:30 +00001472 issue = self.GetIssue()
1473 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001474 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001475 description = self.GetDescription()
1476 else:
1477 # If the change was never uploaded, use the log messages of all commits
1478 # up to the branch point, as git cl upload will prefill the description
1479 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001480 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1481 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001482
1483 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001484 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001485 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001486 name,
1487 description,
1488 absroot,
1489 files,
1490 issue,
1491 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001492 author,
1493 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001494
dsansomee2d6fd92016-09-08 00:10:47 -07001495 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001496 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001497 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001498 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001499
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001500 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1501 """Sets the description for this CL remotely.
1502
1503 You can get description_lines and footers with GetDescriptionFooters.
1504
1505 Args:
1506 description_lines (list(str)) - List of CL description lines without
1507 newline characters.
1508 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1509 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1510 `List-Of-Tokens`). It will be case-normalized so that each token is
1511 title-cased.
1512 """
1513 new_description = '\n'.join(description_lines)
1514 if footers:
1515 new_description += '\n'
1516 for k, v in footers:
1517 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1518 if not git_footers.FOOTER_PATTERN.match(foot):
1519 raise ValueError('Invalid footer %r' % foot)
1520 new_description += foot + '\n'
1521 self.UpdateDescription(new_description, force)
1522
Edward Lesmes8e282792018-04-03 18:50:29 -04001523 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001524 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1525 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001526 start = time_time()
1527 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001528 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1529 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001530 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001531 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001532 metrics.collector.add_repeated('sub_commands', {
1533 'command': 'presubmit',
1534 'execution_time': time_time() - start,
1535 'exit_code': 0 if result.should_continue() else 1,
1536 })
1537 return result
vapierfd77ac72016-06-16 08:33:57 -07001538 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001539 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001540
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001541 def CMDUpload(self, options, git_diff_args, orig_args):
1542 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001543 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001544 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001545 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001546 else:
1547 if self.GetBranch() is None:
1548 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1549
1550 # Default to diffing against common ancestor of upstream branch
1551 base_branch = self.GetCommonAncestorWithUpstream()
1552 git_diff_args = [base_branch, 'HEAD']
1553
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001554 # Fast best-effort checks to abort before running potentially expensive
1555 # hooks if uploading is likely to fail anyway. Passing these checks does
1556 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001557 self.EnsureAuthenticated(force=options.force)
1558 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001559
1560 # Apply watchlists on upload.
1561 change = self.GetChange(base_branch, None)
1562 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1563 files = [f.LocalPath() for f in change.AffectedFiles()]
1564 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001565 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001566
1567 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001568 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001569 # Set the reviewer list now so that presubmit checks can access it.
1570 change_description = ChangeDescription(change.FullDescriptionText())
1571 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001572 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001573 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001574 change)
1575 change.SetDescriptionText(change_description.description)
1576 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001577 may_prompt=not options.force,
1578 verbose=options.verbose,
1579 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001580 if not hook_results.should_continue():
1581 return 1
1582 if not options.reviewers and hook_results.reviewers:
1583 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001584 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001585
Aaron Gable13101a62018-02-09 13:20:41 -08001586 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001587 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001588 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001589 _git_set_branch_config_value('last-upload-hash',
1590 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001591 # Run post upload hooks, if specified.
1592 if settings.GetRunPostUploadHook():
1593 presubmit_support.DoPostUploadExecuter(
1594 change,
1595 self,
1596 settings.GetRoot(),
1597 options.verbose,
1598 sys.stdout)
1599
1600 # Upload all dependencies if specified.
1601 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001602 print()
1603 print('--dependencies has been specified.')
1604 print('All dependent local branches will be re-uploaded.')
1605 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001606 # Remove the dependencies flag from args so that we do not end up in a
1607 # loop.
1608 orig_args.remove('--dependencies')
1609 ret = upload_branch_deps(self, orig_args)
1610 return ret
1611
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001612 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001613 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001614
1615 Issue must have been already uploaded and known.
1616 """
1617 assert new_state in _CQState.ALL_STATES
1618 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001619 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001620 vote_map = {
1621 _CQState.NONE: 0,
1622 _CQState.DRY_RUN: 1,
1623 _CQState.COMMIT: 2,
1624 }
1625 labels = {'Commit-Queue': vote_map[new_state]}
1626 notify = False if new_state == _CQState.DRY_RUN else None
1627 gerrit_util.SetReview(
1628 self._GetGerritHost(), self._GerritChangeIdentifier(),
1629 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001630 return 0
1631 except KeyboardInterrupt:
1632 raise
1633 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001634 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001635 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001636 ' * Your project has no CQ,\n'
1637 ' * You don\'t have permission to change the CQ state,\n'
1638 ' * There\'s a bug in this code (see stack trace below).\n'
1639 'Consider specifying which bots to trigger manually or asking your '
1640 'project owners for permissions or contacting Chrome Infra at:\n'
1641 'https://www.chromium.org/infra\n\n' %
1642 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001643 # Still raise exception so that stack trace is printed.
1644 raise
1645
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001646 def _GetGerritHost(self):
1647 # Lazy load of configs.
1648 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001649 if self._gerrit_host and '.' not in self._gerrit_host:
1650 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1651 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001652 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001653 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001654 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001655 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001656 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1657 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001658 return self._gerrit_host
1659
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001660 def _GetGitHost(self):
1661 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001662 remote_url = self.GetRemoteUrl()
1663 if not remote_url:
1664 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001665 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001666
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001667 def GetCodereviewServer(self):
1668 if not self._gerrit_server:
1669 # If we're on a branch then get the server potentially associated
1670 # with that branch.
1671 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001672 self._gerrit_server = self._GitGetBranchConfigValue(
1673 self.CodereviewServerConfigKey())
1674 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001675 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001676 if not self._gerrit_server:
1677 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1678 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001679 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001680 parts[0] = parts[0] + '-review'
1681 self._gerrit_host = '.'.join(parts)
1682 self._gerrit_server = 'https://%s' % self._gerrit_host
1683 return self._gerrit_server
1684
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001685 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001686 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001687 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001688 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001689 logging.warn('can\'t detect Gerrit project.')
1690 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001691 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001692 if project.endswith('.git'):
1693 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001694 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1695 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1696 # gitiles/git-over-https protocol. E.g.,
1697 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1698 # as
1699 # https://chromium.googlesource.com/v8/v8
1700 if project.startswith('a/'):
1701 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001702 return project
1703
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001704 def _GerritChangeIdentifier(self):
1705 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1706
1707 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001708 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001709 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001710 project = self._GetGerritProject()
1711 if project:
1712 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1713 # Fall back on still unique, but less efficient change number.
1714 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001715
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001716 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001717 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001718 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001719
tandrii5d48c322016-08-18 16:19:37 -07001720 @classmethod
1721 def PatchsetConfigKey(cls):
1722 return 'gerritpatchset'
1723
1724 @classmethod
1725 def CodereviewServerConfigKey(cls):
1726 return 'gerritserver'
1727
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001728 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001729 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001730 if settings.GetGerritSkipEnsureAuthenticated():
1731 # For projects with unusual authentication schemes.
1732 # See http://crbug.com/603378.
1733 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001734
1735 # Check presence of cookies only if using cookies-based auth method.
1736 cookie_auth = gerrit_util.Authenticator.get()
1737 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001738 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001739
Edward Lemur79d4f992019-11-11 23:49:02 +00001740 if urllib.parse.urlparse(self.GetRemoteUrl()).scheme != 'https':
Daniel Chengcf6269b2019-05-18 01:02:12 +00001741 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001742 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001743 return
1744
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001745 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001746 self.GetCodereviewServer()
1747 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001748 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001749
1750 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1751 git_auth = cookie_auth.get_auth_header(git_host)
1752 if gerrit_auth and git_auth:
1753 if gerrit_auth == git_auth:
1754 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001755 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001756 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001757 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001758 ' %s\n'
1759 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001760 ' Consider running the following command:\n'
1761 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001762 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001763 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001764 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001765 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001766 cookie_auth.get_new_password_message(git_host)))
1767 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001768 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001769 return
1770 else:
1771 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001772 ([] if gerrit_auth else [self._gerrit_host]) +
1773 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001774 DieWithError('Credentials for the following hosts are required:\n'
1775 ' %s\n'
1776 'These are read from %s (or legacy %s)\n'
1777 '%s' % (
1778 '\n '.join(missing),
1779 cookie_auth.get_gitcookies_path(),
1780 cookie_auth.get_netrc_path(),
1781 cookie_auth.get_new_password_message(git_host)))
1782
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001783 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001784 if not self.GetIssue():
1785 return
1786
1787 # Warm change details cache now to avoid RPCs later, reducing latency for
1788 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001789 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001790 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001791
1792 status = self._GetChangeDetail()['status']
1793 if status in ('MERGED', 'ABANDONED'):
1794 DieWithError('Change %s has been %s, new uploads are not allowed' %
1795 (self.GetIssueURL(),
1796 'submitted' if status == 'MERGED' else 'abandoned'))
1797
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001798 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1799 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1800 # Apparently this check is not very important? Otherwise get_auth_email
1801 # could have been added to other implementations of Authenticator.
1802 cookies_auth = gerrit_util.Authenticator.get()
1803 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001804 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001805
1806 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001807 if self.GetIssueOwner() == cookies_user:
1808 return
1809 logging.debug('change %s owner is %s, cookies user is %s',
1810 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001811 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001812 # so ask what Gerrit thinks of this user.
1813 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1814 if details['email'] == self.GetIssueOwner():
1815 return
1816 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001817 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001818 'as %s.\n'
1819 'Uploading may fail due to lack of permissions.' %
1820 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1821 confirm_or_exit(action='upload')
1822
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001823 def _PostUnsetIssueProperties(self):
1824 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001825 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001826
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001827 def GetGerritObjForPresubmit(self):
1828 return presubmit_support.GerritAccessor(self._GetGerritHost())
1829
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001830 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001831 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001832 or CQ status, assuming adherence to a common workflow.
1833
1834 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001835 * 'error' - error from review tool (including deleted issues)
1836 * 'unsent' - no reviewers added
1837 * 'waiting' - waiting for review
1838 * 'reply' - waiting for uploader to reply to review
1839 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001840 * 'dry-run' - dry-running in the CQ
1841 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001842 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001843 """
1844 if not self.GetIssue():
1845 return None
1846
1847 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001848 data = self._GetChangeDetail([
1849 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001850 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001851 return 'error'
1852
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001853 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001854 return 'closed'
1855
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001856 cq_label = data['labels'].get('Commit-Queue', {})
1857 max_cq_vote = 0
1858 for vote in cq_label.get('all', []):
1859 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1860 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001861 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001862 if max_cq_vote == 1:
1863 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001864
Aaron Gable9ab38c62017-04-06 14:36:33 -07001865 if data['labels'].get('Code-Review', {}).get('approved'):
1866 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001867
1868 if not data.get('reviewers', {}).get('REVIEWER', []):
1869 return 'unsent'
1870
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001871 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001872 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001873 last_message_author = messages.pop().get('author', {})
1874 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001875 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1876 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001877 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001878 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001879 if last_message_author.get('_account_id') == owner:
1880 # Most recent message was by owner.
1881 return 'waiting'
1882 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001883 # Some reply from non-owner.
1884 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001885
1886 # Somehow there are no messages even though there are reviewers.
1887 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001888
1889 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001890 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001891 patchset = data['revisions'][data['current_revision']]['_number']
1892 self.SetPatchset(patchset)
1893 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001894
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001895 def FetchDescription(self, force=False):
1896 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1897 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001898 current_rev = data['current_revision']
Edward Lemur79d4f992019-11-11 23:49:02 +00001899 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001900
dsansomee2d6fd92016-09-08 00:10:47 -07001901 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001902 if gerrit_util.HasPendingChangeEdit(
1903 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001904 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001905 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001906 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001907 'unpublished edit. Either publish the edit in the Gerrit web UI '
1908 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001909
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001910 gerrit_util.DeletePendingChangeEdit(
1911 self._GetGerritHost(), self._GerritChangeIdentifier())
1912 gerrit_util.SetCommitMessage(
1913 self._GetGerritHost(), self._GerritChangeIdentifier(),
1914 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915
Aaron Gable636b13f2017-07-14 10:42:48 -07001916 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001917 gerrit_util.SetReview(
1918 self._GetGerritHost(), self._GerritChangeIdentifier(),
1919 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001920
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001921 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001922 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001923 # CURRENT_REVISION is included to get the latest patchset so that
1924 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001925 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001926 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1927 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001928 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001929 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001930 robot_file_comments = gerrit_util.GetChangeRobotComments(
1931 self._GetGerritHost(), self._GerritChangeIdentifier())
1932
1933 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001934 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001935 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001936 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001937 line_comments = file_comments.setdefault(path, [])
1938 line_comments.extend(
1939 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001940
1941 # Build dictionary of file comments for easy access and sorting later.
1942 # {author+date: {path: {patchset: {line: url+message}}}}
1943 comments = collections.defaultdict(
1944 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001945 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001946 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001947 tag = comment.get('tag', '')
1948 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001949 continue
1950 key = (comment['author']['email'], comment['updated'])
1951 if comment.get('side', 'REVISION') == 'PARENT':
1952 patchset = 'Base'
1953 else:
1954 patchset = 'PS%d' % comment['patch_set']
1955 line = comment.get('line', 0)
1956 url = ('https://%s/c/%s/%s/%s#%s%s' %
1957 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1958 'b' if comment.get('side') == 'PARENT' else '',
1959 str(line) if line else ''))
1960 comments[key][path][patchset][line] = (url, comment['message'])
1961
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001962 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001963 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001964 summary = self._BuildCommentSummary(msg, comments, readable)
1965 if summary:
1966 summaries.append(summary)
1967 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001968
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001969 @staticmethod
1970 def _BuildCommentSummary(msg, comments, readable):
1971 key = (msg['author']['email'], msg['date'])
1972 # Don't bother showing autogenerated messages that don't have associated
1973 # file or line comments. this will filter out most autogenerated
1974 # messages, but will keep robot comments like those from Tricium.
1975 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1976 if is_autogenerated and not comments.get(key):
1977 return None
1978 message = msg['message']
1979 # Gerrit spits out nanoseconds.
1980 assert len(msg['date'].split('.')[-1]) == 9
1981 date = datetime.datetime.strptime(msg['date'][:-3],
1982 '%Y-%m-%d %H:%M:%S.%f')
1983 if key in comments:
1984 message += '\n'
1985 for path, patchsets in sorted(comments.get(key, {}).items()):
1986 if readable:
1987 message += '\n%s' % path
1988 for patchset, lines in sorted(patchsets.items()):
1989 for line, (url, content) in sorted(lines.items()):
1990 if line:
1991 line_str = 'Line %d' % line
1992 path_str = '%s:%d:' % (path, line)
1993 else:
1994 line_str = 'File comment'
1995 path_str = '%s:0:' % path
1996 if readable:
1997 message += '\n %s, %s: %s' % (patchset, line_str, url)
1998 message += '\n %s\n' % content
1999 else:
2000 message += '\n%s ' % path_str
2001 message += '\n%s\n' % content
2002
2003 return _CommentSummary(
2004 date=date,
2005 message=message,
2006 sender=msg['author']['email'],
2007 autogenerated=is_autogenerated,
2008 # These could be inferred from the text messages and correlated with
2009 # Code-Review label maximum, however this is not reliable.
2010 # Leaving as is until the need arises.
2011 approval=False,
2012 disapproval=False,
2013 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002014
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002015 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002016 gerrit_util.AbandonChange(
2017 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002018
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002019 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002020 gerrit_util.SubmitChange(
2021 self._GetGerritHost(), self._GerritChangeIdentifier(),
2022 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002023
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002024 def _GetChangeDetail(self, options=None, no_cache=False):
2025 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002026
2027 If fresh data is needed, set no_cache=True which will clear cache and
2028 thus new data will be fetched from Gerrit.
2029 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002030 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002031 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002032
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002033 # Optimization to avoid multiple RPCs:
2034 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2035 'CURRENT_COMMIT' not in options):
2036 options.append('CURRENT_COMMIT')
2037
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002038 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002039 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002040 options = [o.upper() for o in options]
2041
2042 # Check in cache first unless no_cache is True.
2043 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002044 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002045 else:
2046 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002047 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002048 # Assumption: data fetched before with extra options is suitable
2049 # for return for a smaller set of options.
2050 # For example, if we cached data for
2051 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2052 # and request is for options=[CURRENT_REVISION],
2053 # THEN we can return prior cached data.
2054 if options_set.issubset(cached_options_set):
2055 return data
2056
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002057 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002058 data = gerrit_util.GetChangeDetail(
2059 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002060 except gerrit_util.GerritError as e:
2061 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002062 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002063 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002064
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002065 self._detail_cache.setdefault(cache_key, []).append(
2066 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002067 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002068
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002069 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002070 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002071 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002072 data = gerrit_util.GetChangeCommit(
2073 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002074 except gerrit_util.GerritError as e:
2075 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002076 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002077 raise
agable32978d92016-11-01 12:55:02 -07002078 return data
2079
Karen Qian40c19422019-03-13 21:28:29 +00002080 def _IsCqConfigured(self):
2081 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002082 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002083 return False
2084 # TODO(crbug/753213): Remove temporary hack
2085 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002086 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002087 detail['branch'].startswith('refs/branch-heads/')):
2088 return False
2089 return True
2090
Olivier Robin75ee7252018-04-13 10:02:56 +02002091 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002092 if git_common.is_dirty_git_tree('land'):
2093 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002094
tandriid60367b2016-06-22 05:25:12 -07002095 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002096 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002097 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002098 'which can test and land changes for you. '
2099 'Are you sure you wish to bypass it?\n',
2100 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002101 differs = True
tandriic4344b52016-08-29 06:04:54 -07002102 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002103 # Note: git diff outputs nothing if there is no diff.
2104 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002105 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002106 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002107 if detail['current_revision'] == last_upload:
2108 differs = False
2109 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002110 print('WARNING: Local branch contents differ from latest uploaded '
2111 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002112 if differs:
2113 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002114 confirm_or_exit(
2115 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2116 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002117 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002118 elif not bypass_hooks:
2119 hook_results = self.RunHook(
2120 committing=True,
2121 may_prompt=not force,
2122 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002123 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2124 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002125 if not hook_results.should_continue():
2126 return 1
2127
2128 self.SubmitIssue(wait_for_merge=True)
2129 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002130 links = self._GetChangeCommit().get('web_links', [])
2131 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002132 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002133 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002134 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002135 return 0
2136
Edward Lemurf38bc172019-09-03 21:02:13 +00002137 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002138 assert parsed_issue_arg.valid
2139
Edward Lemur125d60a2019-09-13 18:25:41 +00002140 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141
2142 if parsed_issue_arg.hostname:
2143 self._gerrit_host = parsed_issue_arg.hostname
2144 self._gerrit_server = 'https://%s' % self._gerrit_host
2145
tandriic2405f52016-10-10 08:13:15 -07002146 try:
2147 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002148 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002149 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002150
2151 if not parsed_issue_arg.patchset:
2152 # Use current revision by default.
2153 revision_info = detail['revisions'][detail['current_revision']]
2154 patchset = int(revision_info['_number'])
2155 else:
2156 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002157 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2159 break
2160 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002161 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002162 (parsed_issue_arg.patchset, self.GetIssue()))
2163
Edward Lemur125d60a2019-09-13 18:25:41 +00002164 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002165 if remote_url.endswith('.git'):
2166 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002167 remote_url = remote_url.rstrip('/')
2168
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002169 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002170 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002171
2172 if remote_url != fetch_info['url']:
2173 DieWithError('Trying to patch a change from %s but this repo appears '
2174 'to be %s.' % (fetch_info['url'], remote_url))
2175
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002177
Aaron Gable62619a32017-06-16 08:22:09 -07002178 if force:
2179 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2180 print('Checked out commit for change %i patchset %i locally' %
2181 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002182 elif nocommit:
2183 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2184 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002185 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002186 RunGit(['cherry-pick', 'FETCH_HEAD'])
2187 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002188 (parsed_issue_arg.issue, patchset))
2189 print('Note: this created a local commit which does not have '
2190 'the same hash as the one uploaded for review. This will make '
2191 'uploading changes based on top of this branch difficult.\n'
2192 'If you want to do that, use "git cl patch --force" instead.')
2193
Stefan Zagerd08043c2017-10-12 12:07:02 -07002194 if self.GetBranch():
2195 self.SetIssue(parsed_issue_arg.issue)
2196 self.SetPatchset(patchset)
2197 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2198 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2199 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2200 else:
2201 print('WARNING: You are in detached HEAD state.\n'
2202 'The patch has been applied to your checkout, but you will not be '
2203 'able to upload a new patch set to the gerrit issue.\n'
2204 'Try using the \'-b\' option if you would like to work on a '
2205 'branch and/or upload a new patch set.')
2206
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002207 return 0
2208
tandrii16e0b4e2016-06-07 10:34:28 -07002209 def _GerritCommitMsgHookCheck(self, offer_removal):
2210 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2211 if not os.path.exists(hook):
2212 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002213 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2214 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002215 data = gclient_utils.FileRead(hook)
2216 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2217 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002218 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002219 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002220 'and may interfere with it in subtle ways.\n'
2221 'We recommend you remove the commit-msg hook.')
2222 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002223 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002224 gclient_utils.rm_file_or_tree(hook)
2225 print('Gerrit commit-msg hook removed.')
2226 else:
2227 print('OK, will keep Gerrit commit-msg hook in place.')
2228
Edward Lemur1b52d872019-05-09 21:12:12 +00002229 def _CleanUpOldTraces(self):
2230 """Keep only the last |MAX_TRACES| traces."""
2231 try:
2232 traces = sorted([
2233 os.path.join(TRACES_DIR, f)
2234 for f in os.listdir(TRACES_DIR)
2235 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2236 and not f.startswith('tmp'))
2237 ])
2238 traces_to_delete = traces[:-MAX_TRACES]
2239 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002240 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002241 except OSError:
2242 print('WARNING: Failed to remove old git traces from\n'
2243 ' %s'
2244 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002245
Edward Lemur5737f022019-05-17 01:24:00 +00002246 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002247 """Zip and write the git push traces stored in traces_dir."""
2248 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002249 traces_zip = trace_name + '-traces'
2250 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002251 # Create a temporary dir to store git config and gitcookies in. It will be
2252 # compressed and stored next to the traces.
2253 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002254 git_info_zip = trace_name + '-git-info'
2255
Edward Lemur5737f022019-05-17 01:24:00 +00002256 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002257 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002258 git_push_metadata['now'] = git_push_metadata['now'].decode(
2259 sys.stdin.encoding)
2260
Edward Lemur1b52d872019-05-09 21:12:12 +00002261 git_push_metadata['trace_name'] = trace_name
2262 gclient_utils.FileWrite(
2263 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2264
2265 # Keep only the first 6 characters of the git hashes on the packet
2266 # trace. This greatly decreases size after compression.
2267 packet_traces = os.path.join(traces_dir, 'trace-packet')
2268 if os.path.isfile(packet_traces):
2269 contents = gclient_utils.FileRead(packet_traces)
2270 gclient_utils.FileWrite(
2271 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2272 shutil.make_archive(traces_zip, 'zip', traces_dir)
2273
2274 # Collect and compress the git config and gitcookies.
2275 git_config = RunGit(['config', '-l'])
2276 gclient_utils.FileWrite(
2277 os.path.join(git_info_dir, 'git-config'),
2278 git_config)
2279
2280 cookie_auth = gerrit_util.Authenticator.get()
2281 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2282 gitcookies_path = cookie_auth.get_gitcookies_path()
2283 if os.path.isfile(gitcookies_path):
2284 gitcookies = gclient_utils.FileRead(gitcookies_path)
2285 gclient_utils.FileWrite(
2286 os.path.join(git_info_dir, 'gitcookies'),
2287 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2288 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2289
Edward Lemur1b52d872019-05-09 21:12:12 +00002290 gclient_utils.rmtree(git_info_dir)
2291
2292 def _RunGitPushWithTraces(
2293 self, change_desc, refspec, refspec_opts, git_push_metadata):
2294 """Run git push and collect the traces resulting from the execution."""
2295 # Create a temporary directory to store traces in. Traces will be compressed
2296 # and stored in a 'traces' dir inside depot_tools.
2297 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002298 trace_name = os.path.join(
2299 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002300
2301 env = os.environ.copy()
2302 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2303 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002304 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002305 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2306 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2307 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2308
2309 try:
2310 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002311 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002312 before_push = time_time()
2313 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002314 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002315 env=env,
2316 print_stdout=True,
2317 # Flush after every line: useful for seeing progress when running as
2318 # recipe.
2319 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002320 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002321 except subprocess2.CalledProcessError as e:
2322 push_returncode = e.returncode
2323 DieWithError('Failed to create a change. Please examine output above '
2324 'for the reason of the failure.\n'
2325 'Hint: run command below to diagnose common Git/Gerrit '
2326 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002327 ' git cl creds-check\n'
2328 '\n'
2329 'If git-cl is not working correctly, file a bug under the '
2330 'Infra>SDK component including the files below.\n'
2331 'Review the files before upload, since they might contain '
2332 'sensitive information.\n'
2333 'Set the Restrict-View-Google label so that they are not '
2334 'publicly accessible.\n'
2335 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002336 change_desc)
2337 finally:
2338 execution_time = time_time() - before_push
2339 metrics.collector.add_repeated('sub_commands', {
2340 'command': 'git push',
2341 'execution_time': execution_time,
2342 'exit_code': push_returncode,
2343 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2344 })
2345
Edward Lemur1b52d872019-05-09 21:12:12 +00002346 git_push_metadata['execution_time'] = execution_time
2347 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002348 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002349
Edward Lemur1b52d872019-05-09 21:12:12 +00002350 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002351 gclient_utils.rmtree(traces_dir)
2352
2353 return push_stdout
2354
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002355 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002356 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002357 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002358 # Load default for user, repo, squash=true, in this order.
2359 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002360
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002361 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002362 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002363 # This may be None; default fallback value is determined in logic below.
2364 title = options.title
2365
Dominic Battre7d1c4842017-10-27 09:17:28 +02002366 # Extract bug number from branch name.
2367 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002368 fixed = options.fixed
2369 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2370 self.GetBranch())
2371 if not bug and not fixed and match:
2372 if match.group('type') == 'bug':
2373 bug = match.group('bugnum')
2374 else:
2375 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002376
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002377 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002378 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 if self.GetIssue():
2380 # Try to get the message from a previous upload.
2381 message = self.GetDescription()
2382 if not message:
2383 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002384 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002385 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002386 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002387 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002388 # When uploading a subsequent patchset, -m|--message is taken
2389 # as the patchset title if --title was not provided.
2390 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002391 else:
2392 default_title = RunGit(
2393 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002394 if options.force:
2395 title = default_title
2396 else:
2397 title = ask_for_data(
2398 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002399 change_id = self._GetChangeDetail()['change_id']
2400 while True:
2401 footer_change_ids = git_footers.get_footer_change_id(message)
2402 if footer_change_ids == [change_id]:
2403 break
2404 if not footer_change_ids:
2405 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002406 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002407 continue
2408 # There is already a valid footer but with different or several ids.
2409 # Doing this automatically is non-trivial as we don't want to lose
2410 # existing other footers, yet we want to append just 1 desired
2411 # Change-Id. Thus, just create a new footer, but let user verify the
2412 # new description.
2413 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002414 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002415 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002416 print(
2417 'WARNING: change %s has Change-Id footer(s):\n'
2418 ' %s\n'
2419 'but change has Change-Id %s, according to Gerrit.\n'
2420 'Please, check the proposed correction to the description, '
2421 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2422 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2423 change_id))
2424 confirm_or_exit(action='edit')
2425 change_desc.prompt()
2426
2427 message = change_desc.description
2428 if not message:
2429 DieWithError("Description is empty. Aborting...")
2430
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002431 # Continue the while loop.
2432 # Sanity check of this code - we should end up with proper message
2433 # footer.
2434 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002435 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002436 else: # if not self.GetIssue()
2437 if options.message:
2438 message = options.message
2439 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002440 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002441 if options.title:
2442 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002443 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002444 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002445 change_desc.prompt()
2446
Aaron Gableb56ad332017-01-06 15:24:31 -08002447 # On first upload, patchset title is always this string, while
2448 # --title flag gets converted to first line of message.
2449 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002450 if not change_desc.description:
2451 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002452 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002453 if len(change_ids) > 1:
2454 DieWithError('too many Change-Id footers, at most 1 allowed.')
2455 if not change_ids:
2456 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002457 change_desc.set_description(git_footers.add_footer_change_id(
2458 change_desc.description,
2459 GenerateGerritChangeId(change_desc.description)))
2460 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002461 assert len(change_ids) == 1
2462 change_id = change_ids[0]
2463
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002464 if options.reviewers or options.tbrs or options.add_owners_to:
2465 change_desc.update_reviewers(options.reviewers, options.tbrs,
2466 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002467 if options.preserve_tryjobs:
2468 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002469
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002470 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002471 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2472 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002473 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lesmesf6a22322019-11-04 22:14:39 +00002474 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
Edward Lemur79d4f992019-11-11 23:49:02 +00002475 desc_tempfile.write(change_desc.description.encode('utf-8', 'replace'))
Aaron Gable9a03ae02017-11-03 11:31:07 -07002476 desc_tempfile.close()
2477 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2478 '-F', desc_tempfile.name]).strip()
2479 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002480 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002481 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002482 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002483 if not change_desc.description:
2484 DieWithError("Description is empty. Aborting...")
2485
2486 if not git_footers.get_footer_change_id(change_desc.description):
2487 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002488 change_desc.set_description(
2489 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002490 if options.reviewers or options.tbrs or options.add_owners_to:
2491 change_desc.update_reviewers(options.reviewers, options.tbrs,
2492 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002493 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002494 # For no-squash mode, we assume the remote called "origin" is the one we
2495 # want. It is not worthwhile to support different workflows for
2496 # no-squash mode.
2497 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002498 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2499
2500 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002501 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002502 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2503 ref_to_push)]).splitlines()
2504 if len(commits) > 1:
2505 print('WARNING: This will upload %d commits. Run the following command '
2506 'to see which commits will be uploaded: ' % len(commits))
2507 print('git log %s..%s' % (parent, ref_to_push))
2508 print('You can also use `git squash-branch` to squash these into a '
2509 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002510 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002511
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002512 if options.reviewers or options.tbrs or options.add_owners_to:
2513 change_desc.update_reviewers(options.reviewers, options.tbrs,
2514 options.add_owners_to, change)
2515
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002516 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002517 cc = []
2518 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2519 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2520 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002521 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002522 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002523 if options.cc:
2524 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002525 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002526 if change_desc.get_cced():
2527 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002528 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2529 valid_accounts = set(reviewers + cc)
2530 # TODO(crbug/877717): relax this for all hosts.
2531 else:
2532 valid_accounts = gerrit_util.ValidAccounts(
2533 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002534 logging.info('accounts %s are recognized, %s invalid',
2535 sorted(valid_accounts),
2536 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002537
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002538 # Extra options that can be specified at push time. Doc:
2539 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002540 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002541
Aaron Gable844cf292017-06-28 11:32:59 -07002542 # By default, new changes are started in WIP mode, and subsequent patchsets
2543 # don't send email. At any time, passing --send-mail will mark the change
2544 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002545 if options.send_mail:
2546 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002547 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002548 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002549 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002550 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002551 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002552
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002553 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002554 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002555
Aaron Gable9b713dd2016-12-14 16:04:21 -08002556 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002557 # Punctuation and whitespace in |title| must be percent-encoded.
2558 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002559
agablec6787972016-09-09 16:13:34 -07002560 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002561 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002562
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002563 for r in sorted(reviewers):
2564 if r in valid_accounts:
2565 refspec_opts.append('r=%s' % r)
2566 reviewers.remove(r)
2567 else:
2568 # TODO(tandrii): this should probably be a hard failure.
2569 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2570 % r)
2571 for c in sorted(cc):
2572 # refspec option will be rejected if cc doesn't correspond to an
2573 # account, even though REST call to add such arbitrary cc may succeed.
2574 if c in valid_accounts:
2575 refspec_opts.append('cc=%s' % c)
2576 cc.remove(c)
2577
rmistry9eadede2016-09-19 11:22:43 -07002578 if options.topic:
2579 # Documentation on Gerrit topics is here:
2580 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002581 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002582
Edward Lemur687ca902018-12-05 02:30:30 +00002583 if options.enable_auto_submit:
2584 refspec_opts.append('l=Auto-Submit+1')
2585 if options.use_commit_queue:
2586 refspec_opts.append('l=Commit-Queue+2')
2587 elif options.cq_dry_run:
2588 refspec_opts.append('l=Commit-Queue+1')
2589
2590 if change_desc.get_reviewers(tbr_only=True):
2591 score = gerrit_util.GetCodeReviewTbrScore(
2592 self._GetGerritHost(),
2593 self._GetGerritProject())
2594 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002595
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002596 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002597 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002598 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002599 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002600 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2601
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002602 refspec_suffix = ''
2603 if refspec_opts:
2604 refspec_suffix = '%' + ','.join(refspec_opts)
2605 assert ' ' not in refspec_suffix, (
2606 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2607 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2608
Edward Lemur1b52d872019-05-09 21:12:12 +00002609 git_push_metadata = {
2610 'gerrit_host': self._GetGerritHost(),
2611 'title': title or '<untitled>',
2612 'change_id': change_id,
2613 'description': change_desc.description,
2614 }
2615 push_stdout = self._RunGitPushWithTraces(
2616 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002617
2618 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002619 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002620 change_numbers = [m.group(1)
2621 for m in map(regex.match, push_stdout.splitlines())
2622 if m]
2623 if len(change_numbers) != 1:
2624 DieWithError(
2625 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002626 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002627 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002628 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002629
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002630 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002631 # GetIssue() is not set in case of non-squash uploads according to tests.
2632 # TODO(agable): non-squash uploads in git cl should be removed.
2633 gerrit_util.AddReviewers(
2634 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002635 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002636 reviewers, cc,
2637 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002638
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002639 return 0
2640
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002641 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2642 change_desc):
2643 """Computes parent of the generated commit to be uploaded to Gerrit.
2644
2645 Returns revision or a ref name.
2646 """
2647 if custom_cl_base:
2648 # Try to avoid creating additional unintended CLs when uploading, unless
2649 # user wants to take this risk.
2650 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2651 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2652 local_ref_of_target_remote])
2653 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002654 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002655 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2656 'If you proceed with upload, more than 1 CL may be created by '
2657 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2658 'If you are certain that specified base `%s` has already been '
2659 'uploaded to Gerrit as another CL, you may proceed.\n' %
2660 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2661 if not force:
2662 confirm_or_exit(
2663 'Do you take responsibility for cleaning up potential mess '
2664 'resulting from proceeding with upload?',
2665 action='upload')
2666 return custom_cl_base
2667
Aaron Gablef97e33d2017-03-30 15:44:27 -07002668 if remote != '.':
2669 return self.GetCommonAncestorWithUpstream()
2670
2671 # If our upstream branch is local, we base our squashed commit on its
2672 # squashed version.
2673 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2674
Aaron Gablef97e33d2017-03-30 15:44:27 -07002675 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002676 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002677
2678 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002679 # TODO(tandrii): consider checking parent change in Gerrit and using its
2680 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2681 # the tree hash of the parent branch. The upside is less likely bogus
2682 # requests to reupload parent change just because it's uploadhash is
2683 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002684 parent = RunGit(['config',
2685 'branch.%s.gerritsquashhash' % upstream_branch_name],
2686 error_ok=True).strip()
2687 # Verify that the upstream branch has been uploaded too, otherwise
2688 # Gerrit will create additional CLs when uploading.
2689 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2690 RunGitSilent(['rev-parse', parent + ':'])):
2691 DieWithError(
2692 '\nUpload upstream branch %s first.\n'
2693 'It is likely that this branch has been rebased since its last '
2694 'upload, so you just need to upload it again.\n'
2695 '(If you uploaded it with --no-squash, then branch dependencies '
2696 'are not supported, and you should reupload with --squash.)'
2697 % upstream_branch_name,
2698 change_desc)
2699 return parent
2700
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002701 def _AddChangeIdToCommitMessage(self, options, args):
2702 """Re-commits using the current message, assumes the commit hook is in
2703 place.
2704 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002705 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002706 git_command = ['commit', '--amend', '-m', log_desc]
2707 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002708 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002709 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002710 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002711 return new_log_desc
2712 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002713 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002714
tandriie113dfd2016-10-11 10:20:12 -07002715 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002716 try:
2717 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002718 except GerritChangeNotExists:
2719 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002720
2721 if data['status'] in ('ABANDONED', 'MERGED'):
2722 return 'CL %s is closed' % self.GetIssue()
2723
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002724 def GetGerritChange(self, patchset=None):
2725 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002726 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002727 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002728 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002729 data = self._GetChangeDetail(['ALL_REVISIONS'])
2730
2731 assert host and issue and patchset, 'CL must be uploaded first'
2732
2733 has_patchset = any(
2734 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002735 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002736 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002737 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002738 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002739
tandrii8c5a3532016-11-04 07:52:02 -07002740 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002741 'host': host,
2742 'change': issue,
2743 'project': data['project'],
2744 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002745 }
tandriie113dfd2016-10-11 10:20:12 -07002746
tandriide281ae2016-10-12 06:02:30 -07002747 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002748 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002749
Edward Lemur707d70b2018-02-07 00:50:14 +01002750 def GetReviewers(self):
2751 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002752 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002753
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002754
2755_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002756 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002757}
2758
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002759
iannuccie53c9352016-08-17 14:40:40 -07002760def _add_codereview_issue_select_options(parser, extra=""):
2761 _add_codereview_select_options(parser)
2762
2763 text = ('Operate on this issue number instead of the current branch\'s '
2764 'implicit issue.')
2765 if extra:
2766 text += ' '+extra
2767 parser.add_option('-i', '--issue', type=int, help=text)
2768
2769
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002770def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002771 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002772 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002773 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002774 parser.add_option_group(parser.codereview_group)
2775 parser.codereview_group.add_option(
2776 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002777 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002778
2779
tandriif9aefb72016-07-01 09:06:51 -07002780def _get_bug_line_values(default_project, bugs):
2781 """Given default_project and comma separated list of bugs, yields bug line
2782 values.
2783
2784 Each bug can be either:
2785 * a number, which is combined with default_project
2786 * string, which is left as is.
2787
2788 This function may produce more than one line, because bugdroid expects one
2789 project per line.
2790
2791 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2792 ['v8:123', 'chromium:789']
2793 """
2794 default_bugs = []
2795 others = []
2796 for bug in bugs.split(','):
2797 bug = bug.strip()
2798 if bug:
2799 try:
2800 default_bugs.append(int(bug))
2801 except ValueError:
2802 others.append(bug)
2803
2804 if default_bugs:
2805 default_bugs = ','.join(map(str, default_bugs))
2806 if default_project:
2807 yield '%s:%s' % (default_project, default_bugs)
2808 else:
2809 yield default_bugs
2810 for other in sorted(others):
2811 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2812 yield other
2813
2814
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002815class ChangeDescription(object):
2816 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002817 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002818 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002819 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002820 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002821 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002822 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2823 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2824 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2825 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002826
Dan Beamd8b04ca2019-10-10 21:23:26 +00002827 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002828 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002829 if bug:
2830 regexp = re.compile(self.BUG_LINE)
2831 prefix = settings.GetBugPrefix()
2832 if not any((regexp.match(line) for line in self._description_lines)):
2833 values = list(_get_bug_line_values(prefix, bug))
2834 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002835 if fixed:
2836 regexp = re.compile(self.FIXED_LINE)
2837 prefix = settings.GetBugPrefix()
2838 if not any((regexp.match(line) for line in self._description_lines)):
2839 values = list(_get_bug_line_values(prefix, fixed))
2840 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002841
agable@chromium.org42c20792013-09-12 17:34:49 +00002842 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002843 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002844 return '\n'.join(self._description_lines)
2845
2846 def set_description(self, desc):
2847 if isinstance(desc, basestring):
2848 lines = desc.splitlines()
2849 else:
2850 lines = [line.rstrip() for line in desc]
2851 while lines and not lines[0]:
2852 lines.pop(0)
2853 while lines and not lines[-1]:
2854 lines.pop(-1)
2855 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002856
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002857 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2858 """Rewrites the R=/TBR= line(s) as a single line each.
2859
2860 Args:
2861 reviewers (list(str)) - list of additional emails to use for reviewers.
2862 tbrs (list(str)) - list of additional emails to use for TBRs.
2863 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2864 the change that are missing OWNER coverage. If this is not None, you
2865 must also pass a value for `change`.
2866 change (Change) - The Change that should be used for OWNERS lookups.
2867 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002868 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002869 assert isinstance(tbrs, list), tbrs
2870
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002871 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002872 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002873
2874 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002875 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002876
2877 reviewers = set(reviewers)
2878 tbrs = set(tbrs)
2879 LOOKUP = {
2880 'TBR': tbrs,
2881 'R': reviewers,
2882 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002883
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002884 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002885 regexp = re.compile(self.R_LINE)
2886 matches = [regexp.match(line) for line in self._description_lines]
2887 new_desc = [l for i, l in enumerate(self._description_lines)
2888 if not matches[i]]
2889 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002890
agable@chromium.org42c20792013-09-12 17:34:49 +00002891 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002892
2893 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002894 for match in matches:
2895 if not match:
2896 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002897 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2898
2899 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002900 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002901 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002902 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002903 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002904 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002905 LOOKUP[add_owners_to].update(
2906 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002907
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002908 # If any folks ended up in both groups, remove them from tbrs.
2909 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002910
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002911 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2912 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002913
2914 # Put the new lines in the description where the old first R= line was.
2915 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2916 if 0 <= line_loc < len(self._description_lines):
2917 if new_tbr_line:
2918 self._description_lines.insert(line_loc, new_tbr_line)
2919 if new_r_line:
2920 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002921 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002922 if new_r_line:
2923 self.append_footer(new_r_line)
2924 if new_tbr_line:
2925 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002926
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002927 def set_preserve_tryjobs(self):
2928 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2929 footers = git_footers.parse_footers(self.description)
2930 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2931 if v.lower() == 'true':
2932 return
2933 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2934
Anthony Polito8b955342019-09-24 19:01:36 +00002935 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002936 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002937 self.set_description([
2938 '# Enter a description of the change.',
2939 '# This will be displayed on the codereview site.',
2940 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002941 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002942 '--------------------',
2943 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002944 bug_regexp = re.compile(self.BUG_LINE)
2945 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002946 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002947 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2948 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002949 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002950
agable@chromium.org42c20792013-09-12 17:34:49 +00002951 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002952 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002953 if not content:
2954 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002955 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002956
Bruce Dawson2377b012018-01-11 16:46:49 -08002957 # Strip off comments and default inserted "Bug:" line.
2958 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002959 (line.startswith('#') or
2960 line.rstrip() == "Bug:" or
2961 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002962 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002963 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002964 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002965
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002966 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002967 """Adds a footer line to the description.
2968
2969 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2970 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2971 that Gerrit footers are always at the end.
2972 """
2973 parsed_footer_line = git_footers.parse_footer(line)
2974 if parsed_footer_line:
2975 # Line is a gerrit footer in the form: Footer-Key: any value.
2976 # Thus, must be appended observing Gerrit footer rules.
2977 self.set_description(
2978 git_footers.add_footer(self.description,
2979 key=parsed_footer_line[0],
2980 value=parsed_footer_line[1]))
2981 return
2982
2983 if not self._description_lines:
2984 self._description_lines.append(line)
2985 return
2986
2987 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2988 if gerrit_footers:
2989 # git_footers.split_footers ensures that there is an empty line before
2990 # actual (gerrit) footers, if any. We have to keep it that way.
2991 assert top_lines and top_lines[-1] == ''
2992 top_lines, separator = top_lines[:-1], top_lines[-1:]
2993 else:
2994 separator = [] # No need for separator if there are no gerrit_footers.
2995
2996 prev_line = top_lines[-1] if top_lines else ''
2997 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2998 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2999 top_lines.append('')
3000 top_lines.append(line)
3001 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003002
tandrii99a72f22016-08-17 14:33:24 -07003003 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003004 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003005 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003006 reviewers = [match.group(2).strip()
3007 for match in matches
3008 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003009 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003010
bradnelsond975b302016-10-23 12:20:23 -07003011 def get_cced(self):
3012 """Retrieves the list of reviewers."""
3013 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3014 cced = [match.group(2).strip() for match in matches if match]
3015 return cleanup_list(cced)
3016
Nodir Turakulov23b82142017-11-16 11:04:25 -08003017 def get_hash_tags(self):
3018 """Extracts and sanitizes a list of Gerrit hashtags."""
3019 subject = (self._description_lines or ('',))[0]
3020 subject = re.sub(
3021 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3022
3023 tags = []
3024 start = 0
3025 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3026 while True:
3027 m = bracket_exp.match(subject, start)
3028 if not m:
3029 break
3030 tags.append(self.sanitize_hash_tag(m.group(1)))
3031 start = m.end()
3032
3033 if not tags:
3034 # Try "Tag: " prefix.
3035 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3036 if m:
3037 tags.append(self.sanitize_hash_tag(m.group(1)))
3038 return tags
3039
3040 @classmethod
3041 def sanitize_hash_tag(cls, tag):
3042 """Returns a sanitized Gerrit hash tag.
3043
3044 A sanitized hashtag can be used as a git push refspec parameter value.
3045 """
3046 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3047
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003048 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3049 """Updates this commit description given the parent.
3050
3051 This is essentially what Gnumbd used to do.
3052 Consult https://goo.gl/WMmpDe for more details.
3053 """
3054 assert parent_msg # No, orphan branch creation isn't supported.
3055 assert parent_hash
3056 assert dest_ref
3057 parent_footer_map = git_footers.parse_footers(parent_msg)
3058 # This will also happily parse svn-position, which GnumbD is no longer
3059 # supporting. While we'd generate correct footers, the verifier plugin
3060 # installed in Gerrit will block such commit (ie git push below will fail).
3061 parent_position = git_footers.get_position(parent_footer_map)
3062
3063 # Cherry-picks may have last line obscuring their prior footers,
3064 # from git_footers perspective. This is also what Gnumbd did.
3065 cp_line = None
3066 if (self._description_lines and
3067 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3068 cp_line = self._description_lines.pop()
3069
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003070 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003071
3072 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3073 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003074 for i, line in enumerate(footer_lines):
3075 k, v = git_footers.parse_footer(line) or (None, None)
3076 if k and k.startswith('Cr-'):
3077 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003078
3079 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003080 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003081 if parent_position[0] == dest_ref:
3082 # Same branch as parent.
3083 number = int(parent_position[1]) + 1
3084 else:
3085 number = 1 # New branch, and extra lineage.
3086 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3087 int(parent_position[1])))
3088
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003089 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3090 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003091
3092 self._description_lines = top_lines
3093 if cp_line:
3094 self._description_lines.append(cp_line)
3095 if self._description_lines[-1] != '':
3096 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003097 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003098
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003099
Aaron Gablea1bab272017-04-11 16:38:18 -07003100def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003101 """Retrieves the reviewers that approved a CL from the issue properties with
3102 messages.
3103
3104 Note that the list may contain reviewers that are not committer, thus are not
3105 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003106
3107 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003108 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003109 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003110 return sorted(
3111 set(
3112 message['sender']
3113 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003114 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003115 )
3116 )
3117
3118
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003119def FindCodereviewSettingsFile(filename='codereview.settings'):
3120 """Finds the given file starting in the cwd and going up.
3121
3122 Only looks up to the top of the repository unless an
3123 'inherit-review-settings-ok' file exists in the root of the repository.
3124 """
3125 inherit_ok_file = 'inherit-review-settings-ok'
3126 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003127 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003128 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3129 root = '/'
3130 while True:
3131 if filename in os.listdir(cwd):
3132 if os.path.isfile(os.path.join(cwd, filename)):
3133 return open(os.path.join(cwd, filename))
3134 if cwd == root:
3135 break
3136 cwd = os.path.dirname(cwd)
3137
3138
3139def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003140 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003141 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003142
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003143 def SetProperty(name, setting, unset_error_ok=False):
3144 fullname = 'rietveld.' + name
3145 if setting in keyvals:
3146 RunGit(['config', fullname, keyvals[setting]])
3147 else:
3148 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3149
tandrii48df5812016-10-17 03:55:37 -07003150 if not keyvals.get('GERRIT_HOST', False):
3151 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003152 # Only server setting is required. Other settings can be absent.
3153 # In that case, we ignore errors raised during option deletion attempt.
3154 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3155 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3156 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003157 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003158 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3159 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003160 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3161 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003162 SetProperty(
3163 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003164
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003165 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003166 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003167
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003168 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003169 RunGit(['config', 'gerrit.squash-uploads',
3170 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003171
tandrii@chromium.org28253532016-04-14 13:46:56 +00003172 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003173 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003174 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3175
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003176 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003177 # should be of the form
3178 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3179 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003180 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3181 keyvals['ORIGIN_URL_CONFIG']])
3182
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003183
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003184def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003185 """Downloads a network object to a local file, like urllib.urlretrieve.
3186
3187 This is necessary because urllib is broken for SSL connections via a proxy.
3188 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003189 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003190 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003191
3192
ukai@chromium.org712d6102013-11-27 00:52:58 +00003193def hasSheBang(fname):
3194 """Checks fname is a #! script."""
3195 with open(fname) as f:
3196 return f.read(2).startswith('#!')
3197
3198
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003199# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3200def DownloadHooks(*args, **kwargs):
3201 pass
3202
3203
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003204def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003205 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003206
3207 Args:
3208 force: True to update hooks. False to install hooks if not present.
3209 """
3210 if not settings.GetIsGerrit():
3211 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003212 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003213 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3214 if not os.access(dst, os.X_OK):
3215 if os.path.exists(dst):
3216 if not force:
3217 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003218 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003219 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003220 if not hasSheBang(dst):
3221 DieWithError('Not a script: %s\n'
3222 'You need to download from\n%s\n'
3223 'into .git/hooks/commit-msg and '
3224 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003225 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3226 except Exception:
3227 if os.path.exists(dst):
3228 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003229 DieWithError('\nFailed to download hooks.\n'
3230 'You need to download from\n%s\n'
3231 'into .git/hooks/commit-msg and '
3232 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003233
3234
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003235class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003236 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003237
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003238 _GOOGLESOURCE = 'googlesource.com'
3239
3240 def __init__(self):
3241 # Cached list of [host, identity, source], where source is either
3242 # .gitcookies or .netrc.
3243 self._all_hosts = None
3244
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003245 def ensure_configured_gitcookies(self):
3246 """Runs checks and suggests fixes to make git use .gitcookies from default
3247 path."""
3248 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3249 configured_path = RunGitSilent(
3250 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003251 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003252 if configured_path:
3253 self._ensure_default_gitcookies_path(configured_path, default)
3254 else:
3255 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003256
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003257 @staticmethod
3258 def _ensure_default_gitcookies_path(configured_path, default_path):
3259 assert configured_path
3260 if configured_path == default_path:
3261 print('git is already configured to use your .gitcookies from %s' %
3262 configured_path)
3263 return
3264
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003265 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003266 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3267 (configured_path, default_path))
3268
3269 if not os.path.exists(configured_path):
3270 print('However, your configured .gitcookies file is missing.')
3271 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3272 action='reconfigure')
3273 RunGit(['config', '--global', 'http.cookiefile', default_path])
3274 return
3275
3276 if os.path.exists(default_path):
3277 print('WARNING: default .gitcookies file already exists %s' %
3278 default_path)
3279 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3280 default_path)
3281
3282 confirm_or_exit('Move existing .gitcookies to default location?',
3283 action='move')
3284 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003285 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003286 print('Moved and reconfigured git to use .gitcookies from %s' %
3287 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003288
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003289 @staticmethod
3290 def _configure_gitcookies_path(default_path):
3291 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3292 if os.path.exists(netrc_path):
3293 print('You seem to be using outdated .netrc for git credentials: %s' %
3294 netrc_path)
3295 print('This tool will guide you through setting up recommended '
3296 '.gitcookies store for git credentials.\n'
3297 '\n'
3298 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3299 ' git config --global --unset http.cookiefile\n'
3300 ' mv %s %s.backup\n\n' % (default_path, default_path))
3301 confirm_or_exit(action='setup .gitcookies')
3302 RunGit(['config', '--global', 'http.cookiefile', default_path])
3303 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003304
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003305 def get_hosts_with_creds(self, include_netrc=False):
3306 if self._all_hosts is None:
3307 a = gerrit_util.CookiesAuthenticator()
3308 self._all_hosts = [
3309 (h, u, s)
3310 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003311 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3312 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003313 )
3314 if h.endswith(self._GOOGLESOURCE)
3315 ]
3316
3317 if include_netrc:
3318 return self._all_hosts
3319 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3320
3321 def print_current_creds(self, include_netrc=False):
3322 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3323 if not hosts:
3324 print('No Git/Gerrit credentials found')
3325 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003326 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003327 header = [('Host', 'User', 'Which file'),
3328 ['=' * l for l in lengths]]
3329 for row in (header + hosts):
3330 print('\t'.join((('%%+%ds' % l) % s)
3331 for l, s in zip(lengths, row)))
3332
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003333 @staticmethod
3334 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003335 """Parses identity "git-<username>.domain" into <username> and domain."""
3336 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003337 # distinguishable from sub-domains. But we do know typical domains:
3338 if identity.endswith('.chromium.org'):
3339 domain = 'chromium.org'
3340 username = identity[:-len('.chromium.org')]
3341 else:
3342 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003343 if username.startswith('git-'):
3344 username = username[len('git-'):]
3345 return username, domain
3346
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003347 def _canonical_git_googlesource_host(self, host):
3348 """Normalizes Gerrit hosts (with '-review') to Git host."""
3349 assert host.endswith(self._GOOGLESOURCE)
3350 # Prefix doesn't include '.' at the end.
3351 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3352 if prefix.endswith('-review'):
3353 prefix = prefix[:-len('-review')]
3354 return prefix + '.' + self._GOOGLESOURCE
3355
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003356 def _canonical_gerrit_googlesource_host(self, host):
3357 git_host = self._canonical_git_googlesource_host(host)
3358 prefix = git_host.split('.', 1)[0]
3359 return prefix + '-review.' + self._GOOGLESOURCE
3360
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003361 def _get_counterpart_host(self, host):
3362 assert host.endswith(self._GOOGLESOURCE)
3363 git = self._canonical_git_googlesource_host(host)
3364 gerrit = self._canonical_gerrit_googlesource_host(git)
3365 return git if gerrit == host else gerrit
3366
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003367 def has_generic_host(self):
3368 """Returns whether generic .googlesource.com has been configured.
3369
3370 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3371 """
3372 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3373 if host == '.' + self._GOOGLESOURCE:
3374 return True
3375 return False
3376
3377 def _get_git_gerrit_identity_pairs(self):
3378 """Returns map from canonic host to pair of identities (Git, Gerrit).
3379
3380 One of identities might be None, meaning not configured.
3381 """
3382 host_to_identity_pairs = {}
3383 for host, identity, _ in self.get_hosts_with_creds():
3384 canonical = self._canonical_git_googlesource_host(host)
3385 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3386 idx = 0 if canonical == host else 1
3387 pair[idx] = identity
3388 return host_to_identity_pairs
3389
3390 def get_partially_configured_hosts(self):
3391 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003392 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003393 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003394 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003395
3396 def get_conflicting_hosts(self):
3397 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003398 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003399 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003400 if None not in (i1, i2) and i1 != i2)
3401
3402 def get_duplicated_hosts(self):
3403 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003404 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003405
3406 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3407 'chromium.googlesource.com': 'chromium.org',
3408 'chrome-internal.googlesource.com': 'google.com',
3409 }
3410
3411 def get_hosts_with_wrong_identities(self):
3412 """Finds hosts which **likely** reference wrong identities.
3413
3414 Note: skips hosts which have conflicting identities for Git and Gerrit.
3415 """
3416 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003417 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003418 pair = self._get_git_gerrit_identity_pairs().get(host)
3419 if pair and pair[0] == pair[1]:
3420 _, domain = self._parse_identity(pair[0])
3421 if domain != expected:
3422 hosts.add(host)
3423 return hosts
3424
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003425 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003426 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003427 hosts = sorted(hosts)
3428 assert hosts
3429 if extra_column_func is None:
3430 extras = [''] * len(hosts)
3431 else:
3432 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003433 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3434 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003435 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003436 lines.append(tmpl % he)
3437 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003438
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003439 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003440 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003441 yield ('.googlesource.com wildcard record detected',
3442 ['Chrome Infrastructure team recommends to list full host names '
3443 'explicitly.'],
3444 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003445
3446 dups = self.get_duplicated_hosts()
3447 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003448 yield ('The following hosts were defined twice',
3449 self._format_hosts(dups),
3450 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003451
3452 partial = self.get_partially_configured_hosts()
3453 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003454 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3455 'These hosts are missing',
3456 self._format_hosts(partial, lambda host: 'but %s defined' %
3457 self._get_counterpart_host(host)),
3458 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003459
3460 conflicting = self.get_conflicting_hosts()
3461 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003462 yield ('The following Git hosts have differing credentials from their '
3463 'Gerrit counterparts',
3464 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3465 tuple(self._get_git_gerrit_identity_pairs()[host])),
3466 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003467
3468 wrong = self.get_hosts_with_wrong_identities()
3469 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003470 yield ('These hosts likely use wrong identity',
3471 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3472 (self._get_git_gerrit_identity_pairs()[host][0],
3473 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3474 wrong)
3475
3476 def find_and_report_problems(self):
3477 """Returns True if there was at least one problem, else False."""
3478 found = False
3479 bad_hosts = set()
3480 for title, sublines, hosts in self._find_problems():
3481 if not found:
3482 found = True
3483 print('\n\n.gitcookies problem report:\n')
3484 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003485 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003486 if sublines:
3487 print()
3488 print(' %s' % '\n '.join(sublines))
3489 print()
3490
3491 if bad_hosts:
3492 assert found
3493 print(' You can manually remove corresponding lines in your %s file and '
3494 'visit the following URLs with correct account to generate '
3495 'correct credential lines:\n' %
3496 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3497 print(' %s' % '\n '.join(sorted(set(
3498 gerrit_util.CookiesAuthenticator().get_new_password_url(
3499 self._canonical_git_googlesource_host(host))
3500 for host in bad_hosts
3501 ))))
3502 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003503
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003504
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003505@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003506def CMDcreds_check(parser, args):
3507 """Checks credentials and suggests changes."""
3508 _, _ = parser.parse_args(args)
3509
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003510 # Code below checks .gitcookies. Abort if using something else.
3511 authn = gerrit_util.Authenticator.get()
3512 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3513 if isinstance(authn, gerrit_util.GceAuthenticator):
3514 DieWithError(
3515 'This command is not designed for GCE, are you on a bot?\n'
3516 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3517 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003518 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003519 'This command is not designed for bot environment. It checks '
3520 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003521
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003522 checker = _GitCookiesChecker()
3523 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003524
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003525 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003526 checker.print_current_creds(include_netrc=True)
3527
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003528 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003529 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003530 return 0
3531 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003532
3533
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003534@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003535def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003536 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003537 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3538 branch = ShortBranchName(branchref)
3539 _, args = parser.parse_args(args)
3540 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003541 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003542 return RunGit(['config', 'branch.%s.base-url' % branch],
3543 error_ok=False).strip()
3544 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003545 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003546 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3547 error_ok=False).strip()
3548
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003549
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003550def color_for_status(status):
3551 """Maps a Changelist status to color, for CMDstatus and other tools."""
3552 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003553 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003554 'waiting': Fore.BLUE,
3555 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003556 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003557 'lgtm': Fore.GREEN,
3558 'commit': Fore.MAGENTA,
3559 'closed': Fore.CYAN,
3560 'error': Fore.WHITE,
3561 }.get(status, Fore.WHITE)
3562
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003563
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003564def get_cl_statuses(changes, fine_grained, max_processes=None):
3565 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003566
3567 If fine_grained is true, this will fetch CL statuses from the server.
3568 Otherwise, simply indicate if there's a matching url for the given branches.
3569
3570 If max_processes is specified, it is used as the maximum number of processes
3571 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3572 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003573
3574 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003575 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003576 if not changes:
3577 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003578
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003579 if not fine_grained:
3580 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003581 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003582 for cl in changes:
3583 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003584 return
3585
3586 # First, sort out authentication issues.
3587 logging.debug('ensuring credentials exist')
3588 for cl in changes:
3589 cl.EnsureAuthenticated(force=False, refresh=True)
3590
3591 def fetch(cl):
3592 try:
3593 return (cl, cl.GetStatus())
3594 except:
3595 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003596 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003597 raise
3598
3599 threads_count = len(changes)
3600 if max_processes:
3601 threads_count = max(1, min(threads_count, max_processes))
3602 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3603
3604 pool = ThreadPool(threads_count)
3605 fetched_cls = set()
3606 try:
3607 it = pool.imap_unordered(fetch, changes).__iter__()
3608 while True:
3609 try:
3610 cl, status = it.next(timeout=5)
3611 except multiprocessing.TimeoutError:
3612 break
3613 fetched_cls.add(cl)
3614 yield cl, status
3615 finally:
3616 pool.close()
3617
3618 # Add any branches that failed to fetch.
3619 for cl in set(changes) - fetched_cls:
3620 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003621
rmistry@google.com2dd99862015-06-22 12:22:18 +00003622
3623def upload_branch_deps(cl, args):
3624 """Uploads CLs of local branches that are dependents of the current branch.
3625
3626 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003627
3628 test1 -> test2.1 -> test3.1
3629 -> test3.2
3630 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003631
3632 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3633 run on the dependent branches in this order:
3634 test2.1, test3.1, test3.2, test2.2, test3.3
3635
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003636 Note: This function does not rebase your local dependent branches. Use it
3637 when you make a change to the parent branch that will not conflict
3638 with its dependent branches, and you would like their dependencies
3639 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003640 """
3641 if git_common.is_dirty_git_tree('upload-branch-deps'):
3642 return 1
3643
3644 root_branch = cl.GetBranch()
3645 if root_branch is None:
3646 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3647 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003648 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003649 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3650 'patchset dependencies without an uploaded CL.')
3651
3652 branches = RunGit(['for-each-ref',
3653 '--format=%(refname:short) %(upstream:short)',
3654 'refs/heads'])
3655 if not branches:
3656 print('No local branches found.')
3657 return 0
3658
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003659 # Create a dictionary of all local branches to the branches that are
3660 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003661 tracked_to_dependents = collections.defaultdict(list)
3662 for b in branches.splitlines():
3663 tokens = b.split()
3664 if len(tokens) == 2:
3665 branch_name, tracked = tokens
3666 tracked_to_dependents[tracked].append(branch_name)
3667
vapiera7fbd5a2016-06-16 09:17:49 -07003668 print()
3669 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003670 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003671
rmistry@google.com2dd99862015-06-22 12:22:18 +00003672 def traverse_dependents_preorder(branch, padding=''):
3673 dependents_to_process = tracked_to_dependents.get(branch, [])
3674 padding += ' '
3675 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003676 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003677 dependents.append(dependent)
3678 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003679
rmistry@google.com2dd99862015-06-22 12:22:18 +00003680 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003681 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003682
3683 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003684 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003685 return 0
3686
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003687 confirm_or_exit('This command will checkout all dependent branches and run '
3688 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003689
rmistry@google.com2dd99862015-06-22 12:22:18 +00003690 # Record all dependents that failed to upload.
3691 failures = {}
3692 # Go through all dependents, checkout the branch and upload.
3693 try:
3694 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003695 print()
3696 print('--------------------------------------')
3697 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003698 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003699 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003700 try:
3701 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003702 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003703 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003704 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003705 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003706 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003707 finally:
3708 # Swap back to the original root branch.
3709 RunGit(['checkout', '-q', root_branch])
3710
vapiera7fbd5a2016-06-16 09:17:49 -07003711 print()
3712 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003713 for dependent_branch in dependents:
3714 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003715 print(' %s : %s' % (dependent_branch, upload_status))
3716 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003717
3718 return 0
3719
3720
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003721@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003722def CMDarchive(parser, args):
3723 """Archives and deletes branches associated with closed changelists."""
3724 parser.add_option(
3725 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003726 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003727 parser.add_option(
3728 '-f', '--force', action='store_true',
3729 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003730 parser.add_option(
3731 '-d', '--dry-run', action='store_true',
3732 help='Skip the branch tagging and removal steps.')
3733 parser.add_option(
3734 '-t', '--notags', action='store_true',
3735 help='Do not tag archived branches. '
3736 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003737
kmarshall3bff56b2016-06-06 18:31:47 -07003738 options, args = parser.parse_args(args)
3739 if args:
3740 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003741
3742 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3743 if not branches:
3744 return 0
3745
vapiera7fbd5a2016-06-16 09:17:49 -07003746 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003747 changes = [Changelist(branchref=b)
3748 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003749 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3750 statuses = get_cl_statuses(changes,
3751 fine_grained=True,
3752 max_processes=options.maxjobs)
3753 proposal = [(cl.GetBranch(),
3754 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3755 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003756 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003757 proposal.sort()
3758
3759 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003760 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003761 return 0
3762
3763 current_branch = GetCurrentBranch()
3764
vapiera7fbd5a2016-06-16 09:17:49 -07003765 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003766 if options.notags:
3767 for next_item in proposal:
3768 print(' ' + next_item[0])
3769 else:
3770 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3771 for next_item in proposal:
3772 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003773
kmarshall9249e012016-08-23 12:02:16 -07003774 # Quit now on precondition failure or if instructed by the user, either
3775 # via an interactive prompt or by command line flags.
3776 if options.dry_run:
3777 print('\nNo changes were made (dry run).\n')
3778 return 0
3779 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003780 print('You are currently on a branch \'%s\' which is associated with a '
3781 'closed codereview issue, so archive cannot proceed. Please '
3782 'checkout another branch and run this command again.' %
3783 current_branch)
3784 return 1
kmarshall9249e012016-08-23 12:02:16 -07003785 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003786 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3787 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003788 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003789 return 1
3790
3791 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003792 if not options.notags:
3793 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003794 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003795
vapiera7fbd5a2016-06-16 09:17:49 -07003796 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003797
3798 return 0
3799
3800
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003801@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003802def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003803 """Show status of changelists.
3804
3805 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003806 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003807 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003808 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003809 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003810 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003811 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003812 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003813
3814 Also see 'git cl comments'.
3815 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003816 parser.add_option(
3817 '--no-branch-color',
3818 action='store_true',
3819 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003820 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003821 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003822 parser.add_option('-f', '--fast', action='store_true',
3823 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003824 parser.add_option(
3825 '-j', '--maxjobs', action='store', type=int,
3826 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003827
iannuccie53c9352016-08-17 14:40:40 -07003828 _add_codereview_issue_select_options(
3829 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003830 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003831 if args:
3832 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003833
iannuccie53c9352016-08-17 14:40:40 -07003834 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003835 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003836
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003837 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003838 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003839 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003840 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003841 elif options.field == 'id':
3842 issueid = cl.GetIssue()
3843 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003844 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003845 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003846 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003847 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003848 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003849 elif options.field == 'status':
3850 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003851 elif options.field == 'url':
3852 url = cl.GetIssueURL()
3853 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003854 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003855 return 0
3856
3857 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3858 if not branches:
3859 print('No local branch found.')
3860 return 0
3861
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003862 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003863 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003864 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003865 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003866 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003867 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003868 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003869
Daniel McArdlea23bf592019-02-12 00:25:12 +00003870 current_branch = GetCurrentBranch()
3871
3872 def FormatBranchName(branch, colorize=False):
3873 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3874 an asterisk when it is the current branch."""
3875
3876 asterisk = ""
3877 color = Fore.RESET
3878 if branch == current_branch:
3879 asterisk = "* "
3880 color = Fore.GREEN
3881 branch_name = ShortBranchName(branch)
3882
3883 if colorize:
3884 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003885 return asterisk + branch_name
3886
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003887 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003888
3889 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003890 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3891 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003892 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003893 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003894 branch_statuses[c.GetBranch()] = status
3895 status = branch_statuses.pop(branch)
3896 url = cl.GetIssueURL()
3897 if url and (not status or status == 'error'):
3898 # The issue probably doesn't exist anymore.
3899 url += ' (broken)'
3900
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003901 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003902 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003903 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003904 color = ''
3905 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003906 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003907
Alan Cuttera3be9a52019-03-04 18:50:33 +00003908 branch_display = FormatBranchName(branch)
3909 padding = ' ' * (alignment - len(branch_display))
3910 if not options.no_branch_color:
3911 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003912
Alan Cuttera3be9a52019-03-04 18:50:33 +00003913 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3914 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003915
vapiera7fbd5a2016-06-16 09:17:49 -07003916 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003917 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003918 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003919 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003920 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003921 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003922 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003923 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003924 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003925 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003926 print('Issue description:')
3927 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003928 return 0
3929
3930
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003931def colorize_CMDstatus_doc():
3932 """To be called once in main() to add colors to git cl status help."""
3933 colors = [i for i in dir(Fore) if i[0].isupper()]
3934
3935 def colorize_line(line):
3936 for color in colors:
3937 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003938 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003939 indent = len(line) - len(line.lstrip(' ')) + 1
3940 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3941 return line
3942
3943 lines = CMDstatus.__doc__.splitlines()
3944 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3945
3946
phajdan.jre328cf92016-08-22 04:12:17 -07003947def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003948 if path == '-':
3949 json.dump(contents, sys.stdout)
3950 else:
3951 with open(path, 'w') as f:
3952 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003953
3954
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003955@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003956@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003957def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003958 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003959
3960 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003961 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003962 parser.add_option('-r', '--reverse', action='store_true',
3963 help='Lookup the branch(es) for the specified issues. If '
3964 'no issues are specified, all branches with mapped '
3965 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003966 parser.add_option('--json',
3967 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003968 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003969 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003970
dnj@chromium.org406c4402015-03-03 17:22:28 +00003971 if options.reverse:
3972 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003973 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003974 # Reverse issue lookup.
3975 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003976
3977 git_config = {}
3978 for config in RunGit(['config', '--get-regexp',
3979 r'branch\..*issue']).splitlines():
3980 name, _space, val = config.partition(' ')
3981 git_config[name] = val
3982
dnj@chromium.org406c4402015-03-03 17:22:28 +00003983 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003984 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3985 config_key = _git_branch_config_key(ShortBranchName(branch),
3986 cls.IssueConfigKey())
3987 issue = git_config.get(config_key)
3988 if issue:
3989 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003990 if not args:
3991 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003992 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003993 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003994 try:
3995 issue_num = int(issue)
3996 except ValueError:
3997 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003998 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003999 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004000 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004001 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004002 if options.json:
4003 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004004 return 0
4005
4006 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004007 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004008 if not issue.valid:
4009 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4010 'or no argument to list it.\n'
4011 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004012 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004013 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004014 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004015 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004016 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4017 if options.json:
4018 write_json(options.json, {
4019 'issue': cl.GetIssue(),
4020 'issue_url': cl.GetIssueURL(),
4021 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004022 return 0
4023
4024
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004025@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004026def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004027 """Shows or posts review comments for any changelist."""
4028 parser.add_option('-a', '--add-comment', dest='comment',
4029 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004030 parser.add_option('-p', '--publish', action='store_true',
4031 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004032 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004033 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004034 parser.add_option('-m', '--machine-readable', dest='readable',
4035 action='store_false', default=True,
4036 help='output comments in a format compatible with '
4037 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004038 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004039 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004040 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004041 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004042
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004043 issue = None
4044 if options.issue:
4045 try:
4046 issue = int(options.issue)
4047 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004048 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004049
Edward Lemur934836a2019-09-09 20:16:54 +00004050 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004051
4052 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004053 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004054 return 0
4055
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004056 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4057 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004058 for comment in summary:
4059 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004060 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004061 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004062 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004063 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004064 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004065 elif comment.autogenerated:
4066 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004067 else:
4068 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004069 print('\n%s%s %s%s\n%s' % (
4070 color,
4071 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4072 comment.sender,
4073 Fore.RESET,
4074 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4075
smut@google.comc85ac942015-09-15 16:34:43 +00004076 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004077 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004078 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004079 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4080 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004081 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004082 return 0
4083
4084
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004085@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004086@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004087def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004088 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004089 parser.add_option('-d', '--display', action='store_true',
4090 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004091 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004092 help='New description to set for this issue (- for stdin, '
4093 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004094 parser.add_option('-f', '--force', action='store_true',
4095 help='Delete any unpublished Gerrit edits for this issue '
4096 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004097
4098 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004099 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004100
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004101 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004102 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004103 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004104 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004105 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004106
Edward Lemur934836a2019-09-09 20:16:54 +00004107 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004108 if target_issue_arg:
4109 kwargs['issue'] = target_issue_arg.issue
4110 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004111
4112 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004113 if not cl.GetIssue():
4114 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004115
Edward Lemur678a6842019-10-03 22:25:05 +00004116 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004117 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004118
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004119 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004120
smut@google.com34fb6b12015-07-13 20:03:26 +00004121 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004122 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004123 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004124
4125 if options.new_description:
4126 text = options.new_description
4127 if text == '-':
4128 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004129 elif text == '+':
4130 base_branch = cl.GetCommonAncestorWithUpstream()
4131 change = cl.GetChange(base_branch, None, local_description=True)
4132 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004133
4134 description.set_description(text)
4135 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004136 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004137 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004138 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004139 return 0
4140
4141
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004142@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004143def CMDlint(parser, args):
4144 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004145 parser.add_option('--filter', action='append', metavar='-x,+y',
4146 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004147 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004148
4149 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004150 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004151 try:
4152 import cpplint
4153 import cpplint_chromium
4154 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004155 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004156 return 1
4157
4158 # Change the current working directory before calling lint so that it
4159 # shows the correct base.
4160 previous_cwd = os.getcwd()
4161 os.chdir(settings.GetRoot())
4162 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004163 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004164 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4165 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004166 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004167 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004168 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004169
4170 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004171 command = args + files
4172 if options.filter:
4173 command = ['--filter=' + ','.join(options.filter)] + command
4174 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004175
4176 white_regex = re.compile(settings.GetLintRegex())
4177 black_regex = re.compile(settings.GetLintIgnoreRegex())
4178 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4179 for filename in filenames:
4180 if white_regex.match(filename):
4181 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004182 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004183 else:
4184 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4185 extra_check_functions)
4186 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004187 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004188 finally:
4189 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004190 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004191 if cpplint._cpplint_state.error_count != 0:
4192 return 1
4193 return 0
4194
4195
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004196@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004197def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004198 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004199 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004200 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004201 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004202 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004203 parser.add_option('--all', action='store_true',
4204 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004205 parser.add_option('--parallel', action='store_true',
4206 help='Run all tests specified by input_api.RunTests in all '
4207 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004208 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004209
sbc@chromium.org71437c02015-04-09 19:29:40 +00004210 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004211 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004212 return 1
4213
Edward Lemur934836a2019-09-09 20:16:54 +00004214 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004215 if args:
4216 base_branch = args[0]
4217 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004218 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004219 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004220
Aaron Gable8076c282017-11-29 14:39:41 -08004221 if options.all:
4222 base_change = cl.GetChange(base_branch, None)
4223 files = [('M', f) for f in base_change.AllFiles()]
4224 change = presubmit_support.GitChange(
4225 base_change.Name(),
4226 base_change.FullDescriptionText(),
4227 base_change.RepositoryRoot(),
4228 files,
4229 base_change.issue,
4230 base_change.patchset,
4231 base_change.author_email,
4232 base_change._upstream)
4233 else:
4234 change = cl.GetChange(base_branch, None)
4235
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004236 cl.RunHook(
4237 committing=not options.upload,
4238 may_prompt=False,
4239 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004240 change=change,
4241 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004242 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004243
4244
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004245def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004246 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004247
4248 Works the same way as
4249 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4250 but can be called on demand on all platforms.
4251
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004252 The basic idea is to generate git hash of a state of the tree, original
4253 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004254 """
4255 lines = []
4256 tree_hash = RunGitSilent(['write-tree'])
4257 lines.append('tree %s' % tree_hash.strip())
4258 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4259 if code == 0:
4260 lines.append('parent %s' % parent.strip())
4261 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4262 lines.append('author %s' % author.strip())
4263 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4264 lines.append('committer %s' % committer.strip())
4265 lines.append('')
4266 # Note: Gerrit's commit-hook actually cleans message of some lines and
4267 # whitespace. This code is not doing this, but it clearly won't decrease
4268 # entropy.
4269 lines.append(message)
4270 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004271 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004272 return 'I%s' % change_hash.strip()
4273
4274
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004275def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004276 """Computes the remote branch ref to use for the CL.
4277
4278 Args:
4279 remote (str): The git remote for the CL.
4280 remote_branch (str): The git remote branch for the CL.
4281 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004282 """
4283 if not (remote and remote_branch):
4284 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004285
wittman@chromium.org455dc922015-01-26 20:15:50 +00004286 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004287 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004288 # refs, which are then translated into the remote full symbolic refs
4289 # below.
4290 if '/' not in target_branch:
4291 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4292 else:
4293 prefix_replacements = (
4294 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4295 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4296 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4297 )
4298 match = None
4299 for regex, replacement in prefix_replacements:
4300 match = re.search(regex, target_branch)
4301 if match:
4302 remote_branch = target_branch.replace(match.group(0), replacement)
4303 break
4304 if not match:
4305 # This is a branch path but not one we recognize; use as-is.
4306 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004307 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4308 # Handle the refs that need to land in different refs.
4309 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004310
wittman@chromium.org455dc922015-01-26 20:15:50 +00004311 # Create the true path to the remote branch.
4312 # Does the following translation:
4313 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4314 # * refs/remotes/origin/master -> refs/heads/master
4315 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4316 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4317 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4318 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4319 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4320 'refs/heads/')
4321 elif remote_branch.startswith('refs/remotes/branch-heads'):
4322 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004323
wittman@chromium.org455dc922015-01-26 20:15:50 +00004324 return remote_branch
4325
4326
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004327def cleanup_list(l):
4328 """Fixes a list so that comma separated items are put as individual items.
4329
4330 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4331 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4332 """
4333 items = sum((i.split(',') for i in l), [])
4334 stripped_items = (i.strip() for i in items)
4335 return sorted(filter(None, stripped_items))
4336
4337
Aaron Gable4db38df2017-11-03 14:59:07 -07004338@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004339@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004340def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004341 """Uploads the current changelist to codereview.
4342
4343 Can skip dependency patchset uploads for a branch by running:
4344 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004345 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004346 git config --unset branch.branch_name.skip-deps-uploads
4347 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004348
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004349 If the name of the checked out branch starts with "bug-" or "fix-" followed
4350 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004351 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004352
4353 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004354 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004355 [git-cl] add support for hashtags
4356 Foo bar: implement foo
4357 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004358 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004359 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4360 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004361 parser.add_option('--bypass-watchlists', action='store_true',
4362 dest='bypass_watchlists',
4363 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004364 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004365 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004366 parser.add_option('--message', '-m', dest='message',
4367 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004368 parser.add_option('-b', '--bug',
4369 help='pre-populate the bug number(s) for this issue. '
4370 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004371 parser.add_option('--message-file', dest='message_file',
4372 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004373 parser.add_option('--title', '-t', dest='title',
4374 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004375 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004376 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004377 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004378 parser.add_option('--tbrs',
4379 action='append', default=[],
4380 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004381 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004382 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004383 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004384 parser.add_option('--hashtag', dest='hashtags',
4385 action='append', default=[],
4386 help=('Gerrit hashtag for new CL; '
4387 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004388 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004389 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004390 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004391 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004392 metavar='TARGET',
4393 help='Apply CL to remote ref TARGET. ' +
4394 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004395 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004396 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004397 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004398 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004399 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004400 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004401 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4402 const='TBR', help='add a set of OWNERS to TBR')
4403 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4404 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004405 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004406 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004407 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004408 'implies --send-mail')
4409 parser.add_option('-d', '--cq-dry-run',
4410 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004411 help='Send the patchset to do a CQ dry run right after '
4412 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004413 parser.add_option('--preserve-tryjobs', action='store_true',
4414 help='instruct the CQ to let tryjobs running even after '
4415 'new patchsets are uploaded instead of canceling '
4416 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004417 parser.add_option('--dependencies', action='store_true',
4418 help='Uploads CLs of all the local branches that depend on '
4419 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004420 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4421 help='Sends your change to the CQ after an approval. Only '
4422 'works on repos that have the Auto-Submit label '
4423 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004424 parser.add_option('--parallel', action='store_true',
4425 help='Run all tests specified by input_api.RunTests in all '
4426 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004427 parser.add_option('--no-autocc', action='store_true',
4428 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004429 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004430 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004431 parser.add_option('-R', '--retry-failed', action='store_true',
4432 help='Retry failed tryjobs from old patchset immediately '
4433 'after uploading new patchset. Cannot be used with '
4434 '--use-commit-queue or --cq-dry-run.')
4435 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4436 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004437 parser.add_option('--fixed', '-x',
4438 help='List of bugs that will be commented on and marked '
4439 'fixed (pre-populates "Fixed:" tag). Same format as '
4440 '-b option / "Bug:" tag. If fixing several issues, '
4441 'separate with commas.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004442
rmistry@google.com2dd99862015-06-22 12:22:18 +00004443 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004444 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004445 (options, args) = parser.parse_args(args)
4446
sbc@chromium.org71437c02015-04-09 19:29:40 +00004447 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004448 return 1
4449
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004450 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004451 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004452 options.cc = cleanup_list(options.cc)
4453
tandriib80458a2016-06-23 12:20:07 -07004454 if options.message_file:
4455 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004456 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004457 options.message = gclient_utils.FileRead(options.message_file)
4458 options.message_file = None
4459
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004460 if ([options.cq_dry_run,
4461 options.use_commit_queue,
4462 options.retry_failed].count(True) > 1):
4463 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4464 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004465
Aaron Gableedbc4132017-09-11 13:22:28 -07004466 if options.use_commit_queue:
4467 options.send_mail = True
4468
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004469 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4470 settings.GetIsGerrit()
4471
Edward Lemur934836a2019-09-09 20:16:54 +00004472 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004473 if options.retry_failed and not cl.GetIssue():
4474 print('No previous patchsets, so --retry-failed has no effect.')
4475 options.retry_failed = False
4476 # cl.GetMostRecentPatchset uses cached information, and can return the last
4477 # patchset before upload. Calling it here makes it clear that it's the
4478 # last patchset before upload. Note that GetMostRecentPatchset will fail
4479 # if no CL has been uploaded yet.
4480 if options.retry_failed:
4481 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004482
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004483 ret = cl.CMDUpload(options, args, orig_args)
4484
4485 if options.retry_failed:
4486 if ret != 0:
4487 print('Upload failed, so --retry-failed has no effect.')
4488 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004489 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004490 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004491 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004492 if len(buckets) == 0:
4493 print('No failed tryjobs, so --retry-failed has no effect.')
4494 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004495 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004496
4497 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004498
4499
Francois Dorayd42c6812017-05-30 15:10:20 -04004500@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004501@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004502def CMDsplit(parser, args):
4503 """Splits a branch into smaller branches and uploads CLs.
4504
4505 Creates a branch and uploads a CL for each group of files modified in the
4506 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004507 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004508 the shared OWNERS file.
4509 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004510 parser.add_option('-d', '--description', dest='description_file',
4511 help='A text file containing a CL description in which '
4512 '$directory will be replaced by each CL\'s directory.')
4513 parser.add_option('-c', '--comment', dest='comment_file',
4514 help='A text file containing a CL comment.')
4515 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004516 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004517 help='List the files and reviewers for each CL that would '
4518 'be created, but don\'t create branches or CLs.')
4519 parser.add_option('--cq-dry-run', action='store_true',
4520 help='If set, will do a cq dry run for each uploaded CL. '
4521 'Please be careful when doing this; more than ~10 CLs '
4522 'has the potential to overload our build '
4523 'infrastructure. Try to upload these not during high '
4524 'load times (usually 11-3 Mountain View time). Email '
4525 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004526 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4527 default=True,
4528 help='Sends your change to the CQ after an approval. Only '
4529 'works on repos that have the Auto-Submit label '
4530 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004531 options, _ = parser.parse_args(args)
4532
4533 if not options.description_file:
4534 parser.error('No --description flag specified.')
4535
4536 def WrappedCMDupload(args):
4537 return CMDupload(OptionParser(), args)
4538
4539 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004540 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004541 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004542
4543
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004544@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004545@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004546def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004547 """DEPRECATED: Used to commit the current changelist via git-svn."""
4548 message = ('git-cl no longer supports committing to SVN repositories via '
4549 'git-svn. You probably want to use `git cl land` instead.')
4550 print(message)
4551 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004552
4553
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004554@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004555@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004556def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004557 """Commits the current changelist via git.
4558
4559 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4560 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004561 """
4562 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4563 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004564 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004565 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004566 parser.add_option('--parallel', action='store_true',
4567 help='Run all tests specified by input_api.RunTests in all '
4568 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004569 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004570
Edward Lemur934836a2019-09-09 20:16:54 +00004571 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004572
Robert Iannucci2e73d432018-03-14 01:10:47 -07004573 if not cl.GetIssue():
4574 DieWithError('You must upload the change first to Gerrit.\n'
4575 ' If you would rather have `git cl land` upload '
4576 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004577 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004578 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004579
4580
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004581@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004582@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004583def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004584 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004585 parser.add_option('-b', dest='newbranch',
4586 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004587 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004588 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004589 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004590 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004591
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004592 group = optparse.OptionGroup(
4593 parser,
4594 'Options for continuing work on the current issue uploaded from a '
4595 'different clone (e.g. different machine). Must be used independently '
4596 'from the other options. No issue number should be specified, and the '
4597 'branch must have an issue number associated with it')
4598 group.add_option('--reapply', action='store_true', dest='reapply',
4599 help='Reset the branch and reapply the issue.\n'
4600 'CAUTION: This will undo any local changes in this '
4601 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004602
4603 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004604 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004605 parser.add_option_group(group)
4606
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004607 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004609
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004610 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004611 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004612 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004613 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004614 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004615
Edward Lemur934836a2019-09-09 20:16:54 +00004616 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004617 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004618 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004619
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004620 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004621 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004622 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004623
4624 RunGit(['reset', '--hard', upstream])
4625 if options.pull:
4626 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004627
Edward Lemur678a6842019-10-03 22:25:05 +00004628 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4629 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004630
4631 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004632 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004633
Edward Lemurf38bc172019-09-03 21:02:13 +00004634 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004635 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004636 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004637
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004638 # We don't want uncommitted changes mixed up with the patch.
4639 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004640 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004641
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004642 if options.newbranch:
4643 if options.force:
4644 RunGit(['branch', '-D', options.newbranch],
4645 stderr=subprocess2.PIPE, error_ok=True)
4646 RunGit(['new-branch', options.newbranch])
4647
Edward Lemur678a6842019-10-03 22:25:05 +00004648 cl = Changelist(
4649 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004650
Edward Lemur678a6842019-10-03 22:25:05 +00004651 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004652 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004653
Edward Lemurf38bc172019-09-03 21:02:13 +00004654 return cl.CMDPatchWithParsedIssue(
4655 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004656
4657
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004658def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004659 """Fetches the tree status and returns either 'open', 'closed',
4660 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004661 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004662 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004663 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004664 if status.find('closed') != -1 or status == '0':
4665 return 'closed'
4666 elif status.find('open') != -1 or status == '1':
4667 return 'open'
4668 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004669 return 'unset'
4670
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004671
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004672def GetTreeStatusReason():
4673 """Fetches the tree status from a json url and returns the message
4674 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004675 url = settings.GetTreeStatusUrl()
4676 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004677 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004678 status = json.loads(connection.read())
4679 connection.close()
4680 return status['message']
4681
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004682
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004683@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004684def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004685 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004686 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004687 status = GetTreeStatus()
4688 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004689 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004690 return 2
4691
vapiera7fbd5a2016-06-16 09:17:49 -07004692 print('The tree is %s' % status)
4693 print()
4694 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004695 if status != 'open':
4696 return 1
4697 return 0
4698
4699
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004700@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004701def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004702 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4703 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004704 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004705 '-b', '--bot', action='append',
4706 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4707 'times to specify multiple builders. ex: '
4708 '"-b win_rel -b win_layout". See '
4709 'the try server waterfall for the builders name and the tests '
4710 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004711 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004712 '-B', '--bucket', default='',
4713 help=('Buildbucket bucket to send the try requests.'))
4714 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004715 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004716 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004717 'be determined by the try recipe that builder runs, which usually '
4718 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004719 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004720 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004721 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004722 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004723 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004724 '--category', default='git_cl_try', help='Specify custom build category.')
4725 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004726 '--project',
4727 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004728 'in recipe to determine to which repository or directory to '
4729 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004730 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004731 '-p', '--property', dest='properties', action='append', default=[],
4732 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004733 'key2=value2 etc. The value will be treated as '
4734 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004735 'NOTE: using this may make your tryjob not usable for CQ, '
4736 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004737 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004738 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4739 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004740 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004741 parser.add_option(
4742 '-R', '--retry-failed', action='store_true', default=False,
4743 help='Retry failed jobs from the latest set of tryjobs. '
4744 'Not allowed with --bucket and --bot options.')
Koji Ishii31c14782018-01-08 17:17:33 +09004745 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004746 options, args = parser.parse_args(args)
4747
machenbach@chromium.org45453142015-09-15 08:45:22 +00004748 # Make sure that all properties are prop=value pairs.
4749 bad_params = [x for x in options.properties if '=' not in x]
4750 if bad_params:
4751 parser.error('Got properties with missing "=": %s' % bad_params)
4752
maruel@chromium.org15192402012-09-06 12:38:29 +00004753 if args:
4754 parser.error('Unknown arguments: %s' % args)
4755
Edward Lemur934836a2019-09-09 20:16:54 +00004756 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004757 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004758 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004759
Edward Lemurf38bc172019-09-03 21:02:13 +00004760 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004761 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004762
tandriie113dfd2016-10-11 10:20:12 -07004763 error_message = cl.CannotTriggerTryJobReason()
4764 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004765 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004766
Quinten Yearsley983111f2019-09-26 17:18:48 +00004767 if options.retry_failed:
4768 if options.bot or options.bucket:
4769 print('ERROR: The option --retry-failed is not compatible with '
4770 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4771 return 1
4772 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004773 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004774 if options.verbose:
4775 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004776 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004777 if not buckets:
4778 print('There are no failed jobs in the latest set of jobs '
4779 '(patchset #%d), doing nothing.' % patchset)
4780 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004781 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004782 if num_builders > 10:
4783 confirm_or_exit('There are %d builders with failed builds.'
4784 % num_builders, action='continue')
4785 else:
4786 buckets = _get_bucket_map(cl, options, parser)
4787 if buckets and any(b.startswith('master.') for b in buckets):
4788 print('ERROR: Buildbot masters are not supported.')
4789 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004790
qyearsleydd49f942016-10-28 11:57:22 -07004791 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4792 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004793 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004794 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004795 print('git cl try with no bots now defaults to CQ dry run.')
4796 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4797 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004798
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004799 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004800 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004801 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004802 'of bot requires an initial job from a parent (usually a builder). '
4803 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004804 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004805 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004806
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004807 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004808 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004809 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004810 except BuildbucketResponseException as ex:
4811 print('ERROR: %s' % ex)
4812 return 1
4813 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004814
4815
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004816@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004817def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004818 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004819 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004820 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004821 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004822 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004823 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004824 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004825 '--color', action='store_true', default=setup_color.IS_TTY,
4826 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004827 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004828 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4829 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004830 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004831 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004832 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004833 parser.add_option_group(group)
Stefan Zager27db3f22017-10-10 15:15:01 -07004834 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004835 options, args = parser.parse_args(args)
4836 if args:
4837 parser.error('Unrecognized args: %s' % ' '.join(args))
4838
Edward Lemur934836a2019-09-09 20:16:54 +00004839 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004840 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004841 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004842
tandrii221ab252016-10-06 08:12:04 -07004843 patchset = options.patchset
4844 if not patchset:
4845 patchset = cl.GetMostRecentPatchset()
4846 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004847 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004848 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004849 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004850 cl.GetIssue())
4851
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004852 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004853 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004854 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004855 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004856 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004857 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004858 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004859 else:
4860 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004861 return 0
4862
4863
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004864@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004865@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004866def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004867 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004868 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004869 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004870 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004871
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004872 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004873 if args:
4874 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004875 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004876 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004877 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004878 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004879
4880 # Clear configured merge-base, if there is one.
4881 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004882 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004883 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004884 return 0
4885
4886
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004887@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004888def CMDweb(parser, args):
4889 """Opens the current CL in the web browser."""
4890 _, args = parser.parse_args(args)
4891 if args:
4892 parser.error('Unrecognized args: %s' % ' '.join(args))
4893
4894 issue_url = Changelist().GetIssueURL()
4895 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004896 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004897 return 1
4898
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004899 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004900 # allows us to hide the "Created new window in existing browser session."
4901 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004902 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004903 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004904 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004905 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004906 os.open(os.devnull, os.O_RDWR)
4907 try:
4908 webbrowser.open(issue_url)
4909 finally:
4910 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004911 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004912 return 0
4913
4914
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004915@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004916def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004917 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004918 parser.add_option('-d', '--dry-run', action='store_true',
4919 help='trigger in dry run mode')
4920 parser.add_option('-c', '--clear', action='store_true',
4921 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004922 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004923 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004924 if args:
4925 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004926 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004927 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004928
Edward Lemur934836a2019-09-09 20:16:54 +00004929 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004930 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004931 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004932 elif options.dry_run:
4933 state = _CQState.DRY_RUN
4934 else:
4935 state = _CQState.COMMIT
4936 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004937 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004938 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004939 return 0
4940
4941
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004942@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004943def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004944 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004945 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004946 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004947 if args:
4948 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004949 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004950 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004951 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004952 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004953 cl.CloseIssue()
4954 return 0
4955
4956
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004957@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004958def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004959 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004960 parser.add_option(
4961 '--stat',
4962 action='store_true',
4963 dest='stat',
4964 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004965 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004966 if args:
4967 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004968
Edward Lemur934836a2019-09-09 20:16:54 +00004969 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004970 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004971 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004972 if not issue:
4973 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004974
Aaron Gablea718c3e2017-08-28 17:47:28 -07004975 base = cl._GitGetBranchConfigValue('last-upload-hash')
4976 if not base:
4977 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4978 if not base:
4979 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4980 revision_info = detail['revisions'][detail['current_revision']]
4981 fetch_info = revision_info['fetch']['http']
4982 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4983 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004984
Aaron Gablea718c3e2017-08-28 17:47:28 -07004985 cmd = ['git', 'diff']
4986 if options.stat:
4987 cmd.append('--stat')
4988 cmd.append(base)
4989 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004990
4991 return 0
4992
4993
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004994@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004995def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004996 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004997 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004998 '--ignore-current',
4999 action='store_true',
5000 help='Ignore the CL\'s current reviewers and start from scratch.')
5001 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005002 '--ignore-self',
5003 action='store_true',
5004 help='Do not consider CL\'s author as an owners.')
5005 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005006 '--no-color',
5007 action='store_true',
5008 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005009 parser.add_option(
5010 '--batch',
5011 action='store_true',
5012 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005013 # TODO: Consider moving this to another command, since other
5014 # git-cl owners commands deal with owners for a given CL.
5015 parser.add_option(
5016 '--show-all',
5017 action='store_true',
5018 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005019 options, args = parser.parse_args(args)
5020
5021 author = RunGit(['config', 'user.email']).strip() or None
5022
Edward Lemur934836a2019-09-09 20:16:54 +00005023 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005024
Yang Guo6e269a02019-06-26 11:17:02 +00005025 if options.show_all:
5026 for arg in args:
5027 base_branch = cl.GetCommonAncestorWithUpstream()
5028 change = cl.GetChange(base_branch, None)
5029 database = owners.Database(change.RepositoryRoot(), file, os.path)
5030 database.load_data_needed_for([arg])
5031 print('Owners for %s:' % arg)
5032 for owner in sorted(database.all_possible_owners([arg], None)):
5033 print(' - %s' % owner)
5034 return 0
5035
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005036 if args:
5037 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005038 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005039 base_branch = args[0]
5040 else:
5041 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005042 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005043
5044 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005045 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5046
5047 if options.batch:
5048 db = owners.Database(change.RepositoryRoot(), file, os.path)
5049 print('\n'.join(db.reviewers_for(affected_files, author)))
5050 return 0
5051
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005052 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005053 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005054 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005055 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005056 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005057 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005058 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005059 override_files=change.OriginalOwnersFiles(),
5060 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005061
5062
Aiden Bennerc08566e2018-10-03 17:52:42 +00005063def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005064 """Generates a diff command."""
5065 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005066 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5067
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005068 if allow_prefix:
5069 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5070 # case that diff.noprefix is set in the user's git config.
5071 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5072 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005073 diff_cmd += ['--no-prefix']
5074
5075 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005076
5077 if args:
5078 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005079 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005080 diff_cmd.append(arg)
5081 else:
5082 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005083
5084 return diff_cmd
5085
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005086
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005087def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005088 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005089 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005090
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005091
enne@chromium.org555cfe42014-01-29 18:21:39 +00005092@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005093@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005094def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005095 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005096 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005097 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005098 parser.add_option('--full', action='store_true',
5099 help='Reformat the full content of all touched files')
5100 parser.add_option('--dry-run', action='store_true',
5101 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005102 parser.add_option(
5103 '--python',
5104 action='store_true',
5105 default=None,
5106 help='Enables python formatting on all python files.')
5107 parser.add_option(
5108 '--no-python',
5109 action='store_true',
5110 dest='python',
5111 help='Disables python formatting on all python files. '
5112 'Takes precedence over --python. '
5113 'If neither --python or --no-python are set, python '
5114 'files that have a .style.yapf file in an ancestor '
5115 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005116 parser.add_option('--js', action='store_true',
5117 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005118 parser.add_option('--diff', action='store_true',
5119 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005120 parser.add_option('--presubmit', action='store_true',
5121 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005122 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005123
Daniel Chengc55eecf2016-12-30 03:11:02 -08005124 # Normalize any remaining args against the current path, so paths relative to
5125 # the current directory are still resolved as expected.
5126 args = [os.path.join(os.getcwd(), arg) for arg in args]
5127
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005128 # git diff generates paths against the root of the repository. Change
5129 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005130 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005131 if rel_base_path:
5132 os.chdir(rel_base_path)
5133
digit@chromium.org29e47272013-05-17 17:01:46 +00005134 # Grab the merge-base commit, i.e. the upstream commit of the current
5135 # branch when it was created or the last time it was rebased. This is
5136 # to cover the case where the user may have called "git fetch origin",
5137 # moving the origin branch to a newer commit, but hasn't rebased yet.
5138 upstream_commit = None
5139 cl = Changelist()
5140 upstream_branch = cl.GetUpstreamBranch()
5141 if upstream_branch:
5142 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5143 upstream_commit = upstream_commit.strip()
5144
5145 if not upstream_commit:
5146 DieWithError('Could not find base commit for this branch. '
5147 'Are you in detached state?')
5148
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005149 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5150 diff_output = RunGit(changed_files_cmd)
5151 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005152 # Filter out files deleted by this CL
5153 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005154
Christopher Lamc5ba6922017-01-24 11:19:14 +11005155 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005156 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005157
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005158 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5159 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5160 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005161 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005162
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005163 top_dir = os.path.normpath(
5164 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5165
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005166 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5167 # formatted. This is used to block during the presubmit.
5168 return_value = 0
5169
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005170 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005171 # Locate the clang-format binary in the checkout
5172 try:
5173 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005174 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005175 DieWithError(e)
5176
Jamie Madilldc4d19e2019-10-24 21:50:02 +00005177 if opts.full or settings.GetFormatFullByDefault():
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005178 cmd = [clang_format_tool]
5179 if not opts.dry_run and not opts.diff:
5180 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005181 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005182 if opts.diff:
5183 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005184 else:
5185 env = os.environ.copy()
5186 env['PATH'] = str(os.path.dirname(clang_format_tool))
5187 try:
5188 script = clang_format.FindClangFormatScriptInChromiumTree(
5189 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005190 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005191 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005192
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005193 cmd = [sys.executable, script, '-p0']
5194 if not opts.dry_run and not opts.diff:
5195 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005196
Jamie Madill3671a6a2019-10-24 15:13:21 +00005197 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005198 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005199
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005200 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5201 if opts.diff:
5202 sys.stdout.write(stdout)
5203 if opts.dry_run and len(stdout) > 0:
5204 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005205
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005206 # Similar code to above, but using yapf on .py files rather than clang-format
5207 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005208 py_explicitly_disabled = opts.python is not None and not opts.python
5209 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005210 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5211 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5212 if sys.platform.startswith('win'):
5213 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005214
Aiden Bennerc08566e2018-10-03 17:52:42 +00005215 # If we couldn't find a yapf file we'll default to the chromium style
5216 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005217 chromium_default_yapf_style = os.path.join(depot_tools_path,
5218 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005219 # Used for caching.
5220 yapf_configs = {}
5221 for f in python_diff_files:
5222 # Find the yapf style config for the current file, defaults to depot
5223 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005224 _FindYapfConfigFile(f, yapf_configs, top_dir)
5225
5226 # Turn on python formatting by default if a yapf config is specified.
5227 # This breaks in the case of this repo though since the specified
5228 # style file is also the global default.
5229 if opts.python is None:
5230 filtered_py_files = []
5231 for f in python_diff_files:
5232 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5233 filtered_py_files.append(f)
5234 else:
5235 filtered_py_files = python_diff_files
5236
5237 # Note: yapf still seems to fix indentation of the entire file
5238 # even if line ranges are specified.
5239 # See https://github.com/google/yapf/issues/499
5240 if not opts.full and filtered_py_files:
5241 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5242
Brian Sheedy59b06a82019-10-14 17:03:29 +00005243 ignored_yapf_files = _GetYapfIgnoreFilepaths(top_dir)
5244
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005245 for f in filtered_py_files:
Brian Sheedy59b06a82019-10-14 17:03:29 +00005246 if f in ignored_yapf_files:
5247 continue
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005248 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5249 if yapf_config is None:
5250 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005251
5252 cmd = [yapf_tool, '--style', yapf_config, f]
5253
5254 has_formattable_lines = False
5255 if not opts.full:
5256 # Only run yapf over changed line ranges.
5257 for diff_start, diff_len in py_line_diffs[f]:
5258 diff_end = diff_start + diff_len - 1
5259 # Yapf errors out if diff_end < diff_start but this
5260 # is a valid line range diff for a removal.
5261 if diff_end >= diff_start:
5262 has_formattable_lines = True
5263 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5264 # If all line diffs were removals we have nothing to format.
5265 if not has_formattable_lines:
5266 continue
5267
5268 if opts.diff or opts.dry_run:
5269 cmd += ['--diff']
5270 # Will return non-zero exit code if non-empty diff.
5271 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5272 if opts.diff:
5273 sys.stdout.write(stdout)
5274 elif len(stdout) > 0:
5275 return_value = 2
5276 else:
5277 cmd += ['-i']
5278 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005279
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005280 # Dart's formatter does not have the nice property of only operating on
5281 # modified chunks, so hard code full.
5282 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005283 try:
5284 command = [dart_format.FindDartFmtToolInChromiumTree()]
5285 if not opts.dry_run and not opts.diff:
5286 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005287 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005288
ppi@chromium.org6593d932016-03-03 15:41:15 +00005289 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005290 if opts.dry_run and stdout:
5291 return_value = 2
5292 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005293 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5294 'found in this checkout. Files in other languages are still '
5295 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005296
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005297 # Format GN build files. Always run on full build files for canonical form.
5298 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005299 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005300 if opts.dry_run or opts.diff:
5301 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005302 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005303 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5304 shell=sys.platform == 'win32',
5305 cwd=top_dir)
5306 if opts.dry_run and gn_ret == 2:
5307 return_value = 2 # Not formatted.
5308 elif opts.diff and gn_ret == 2:
5309 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005310 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005311 elif gn_ret != 0:
5312 # For non-dry run cases (and non-2 return values for dry-run), a
5313 # nonzero error code indicates a failure, probably because the file
5314 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005315 DieWithError('gn format failed on ' + gn_diff_file +
5316 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005317
Ilya Shermane081cbe2017-08-15 17:51:04 -07005318 # Skip the metrics formatting from the global presubmit hook. These files have
5319 # a separate presubmit hook that issues an error if the files need formatting,
5320 # whereas the top-level presubmit script merely issues a warning. Formatting
5321 # these files is somewhat slow, so it's important not to duplicate the work.
5322 if not opts.presubmit:
5323 for xml_dir in GetDirtyMetricsDirs(diff_files):
5324 tool_dir = os.path.join(top_dir, xml_dir)
5325 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5326 if opts.dry_run or opts.diff:
5327 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005328 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005329 if opts.diff:
5330 sys.stdout.write(stdout)
5331 if opts.dry_run and stdout:
5332 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005333
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005334 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005335
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005336
Steven Holte2e664bf2017-04-21 13:10:47 -07005337def GetDirtyMetricsDirs(diff_files):
5338 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5339 metrics_xml_dirs = [
5340 os.path.join('tools', 'metrics', 'actions'),
5341 os.path.join('tools', 'metrics', 'histograms'),
5342 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005343 os.path.join('tools', 'metrics', 'ukm'),
5344 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005345 for xml_dir in metrics_xml_dirs:
5346 if any(file.startswith(xml_dir) for file in xml_diff_files):
5347 yield xml_dir
5348
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005349
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005350@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005351@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005352def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005353 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005354 _, args = parser.parse_args(args)
5355
5356 if len(args) != 1:
5357 parser.print_help()
5358 return 1
5359
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005360 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005361 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005362 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005363
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005364 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005365
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005366 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005367 output = RunGit(['config', '--local', '--get-regexp',
5368 r'branch\..*\.%s' % issueprefix],
5369 error_ok=True)
5370 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005371 if issue == target_issue:
5372 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005373
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005374 branches = []
5375 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005376 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005377 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005378 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005379 return 1
5380 if len(branches) == 1:
5381 RunGit(['checkout', branches[0]])
5382 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005383 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005384 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005385 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005386 which = raw_input('Choose by index: ')
5387 try:
5388 RunGit(['checkout', branches[int(which)]])
5389 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005390 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005391 return 1
5392
5393 return 0
5394
5395
maruel@chromium.org29404b52014-09-08 22:58:00 +00005396def CMDlol(parser, args):
5397 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005398 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005399 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5400 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5401 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005402 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005403 return 0
5404
5405
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005406class OptionParser(optparse.OptionParser):
5407 """Creates the option parse and add --verbose support."""
5408 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005409 optparse.OptionParser.__init__(
5410 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005411 self.add_option(
5412 '-v', '--verbose', action='count', default=0,
5413 help='Use 2 times for more debugging info')
5414
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005415 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005416 try:
5417 return self._parse_args(args)
5418 finally:
5419 # Regardless of success or failure of args parsing, we want to report
5420 # metrics, but only after logging has been initialized (if parsing
5421 # succeeded).
5422 global settings
5423 settings = Settings()
5424
5425 if not metrics.DISABLE_METRICS_COLLECTION:
5426 # GetViewVCUrl ultimately calls logging method.
5427 project_url = settings.GetViewVCUrl().strip('/+')
5428 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5429 metrics.collector.add('project_urls', [project_url])
5430
5431 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005432 # Create an optparse.Values object that will store only the actual passed
5433 # options, without the defaults.
5434 actual_options = optparse.Values()
5435 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5436 # Create an optparse.Values object with the default options.
5437 options = optparse.Values(self.get_default_values().__dict__)
5438 # Update it with the options passed by the user.
5439 options._update_careful(actual_options.__dict__)
5440 # Store the options passed by the user in an _actual_options attribute.
5441 # We store only the keys, and not the values, since the values can contain
5442 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005443 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005444
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005445 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005446 logging.basicConfig(
5447 level=levels[min(options.verbose, len(levels) - 1)],
5448 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5449 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005450
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005451 return options, args
5452
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005453
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005454def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005455 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005456 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005457 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005458 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005459
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005460 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005461 dispatcher = subcommand.CommandDispatcher(__name__)
5462 try:
5463 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005464 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005465 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005466 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005467 if e.code != 500:
5468 raise
5469 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005470 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005471 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005472 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005473
5474
5475if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005476 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5477 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005478 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005479 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005480 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005481 sys.exit(main(sys.argv[1:]))