blob: cc1317e2cbb674964bf9bc4ce9863bc9fc6f1376 [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
thakis@chromium.org3421c992014-11-02 02:20:32 +000013import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000014import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010015import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000016import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000017import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010018import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000019import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000021import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import optparse
23import os
24import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010025import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000026import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000027import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070028import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000030import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000032import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000033import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000034
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000035from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000036import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000037import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000038import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000039import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000040import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000041import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000042import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000043import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000044import git_new_branch
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')
Edward Lemur227d5102020-02-25 23:45:35 +000071PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000072
73# When collecting traces, Git hashes will be reduced to 6 characters to reduce
74# the size after compression.
75GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
76# Used to redact the cookies from the gitcookies file.
77GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
78
Edward Lemurd4d1ba42019-09-20 21:46:37 +000079MAX_ATTEMPTS = 3
80
Edward Lemur1b52d872019-05-09 21:12:12 +000081# The maximum number of traces we will keep. Multiplied by 3 since we store
82# 3 files per trace.
83MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000084# Message to be displayed to the user to inform where to find the traces for a
85# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000086TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000087'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000088'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000089' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'Copies of your gitcookies file and git config have been recorded at:\n'
91' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000092# Format of the message to be stored as part of the traces to give developers a
93# better context when they go through traces.
94TRACES_README_FORMAT = (
95'Date: %(now)s\n'
96'\n'
97'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
98'Title: %(title)s\n'
99'\n'
100'%(description)s\n'
101'\n'
102'Execution time: %(execution_time)s\n'
103'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000104
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
thestig@chromium.org44202a22014-03-11 19:22:18 +0000112# Valid extensions for files we want to lint.
113DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
114DEFAULT_LINT_IGNORE_REGEX = r"$^"
115
Aiden Bennerc08566e2018-10-03 17:52:42 +0000116# File name for yapf style config files.
117YAPF_CONFIG_FILENAME = '.style.yapf'
118
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000119# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000120Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000121
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000122# Initialized in main()
123settings = None
124
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100125# Used by tests/git_cl_test.py to add extra logging.
126# Inside the weirdly failing test, add this:
127# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700128# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100129_IS_BEING_TESTED = False
130
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000131
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000132_KNOWN_GERRIT_TO_SHORT_URLS = {
133 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
134 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
135}
136
137
Christopher Lamf732cd52017-01-24 12:40:11 +1100138def DieWithError(message, change_desc=None):
139 if change_desc:
140 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000141 print('\n ** Content of CL description **\n' +
142 '='*72 + '\n' +
143 change_desc.description + '\n' +
144 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100145
vapiera7fbd5a2016-06-16 09:17:49 -0700146 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000147 sys.exit(1)
148
149
Christopher Lamf732cd52017-01-24 12:40:11 +1100150def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000151 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000152 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000153 with open(backup_path, 'w') as backup_file:
154 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100155
156
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000157def GetNoGitPagerEnv():
158 env = os.environ.copy()
159 # 'cat' is a magical git string that disables pagers on all platforms.
160 env['GIT_PAGER'] = 'cat'
161 return env
162
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000163
bsep@chromium.org627d9002016-04-29 00:00:52 +0000164def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000166 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
167 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000168 except subprocess2.CalledProcessError as e:
169 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000170 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000171 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000172 'Command "%s" failed.\n%s' % (
173 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000174 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000175
176
177def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000178 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000179 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000180
181
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000182def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000183 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700184 if suppress_stderr:
185 stderr = subprocess2.VOID
186 else:
187 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000188 try:
tandrii5d48c322016-08-18 16:19:37 -0700189 (out, _), code = subprocess2.communicate(['git'] + args,
190 env=GetNoGitPagerEnv(),
191 stdout=subprocess2.PIPE,
192 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000193 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700194 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900195 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000196 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000197
198
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000199def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000200 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000201 return RunGitWithCode(args, suppress_stderr=True)[1]
202
203
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000204def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000205 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000206 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000207 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000208 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000209
210
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000211def BranchExists(branch):
212 """Return True if specified branch exists."""
213 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
214 suppress_stderr=True)
215 return not code
216
217
tandrii2a16b952016-10-19 07:09:44 -0700218def time_sleep(seconds):
219 # Use this so that it can be mocked in tests without interfering with python
220 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700221 return time.sleep(seconds)
222
223
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000224def time_time():
225 # Use this so that it can be mocked in tests without interfering with python
226 # system machinery.
227 return time.time()
228
229
Edward Lemur1b52d872019-05-09 21:12:12 +0000230def datetime_now():
231 # Use this so that it can be mocked in tests without interfering with python
232 # system machinery.
233 return datetime.datetime.now()
234
235
Edward Lemur1a83da12020-03-04 21:18:36 +0000236def _raw_input(message):
237 # Use this so that it can be mocked in tests on Python 2 and 3.
238 if sys.version_info.major == 2:
239 return raw_input(message)
240 return input(message)
241
242
maruel@chromium.org90541732011-04-01 17:54:18 +0000243def ask_for_data(prompt):
244 try:
Edward Lemur1a83da12020-03-04 21:18:36 +0000245 return _raw_input(prompt)
maruel@chromium.org90541732011-04-01 17:54:18 +0000246 except KeyboardInterrupt:
247 # Hide the exception.
248 sys.exit(1)
249
250
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100251def confirm_or_exit(prefix='', action='confirm'):
252 """Asks user to press enter to continue or press Ctrl+C to abort."""
253 if not prefix or prefix.endswith('\n'):
254 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100255 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100256 mid = ' Press'
257 elif prefix.endswith(' '):
258 mid = 'press'
259 else:
260 mid = ' press'
261 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
262
263
264def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000265 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100266 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
267 while True:
268 if 'yes'.startswith(result):
269 return True
270 if 'no'.startswith(result):
271 return False
272 result = ask_for_data('Please, type yes or no: ').lower()
273
274
tandrii5d48c322016-08-18 16:19:37 -0700275def _git_branch_config_key(branch, key):
276 """Helper method to return Git config key for a branch."""
277 assert branch, 'branch name is required to set git config for it'
278 return 'branch.%s.%s' % (branch, key)
279
280
machenbach@chromium.org45453142015-09-15 08:45:22 +0000281def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000282 prop_list = getattr(options, 'properties', [])
283 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000284 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000285 try:
286 properties[key] = json.loads(val)
287 except ValueError:
288 pass # If a value couldn't be evaluated, treat it as a string.
289 return properties
290
291
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000292# TODO(crbug.com/976104): Remove this function once git-cl try-results has
293# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000294def _buildbucket_retry(operation_name, http, *args, **kwargs):
295 """Retries requests to buildbucket service and returns parsed json content."""
296 try_count = 0
297 while True:
298 response, content = http.request(*args, **kwargs)
299 try:
300 content_json = json.loads(content)
301 except ValueError:
302 content_json = None
303
304 # Buildbucket could return an error even if status==200.
305 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000306 error = content_json.get('error')
307 if error.get('code') == 403:
308 raise BuildbucketResponseException(
309 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000310 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000311 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000312 raise BuildbucketResponseException(msg)
313
314 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700315 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000316 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000317 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700318 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000319 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000320 content)
321 return content_json
322 if response.status < 500 or try_count >= 2:
323 raise httplib2.HttpLib2Error(content)
324
325 # status >= 500 means transient failures.
326 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000327 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000328 try_count += 1
329 assert False, 'unreachable'
330
331
Edward Lemur4c707a22019-09-24 21:13:43 +0000332def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333 """Calls a buildbucket v2 method and returns the parsed json response."""
334 headers = {
335 'Accept': 'application/json',
336 'Content-Type': 'application/json',
337 }
338 request = json.dumps(request)
339 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
340
341 logging.info('POST %s with %s' % (url, request))
342
343 attempts = 1
344 time_to_sleep = 1
345 while True:
346 response, content = http.request(url, 'POST', body=request, headers=headers)
347 if response.status == 200:
348 return json.loads(content[4:])
349 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
350 msg = '%s error when calling POST %s with %s: %s' % (
351 response.status, url, request, content)
352 raise BuildbucketResponseException(msg)
353 logging.debug(
354 '%s error when calling POST %s with %s. '
355 'Sleeping for %d seconds and retrying...' % (
356 response.status, url, request, time_to_sleep))
357 time.sleep(time_to_sleep)
358 time_to_sleep *= 2
359 attempts += 1
360
361 assert False, 'unreachable'
362
363
Edward Lemur6215c792019-10-03 21:59:05 +0000364def _parse_bucket(raw_bucket):
365 legacy = True
366 project = bucket = None
367 if '/' in raw_bucket:
368 legacy = False
369 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000370 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000371 elif raw_bucket.startswith('luci.'):
372 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000374 elif '.' in raw_bucket:
375 project = raw_bucket.split('.')[0]
376 bucket = raw_bucket
377 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000378 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000379 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
380 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381
382
Quinten Yearsley777660f2020-03-04 23:37:06 +0000383def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000384 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700385
386 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000387 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000388 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700389 options: Command-line options.
390 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000391 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000392 for project, bucket, builder in jobs:
393 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000394 print('To see results here, run: git cl try-results')
395 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700396
Quinten Yearsley777660f2020-03-04 23:37:06 +0000397 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000398 if not requests:
399 return
400
Edward Lemur5b929a42019-10-21 17:57:39 +0000401 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000402 http.force_exception_to_status_code = True
403
404 batch_request = {'requests': requests}
405 batch_response = _call_buildbucket(
406 http, options.buildbucket_host, 'Batch', batch_request)
407
408 errors = [
409 ' ' + response['error']['message']
410 for response in batch_response.get('responses', [])
411 if 'error' in response
412 ]
413 if errors:
414 raise BuildbucketResponseException(
415 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
416
417
Quinten Yearsley777660f2020-03-04 23:37:06 +0000418def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000419 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000420 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000421 shared_properties = {
422 'category': options.ensure_value('category', 'git_cl_try')
423 }
424 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425 shared_properties['clobber'] = True
426 shared_properties.update(_get_properties_from_options(options) or {})
427
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000428 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000429 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000430 shared_tags.append({'key': 'retry_failed',
431 'value': '1'})
432
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000433 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000434 for (project, bucket, builder) in jobs:
435 properties = shared_properties.copy()
436 if 'presubmit' in builder.lower():
437 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000438
Edward Lemur45768512020-03-02 19:03:14 +0000439 requests.append({
440 'scheduleBuild': {
441 'requestId': str(uuid.uuid4()),
442 'builder': {
443 'project': getattr(options, 'project', None) or project,
444 'bucket': bucket,
445 'builder': builder,
446 },
447 'gerritChanges': gerrit_changes,
448 'properties': properties,
449 'tags': [
450 {'key': 'builder', 'value': builder},
451 ] + shared_tags,
452 }
453 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000454
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000455 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000456 requests[-1]['scheduleBuild']['gitilesCommit'] = {
457 'host': gerrit_changes[0]['host'],
458 'project': gerrit_changes[0]['project'],
459 'id': options.revision
460 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000461
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000462 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000463
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000464
Quinten Yearsley777660f2020-03-04 23:37:06 +0000465def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000466 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000467
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000468 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000469 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000470 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000471 request = {
472 'predicate': {
473 'gerritChanges': [changelist.GetGerritChange(patchset)],
474 },
475 'fields': ','.join('builds.*.' + field for field in fields),
476 }
tandrii221ab252016-10-06 08:12:04 -0700477
Edward Lemur5b929a42019-10-21 17:57:39 +0000478 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000479 if authenticator.has_cached_credentials():
480 http = authenticator.authorize(httplib2.Http())
481 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700482 print('Warning: Some results might be missing because %s' %
483 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000484 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000485 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000486 http.force_exception_to_status_code = True
487
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000488 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
489 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000490
Edward Lemur45768512020-03-02 19:03:14 +0000491
Edward Lemur5b929a42019-10-21 17:57:39 +0000492def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 """Fetches builds from the latest patchset that has builds (within
494 the last few patchsets).
495
496 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000497 changelist (Changelist): The CL to fetch builds for
498 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000499 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
500 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000501 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000502 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
503 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000504 """
505 assert buildbucket_host
506 assert changelist.GetIssue(), 'CL must be uploaded first'
507 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000508 if latest_patchset is None:
509 assert changelist.GetMostRecentPatchset()
510 ps = changelist.GetMostRecentPatchset()
511 else:
512 assert latest_patchset > 0, latest_patchset
513 ps = latest_patchset
514
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515 min_ps = max(1, ps - 5)
516 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000517 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000518 if len(builds):
519 return builds, ps
520 ps -= 1
521 return [], 0
522
523
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000524def _filter_failed_for_retry(all_builds):
525 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000526
527 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000528 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000529 i.e. a list of buildbucket.v2.Builds which includes status and builder
530 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000531
532 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000533 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000534 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000535 """
Edward Lemur45768512020-03-02 19:03:14 +0000536 grouped = {}
537 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000538 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000539 key = (builder['project'], builder['bucket'], builder['builder'])
540 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000541
Edward Lemur45768512020-03-02 19:03:14 +0000542 jobs = []
543 for (project, bucket, builder), builds in grouped.items():
544 if 'triggered' in builder:
545 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
546 'from a parent. Please schedule a manual job for the parent '
547 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000548 continue
549 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
550 # Don't retry if any are running.
551 continue
Edward Lemur45768512020-03-02 19:03:14 +0000552 # If builder had several builds, retry only if the last one failed.
553 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
554 # build, but in case of retrying failed jobs retrying a flaky one makes
555 # sense.
556 builds = sorted(builds, key=lambda b: b['createTime'])
557 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
558 continue
559 # Don't retry experimental build previously triggered by CQ.
560 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
561 for t in builds[-1]['tags']):
562 continue
563 jobs.append((project, bucket, builder))
564
565 # Sort the jobs to make testing easier.
566 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000567
568
Quinten Yearsley777660f2020-03-04 23:37:06 +0000569def _print_tryjobs(options, builds):
570 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000571 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000572 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000573 return
574
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000575 longest_builder = max(len(b['builder']['builder']) for b in builds)
576 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
579 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000581 builds_by_status = {}
582 for b in builds:
583 builds_by_status.setdefault(b['status'], []).append({
584 'id': b['id'],
585 'name': name_fmt.format(
586 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
587 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000589 sort_key = lambda b: (b['name'], b['id'])
590
591 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 if not builds:
594 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000596 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000597 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000598 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000599 else:
600 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
601
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 print(colorize(title))
603 for b in sorted(builds, key=sort_key):
604 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000605
606 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000607 print_builds(
608 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
609 print_builds(
610 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
611 color=Fore.MAGENTA)
612 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
613 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
614 color=Fore.MAGENTA)
615 print_builds('Started:', builds_by_status.pop('STARTED', []))
616 print_builds(
617 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000618 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000619 print_builds(
620 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000621 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000622
623
Aiden Bennerc08566e2018-10-03 17:52:42 +0000624def _ComputeDiffLineRanges(files, upstream_commit):
625 """Gets the changed line ranges for each file since upstream_commit.
626
627 Parses a git diff on provided files and returns a dict that maps a file name
628 to an ordered list of range tuples in the form (start_line, count).
629 Ranges are in the same format as a git diff.
630 """
631 # If files is empty then diff_output will be a full diff.
632 if len(files) == 0:
633 return {}
634
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000635 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000636 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000637 diff_output = RunGit(diff_cmd)
638
639 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
640 # 2 capture groups
641 # 0 == fname of diff file
642 # 1 == 'diff_start,diff_count' or 'diff_start'
643 # will match each of
644 # diff --git a/foo.foo b/foo.py
645 # @@ -12,2 +14,3 @@
646 # @@ -12,2 +17 @@
647 # running re.findall on the above string with pattern will give
648 # [('foo.py', ''), ('', '14,3'), ('', '17')]
649
650 curr_file = None
651 line_diffs = {}
652 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
653 if match[0] != '':
654 # Will match the second filename in diff --git a/a.py b/b.py.
655 curr_file = match[0]
656 line_diffs[curr_file] = []
657 else:
658 # Matches +14,3
659 if ',' in match[1]:
660 diff_start, diff_count = match[1].split(',')
661 else:
662 # Single line changes are of the form +12 instead of +12,1.
663 diff_start = match[1]
664 diff_count = 1
665
666 diff_start = int(diff_start)
667 diff_count = int(diff_count)
668
669 # If diff_count == 0 this is a removal we can ignore.
670 line_diffs[curr_file].append((diff_start, diff_count))
671
672 return line_diffs
673
674
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000675def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676 """Checks if a yapf file is in any parent directory of fpath until top_dir.
677
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000678 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000679 is found returns None. Uses yapf_config_cache as a cache for previously found
680 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000681 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000682 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000683 # Return result if we've already computed it.
684 if fpath in yapf_config_cache:
685 return yapf_config_cache[fpath]
686
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000687 parent_dir = os.path.dirname(fpath)
688 if os.path.isfile(fpath):
689 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000690 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000691 # Otherwise fpath is a directory
692 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
693 if os.path.isfile(yapf_file):
694 ret = yapf_file
695 elif fpath == top_dir or parent_dir == fpath:
696 # If we're at the top level directory, or if we're at root
697 # there is no provided style.
698 ret = None
699 else:
700 # Otherwise recurse on the current directory.
701 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000702 yapf_config_cache[fpath] = ret
703 return ret
704
705
Brian Sheedyb4307d52019-12-02 19:18:17 +0000706def _GetYapfIgnorePatterns(top_dir):
707 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000708
709 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
710 but this functionality appears to break when explicitly passing files to
711 yapf for formatting. According to
712 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
713 the .yapfignore file should be in the directory that yapf is invoked from,
714 which we assume to be the top level directory in this case.
715
716 Args:
717 top_dir: The top level directory for the repository being formatted.
718
719 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000720 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000721 """
722 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000723 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000724 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000725 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000726
Brian Sheedyb4307d52019-12-02 19:18:17 +0000727 with open(yapfignore_file) as f:
728 for line in f.readlines():
729 stripped_line = line.strip()
730 # Comments and blank lines should be ignored.
731 if stripped_line.startswith('#') or stripped_line == '':
732 continue
733 ignore_patterns.add(stripped_line)
734 return ignore_patterns
735
736
737def _FilterYapfIgnoredFiles(filepaths, patterns):
738 """Filters out any filepaths that match any of the given patterns.
739
740 Args:
741 filepaths: An iterable of strings containing filepaths to filter.
742 patterns: An iterable of strings containing fnmatch patterns to filter on.
743
744 Returns:
745 A list of strings containing all the elements of |filepaths| that did not
746 match any of the patterns in |patterns|.
747 """
748 # Not inlined so that tests can use the same implementation.
749 return [f for f in filepaths
750 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000751
752
Aaron Gable13101a62018-02-09 13:20:41 -0800753def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 """Prints statistics about the change to the user."""
755 # --no-ext-diff is broken in some versions of Git, so try to work around
756 # this by overriding the environment (but there is still a problem if the
757 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000758 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000759 if 'GIT_EXTERNAL_DIFF' in env:
760 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000761
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000762 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800763 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000764 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000765
766
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000767class BuildbucketResponseException(Exception):
768 pass
769
770
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000771class Settings(object):
772 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000773 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000774 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775 self.tree_status_url = None
776 self.viewvc_url = None
777 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000778 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000779 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000780 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000781 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000782 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783
Edward Lemur26964072020-02-19 19:18:51 +0000784 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000785 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000786 if self.updated:
787 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788
Edward Lemur26964072020-02-19 19:18:51 +0000789 # The only value that actually changes the behavior is
790 # autoupdate = "false". Everything else means "true".
791 autoupdate = (
792 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
793
794 cr_settings_file = FindCodereviewSettingsFile()
795 if autoupdate != 'false' and cr_settings_file:
796 LoadCodereviewSettingsFromFile(cr_settings_file)
797 cr_settings_file.close()
798
799 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000801 @staticmethod
802 def GetRelativeRoot():
803 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000804
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000806 if self.root is None:
807 self.root = os.path.abspath(self.GetRelativeRoot())
808 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 def GetTreeStatusUrl(self, error_ok=False):
811 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000812 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
813 if self.tree_status_url is None and not error_ok:
814 DieWithError(
815 'You must configure your tree status URL by running '
816 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000817 return self.tree_status_url
818
819 def GetViewVCUrl(self):
820 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000821 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822 return self.viewvc_url
823
rmistry@google.com90752582014-01-14 21:04:50 +0000824 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000825 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000826
rmistry@google.com5626a922015-02-26 14:03:30 +0000827 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000828 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000829 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000830 return run_post_upload_hook == "True"
831
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000832 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000833 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000834
ukai@chromium.orge8077812012-02-03 03:41:46 +0000835 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000836 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000837 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000838 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000839 return self.is_gerrit
840
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000841 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000842 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000843 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700844 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000845 if self.squash_gerrit_uploads is None:
846 # Default is squash now (http://crbug.com/611892#c23).
847 self.squash_gerrit_uploads = self._GetConfig(
848 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000849 return self.squash_gerrit_uploads
850
tandriia60502f2016-06-20 02:01:53 -0700851 def GetSquashGerritUploadsOverride(self):
852 """Return True or False if codereview.settings should be overridden.
853
854 Returns None if no override has been defined.
855 """
856 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000857 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700858 if result == 'true':
859 return True
860 if result == 'false':
861 return False
862 return None
863
tandrii@chromium.org28253532016-04-14 13:46:56 +0000864 def GetGerritSkipEnsureAuthenticated(self):
865 """Return True if EnsureAuthenticated should not be done for Gerrit
866 uploads."""
867 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000868 self.gerrit_skip_ensure_authenticated = self._GetConfig(
869 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000870 return self.gerrit_skip_ensure_authenticated
871
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000872 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000873 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000874 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000875 # Git requires single quotes for paths with spaces. We need to replace
876 # them with double quotes for Windows to treat such paths as a single
877 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000878 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000879 return self.git_editor or None
880
thestig@chromium.org44202a22014-03-11 19:22:18 +0000881 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000882 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000883
884 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000885 return self._GetConfig(
886 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000887
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000888 def GetFormatFullByDefault(self):
889 if self.format_full_by_default is None:
890 result = (
891 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
892 error_ok=True).strip())
893 self.format_full_by_default = (result == 'true')
894 return self.format_full_by_default
895
Edward Lemur26964072020-02-19 19:18:51 +0000896 def _GetConfig(self, key, default=''):
897 self._LazyUpdateIfNeeded()
898 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000899
900
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000901class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000902 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000903 NONE = 'none'
904 DRY_RUN = 'dry_run'
905 COMMIT = 'commit'
906
907 ALL_STATES = [NONE, DRY_RUN, COMMIT]
908
909
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000910class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000911 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000912 self.issue = issue
913 self.patchset = patchset
914 self.hostname = hostname
915
916 @property
917 def valid(self):
918 return self.issue is not None
919
920
Edward Lemurf38bc172019-09-03 21:02:13 +0000921def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000922 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
923 fail_result = _ParsedIssueNumberArgument()
924
Edward Lemur678a6842019-10-03 22:25:05 +0000925 if isinstance(arg, int):
926 return _ParsedIssueNumberArgument(issue=arg)
927 if not isinstance(arg, basestring):
928 return fail_result
929
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000930 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000931 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000932 if not arg.startswith('http'):
933 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700934
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000935 url = gclient_utils.UpgradeToHttps(arg)
936 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000937 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000938 except ValueError:
939 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200940
Edward Lemur678a6842019-10-03 22:25:05 +0000941 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
942 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
943 # Short urls like https://domain/<issue_number> can be used, but don't allow
944 # specifying the patchset (you'd 404), but we allow that here.
945 if parsed_url.path == '/':
946 part = parsed_url.fragment
947 else:
948 part = parsed_url.path
949
950 match = re.match(
951 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
952 if not match:
953 return fail_result
954
955 issue = int(match.group('issue'))
956 patchset = match.group('patchset')
957 return _ParsedIssueNumberArgument(
958 issue=issue,
959 patchset=int(patchset) if patchset else None,
960 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000961
962
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000963def _create_description_from_log(args):
964 """Pulls out the commit log to use as a base for the CL description."""
965 log_args = []
966 if len(args) == 1 and not args[0].endswith('.'):
967 log_args = [args[0] + '..']
968 elif len(args) == 1 and args[0].endswith('...'):
969 log_args = [args[0][:-1]]
970 elif len(args) == 2:
971 log_args = [args[0] + '..' + args[1]]
972 else:
973 log_args = args[:] # Hope for the best!
Edward Lemura12175c2020-03-09 16:58:26 +0000974 return RunGit(['log', '--pretty=format:%s%n%n%b'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000975
976
Aaron Gablea45ee112016-11-22 15:14:38 -0800977class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700978 def __init__(self, issue, url):
979 self.issue = issue
980 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800981 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700982
983 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800984 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700985 self.issue, self.url)
986
987
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100988_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000989 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100990 # TODO(tandrii): these two aren't known in Gerrit.
991 'approval', 'disapproval'])
992
993
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000994class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000995 """Changelist works with one changelist in local branch.
996
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000997 Notes:
998 * Not safe for concurrent multi-{thread,process} use.
999 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001000 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001001 """
1002
Edward Lemur125d60a2019-09-13 18:25:41 +00001003 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001004 """Create a new ChangeList instance.
1005
Edward Lemurf38bc172019-09-03 21:02:13 +00001006 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001007 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001009 global settings
1010 if not settings:
1011 # Happens when git_cl.py is used as a utility library.
1012 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001013
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001014 self.branchref = branchref
1015 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001016 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001017 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018 else:
1019 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001020 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001021 self.lookedup_issue = False
1022 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001024 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001026 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001027 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001028 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001029 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001030
Edward Lemur125d60a2019-09-13 18:25:41 +00001031 # Lazily cached values.
1032 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1033 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1034 # Map from change number (issue) to its detail cache.
1035 self._detail_cache = {}
1036
1037 if codereview_host is not None:
1038 assert not codereview_host.startswith('https://'), codereview_host
1039 self._gerrit_host = codereview_host
1040 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001041
1042 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001043 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001044
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001045 The return value is a string suitable for passing to git cl with the --cc
1046 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001047 """
1048 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001049 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001050 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001051 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1052 return self.cc
1053
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001054 def GetCCListWithoutDefault(self):
1055 """Return the users cc'd on this CL excluding default ones."""
1056 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001057 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001058 return self.cc
1059
Daniel Cheng7227d212017-11-17 08:12:37 -08001060 def ExtendCC(self, more_cc):
1061 """Extends the list of users to cc on this CL based on the changed files."""
1062 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001063
1064 def GetBranch(self):
1065 """Returns the short branch name, e.g. 'master'."""
1066 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001067 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001068 if not branchref:
1069 return None
1070 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001071 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001072 return self.branch
1073
1074 def GetBranchRef(self):
1075 """Returns the full branch name, e.g. 'refs/heads/master'."""
1076 self.GetBranch() # Poke the lazy loader.
1077 return self.branchref
1078
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001079 def ClearBranch(self):
1080 """Clears cached branch data of this object."""
1081 self.branch = self.branchref = None
1082
Edward Lemur85153282020-02-14 22:06:29 +00001083 def _GitGetBranchConfigValue(self, key, default=None):
1084 return scm.GIT.GetBranchConfig(
1085 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001086
Edward Lemur85153282020-02-14 22:06:29 +00001087 def _GitSetBranchConfigValue(self, key, value):
1088 action = 'set %s to %r' % (key, value)
1089 if not value:
1090 action = 'unset %s' % key
1091 assert self.GetBranch(), 'a branch is needed to ' + action
1092 return scm.GIT.SetBranchConfig(
1093 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001094
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001095 @staticmethod
1096 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001097 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098 e.g. 'origin', 'refs/heads/master'
1099 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001100 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1101 settings.GetRoot(), branch)
1102 if not remote or not upstream_branch:
1103 DieWithError(
1104 'Unable to determine default branch to diff against.\n'
1105 'Either pass complete "git diff"-style arguments, like\n'
1106 ' git cl upload origin/master\n'
1107 'or verify this branch is set up to track another \n'
1108 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109
1110 return remote, upstream_branch
1111
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001112 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001113 upstream_branch = self.GetUpstreamBranch()
1114 if not BranchExists(upstream_branch):
1115 DieWithError('The upstream for the current branch (%s) does not exist '
1116 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001117 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001118 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001119
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 def GetUpstreamBranch(self):
1121 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001122 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001123 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001124 upstream_branch = upstream_branch.replace('refs/heads/',
1125 'refs/remotes/%s/' % remote)
1126 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1127 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128 self.upstream_branch = upstream_branch
1129 return self.upstream_branch
1130
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001131 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001132 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001133 remote, branch = None, self.GetBranch()
1134 seen_branches = set()
1135 while branch not in seen_branches:
1136 seen_branches.add(branch)
1137 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001138 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001139 if remote != '.' or branch.startswith('refs/remotes'):
1140 break
1141 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001142 remotes = RunGit(['remote'], error_ok=True).split()
1143 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001144 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001145 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001146 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001147 logging.warn('Could not determine which remote this change is '
1148 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001149 else:
1150 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001151 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001152 branch = 'HEAD'
1153 if branch.startswith('refs/remotes'):
1154 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001155 elif branch.startswith('refs/branch-heads/'):
1156 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001157 else:
1158 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001159 return self._remote
1160
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001161 def GitSanityChecks(self, upstream_git_obj):
1162 """Checks git repo status and ensures diff is from local commits."""
1163
sbc@chromium.org79706062015-01-14 21:18:12 +00001164 if upstream_git_obj is None:
1165 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001166 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001167 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001168 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001169 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001170 return False
1171
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 # Verify the commit we're diffing against is in our current branch.
1173 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1174 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1175 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001176 print('ERROR: %s is not in the current branch. You may need to rebase '
1177 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 return False
1179
1180 # List the commits inside the diff, and verify they are all local.
1181 commits_in_diff = RunGit(
1182 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1183 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1184 remote_branch = remote_branch.strip()
1185 if code != 0:
1186 _, remote_branch = self.GetRemoteBranch()
1187
1188 commits_in_remote = RunGit(
1189 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1190
1191 common_commits = set(commits_in_diff) & set(commits_in_remote)
1192 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001193 print('ERROR: Your diff contains %d commits already in %s.\n'
1194 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1195 'the diff. If you are using a custom git flow, you can override'
1196 ' the reference used for this check with "git config '
1197 'gitcl.remotebranch <git-ref>".' % (
1198 len(common_commits), remote_branch, upstream_git_obj),
1199 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001200 return False
1201 return True
1202
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001203 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001204 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001205
1206 Returns None if it is not set.
1207 """
tandrii5d48c322016-08-18 16:19:37 -07001208 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001209
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001210 def GetRemoteUrl(self):
1211 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1212
1213 Returns None if there is no remote.
1214 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001215 is_cached, value = self._cached_remote_url
1216 if is_cached:
1217 return value
1218
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001219 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001220 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001221
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001223 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001224 if host:
1225 self._cached_remote_url = (True, url)
1226 return url
1227
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001228 # If it cannot be parsed as an url, assume it is a local directory,
1229 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001230 logging.warning('"%s" doesn\'t appear to point to a git host. '
1231 'Interpreting it as a local directory.', url)
1232 if not os.path.isdir(url):
1233 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001234 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1235 'but it doesn\'t exist.',
1236 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001237 return None
1238
1239 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001240 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001241
Edward Lemur79d4f992019-11-11 23:49:02 +00001242 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001243 if not host:
1244 logging.error(
1245 'Remote "%(remote)s" for branch "%(branch)s" points to '
1246 '"%(cache_path)s", but it is misconfigured.\n'
1247 '"%(cache_path)s" must be a git repo and must have a remote named '
1248 '"%(remote)s" pointing to the git host.', {
1249 'remote': remote,
1250 'cache_path': cache_path,
1251 'branch': self.GetBranch()})
1252 return None
1253
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001254 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001255 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001256
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001257 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001258 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001259 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001260 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1261 if self.issue is not None:
1262 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001263 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001264 return self.issue
1265
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001266 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001268 issue = self.GetIssue()
1269 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001270 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001271 server = self.GetCodereviewServer()
1272 if short:
1273 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1274 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001275
Edward Lemur6c6827c2020-02-06 21:15:18 +00001276 def FetchDescription(self, pretty=False):
1277 assert self.GetIssue(), 'issue is required to query Gerrit'
1278
Edward Lemur9aa1a962020-02-25 00:58:38 +00001279 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001280 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1281 current_rev = data['current_revision']
1282 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001283
1284 if not pretty:
1285 return self.description
1286
1287 # Set width to 72 columns + 2 space indent.
1288 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1289 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1290 lines = self.description.splitlines()
1291 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292
1293 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001294 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001295 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001296 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1297 if self.patchset is not None:
1298 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001299 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300 return self.patchset
1301
Edward Lemur9aa1a962020-02-25 00:58:38 +00001302 def GetAuthor(self):
1303 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1304
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001305 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001306 """Set this branch's patchset. If patchset=0, clears the patchset."""
1307 assert self.GetBranch()
1308 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001309 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001310 else:
1311 self.patchset = int(patchset)
1312 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001313 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001314
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001315 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001316 """Set this branch's issue. If issue isn't given, clears the issue."""
1317 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001318 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001319 issue = int(issue)
1320 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001321 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001322 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001323 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001324 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001325 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001326 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001327 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001328 else:
tandrii5d48c322016-08-18 16:19:37 -07001329 # Reset all of these just to be clean.
1330 reset_suffixes = [
1331 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001332 self.IssueConfigKey(),
1333 self.PatchsetConfigKey(),
1334 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001335 ] + self._PostUnsetIssueProperties()
1336 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001337 try:
1338 self._GitSetBranchConfigValue(prop, None)
1339 except subprocess2.CalledProcessError:
1340 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001341 msg = RunGit(['log', '-1', '--format=%B']).strip()
1342 if msg and git_footers.get_footer_change_id(msg):
1343 print('WARNING: The change patched into this branch has a Change-Id. '
1344 'Removing it.')
1345 RunGit(['commit', '--amend', '-m',
1346 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001347 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001348 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001349 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001350
Edward Lemur2c62b332020-03-12 22:12:33 +00001351 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001352 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001353 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001354 except subprocess2.CalledProcessError:
1355 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001356 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001357 'This branch probably doesn\'t exist anymore. To reset the\n'
1358 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001359 ' git branch --set-upstream-to origin/master %s\n'
1360 'or replace origin/master with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001361 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001362
dsansomee2d6fd92016-09-08 00:10:47 -07001363 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001364 assert self.GetIssue(), 'issue is required to update description'
1365
1366 if gerrit_util.HasPendingChangeEdit(
1367 self._GetGerritHost(), self._GerritChangeIdentifier()):
1368 if not force:
1369 confirm_or_exit(
1370 'The description cannot be modified while the issue has a pending '
1371 'unpublished edit. Either publish the edit in the Gerrit web UI '
1372 'or delete it.\n\n', action='delete the unpublished edit')
1373
1374 gerrit_util.DeletePendingChangeEdit(
1375 self._GetGerritHost(), self._GerritChangeIdentifier())
1376 gerrit_util.SetCommitMessage(
1377 self._GetGerritHost(), self._GerritChangeIdentifier(),
1378 description, notify='NONE')
1379
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001380 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001381
Edward Lemur75526302020-02-27 22:31:05 +00001382 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001383 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001384 '--root', settings.GetRoot(),
1385 '--upstream', upstream,
1386 ]
1387
1388 args.extend(['--verbose'] * verbose)
1389
Edward Lemur99df04e2020-03-05 19:39:43 +00001390 author = self.GetAuthor()
1391 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001392 issue = self.GetIssue()
1393 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001394 if author:
1395 args.extend(['--author', author])
1396 if gerrit_url:
1397 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001398 if issue:
1399 args.extend(['--issue', str(issue)])
1400 if patchset:
1401 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001402
Edward Lemur75526302020-02-27 22:31:05 +00001403 return args
1404
1405 def RunHook(
1406 self, committing, may_prompt, verbose, parallel, upstream, description,
1407 all_files):
1408 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1409 args = self._GetCommonPresubmitArgs(verbose, upstream)
1410 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001411 if may_prompt:
1412 args.append('--may_prompt')
1413 if parallel:
1414 args.append('--parallel')
1415 if all_files:
1416 args.append('--all_files')
1417
1418 with gclient_utils.temporary_file() as description_file:
1419 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001420
1421 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001422 args.extend(['--json_output', json_output])
1423 args.extend(['--description_file', description_file])
1424
1425 start = time_time()
1426 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1427 exit_code = p.wait()
1428 metrics.collector.add_repeated('sub_commands', {
1429 'command': 'presubmit',
1430 'execution_time': time_time() - start,
1431 'exit_code': exit_code,
1432 })
1433
1434 if exit_code:
1435 sys.exit(exit_code)
1436
1437 json_results = gclient_utils.FileRead(json_output)
1438 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001439
Edward Lemur75526302020-02-27 22:31:05 +00001440 def RunPostUploadHook(self, verbose, upstream, description):
1441 args = self._GetCommonPresubmitArgs(verbose, upstream)
1442 args.append('--post_upload')
1443
1444 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001445 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001446 args.extend(['--description_file', description_file])
1447 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1448 p.wait()
1449
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001450 def CMDUpload(self, options, git_diff_args, orig_args):
1451 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001452 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001453 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001454 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001455 else:
1456 if self.GetBranch() is None:
1457 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1458
1459 # Default to diffing against common ancestor of upstream branch
1460 base_branch = self.GetCommonAncestorWithUpstream()
1461 git_diff_args = [base_branch, 'HEAD']
1462
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001463 # Fast best-effort checks to abort before running potentially expensive
1464 # hooks if uploading is likely to fail anyway. Passing these checks does
1465 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001466 self.EnsureAuthenticated(force=options.force)
1467 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001468
Edward Lesmesc48fb842020-03-13 23:05:55 +00001469 # Get description message for upload.
1470 if self.GetIssue():
1471 description = self.FetchDescription()
1472 elif options.message:
1473 description = options.message
1474 else:
1475 description = _create_description_from_log(git_diff_args)
1476 if options.title and options.squash:
1477 description = options.title + '\n\n' + message
1478
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001479 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001480 watchlist = watchlists.Watchlists(settings.GetRoot())
1481 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001482 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001483 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001484
Edward Lesmesc48fb842020-03-13 23:05:55 +00001485 if options.reviewers or options.tbrs or options.add_owners_to:
1486 # Set the reviewer list now so that presubmit checks can access it.
1487 change_description = ChangeDescription(description)
1488 change_description.update_reviewers(
1489 options.reviewers, options.tbrs, options.add_owners_to, files,
1490 self.GetAuthor())
1491 description = change_description.description
1492
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001493 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001494 hook_results = self.RunHook(
1495 committing=False,
1496 may_prompt=not options.force,
1497 verbose=options.verbose,
1498 parallel=options.parallel,
1499 upstream=base_branch,
Edward Lesmesc48fb842020-03-13 23:05:55 +00001500 description=description,
Edward Lemur2c62b332020-03-12 22:12:33 +00001501 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001502 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001503
Aaron Gable13101a62018-02-09 13:20:41 -08001504 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001505 ret = self.CMDUploadChange(
Edward Lesmesc48fb842020-03-13 23:05:55 +00001506 options, git_diff_args, custom_cl_base, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001507 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001508 self._GitSetBranchConfigValue(
1509 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001510 # Run post upload hooks, if specified.
1511 if settings.GetRunPostUploadHook():
Edward Lesmesc48fb842020-03-13 23:05:55 +00001512 self.RunPostUploadHook(options.verbose, base_branch, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001513
1514 # Upload all dependencies if specified.
1515 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001516 print()
1517 print('--dependencies has been specified.')
1518 print('All dependent local branches will be re-uploaded.')
1519 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001520 # Remove the dependencies flag from args so that we do not end up in a
1521 # loop.
1522 orig_args.remove('--dependencies')
1523 ret = upload_branch_deps(self, orig_args)
1524 return ret
1525
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001526 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001527 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001528
1529 Issue must have been already uploaded and known.
1530 """
1531 assert new_state in _CQState.ALL_STATES
1532 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001533 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001534 vote_map = {
1535 _CQState.NONE: 0,
1536 _CQState.DRY_RUN: 1,
1537 _CQState.COMMIT: 2,
1538 }
1539 labels = {'Commit-Queue': vote_map[new_state]}
1540 notify = False if new_state == _CQState.DRY_RUN else None
1541 gerrit_util.SetReview(
1542 self._GetGerritHost(), self._GerritChangeIdentifier(),
1543 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001544 return 0
1545 except KeyboardInterrupt:
1546 raise
1547 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001548 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001549 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001550 ' * Your project has no CQ,\n'
1551 ' * You don\'t have permission to change the CQ state,\n'
1552 ' * There\'s a bug in this code (see stack trace below).\n'
1553 'Consider specifying which bots to trigger manually or asking your '
1554 'project owners for permissions or contacting Chrome Infra at:\n'
1555 'https://www.chromium.org/infra\n\n' %
1556 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001557 # Still raise exception so that stack trace is printed.
1558 raise
1559
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001560 def _GetGerritHost(self):
1561 # Lazy load of configs.
1562 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001563 if self._gerrit_host and '.' not in self._gerrit_host:
1564 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1565 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001566 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001567 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001568 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001569 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001570 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1571 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001572 return self._gerrit_host
1573
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001574 def _GetGitHost(self):
1575 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001576 remote_url = self.GetRemoteUrl()
1577 if not remote_url:
1578 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001579 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001580
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001581 def GetCodereviewServer(self):
1582 if not self._gerrit_server:
1583 # If we're on a branch then get the server potentially associated
1584 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001585 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001586 self._gerrit_server = self._GitGetBranchConfigValue(
1587 self.CodereviewServerConfigKey())
1588 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001589 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001590 if not self._gerrit_server:
1591 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1592 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001593 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001594 parts[0] = parts[0] + '-review'
1595 self._gerrit_host = '.'.join(parts)
1596 self._gerrit_server = 'https://%s' % self._gerrit_host
1597 return self._gerrit_server
1598
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001599 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001600 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001601 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001602 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001603 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001604 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001605 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001606 if project.endswith('.git'):
1607 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001608 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1609 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1610 # gitiles/git-over-https protocol. E.g.,
1611 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1612 # as
1613 # https://chromium.googlesource.com/v8/v8
1614 if project.startswith('a/'):
1615 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001616 return project
1617
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001618 def _GerritChangeIdentifier(self):
1619 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1620
1621 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001622 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001623 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001624 project = self._GetGerritProject()
1625 if project:
1626 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1627 # Fall back on still unique, but less efficient change number.
1628 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001629
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001630 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001631 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001632 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001633
tandrii5d48c322016-08-18 16:19:37 -07001634 @classmethod
1635 def PatchsetConfigKey(cls):
1636 return 'gerritpatchset'
1637
1638 @classmethod
1639 def CodereviewServerConfigKey(cls):
1640 return 'gerritserver'
1641
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001642 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001643 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001644 if settings.GetGerritSkipEnsureAuthenticated():
1645 # For projects with unusual authentication schemes.
1646 # See http://crbug.com/603378.
1647 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001648
1649 # Check presence of cookies only if using cookies-based auth method.
1650 cookie_auth = gerrit_util.Authenticator.get()
1651 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001652 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001653
Florian Mayerae510e82020-01-30 21:04:48 +00001654 remote_url = self.GetRemoteUrl()
1655 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001656 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001657 return
1658 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001659 logging.warning('Ignoring branch %(branch)s with non-https remote '
1660 '%(remote)s', {
1661 'branch': self.branch,
1662 'remote': self.GetRemoteUrl()
1663 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001664 return
1665
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001666 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001667 self.GetCodereviewServer()
1668 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001669 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001670
1671 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1672 git_auth = cookie_auth.get_auth_header(git_host)
1673 if gerrit_auth and git_auth:
1674 if gerrit_auth == git_auth:
1675 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001676 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001677 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001678 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001679 ' %s\n'
1680 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001681 ' Consider running the following command:\n'
1682 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001683 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001684 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001685 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001686 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001687 cookie_auth.get_new_password_message(git_host)))
1688 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001689 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001690 return
1691 else:
1692 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001693 ([] if gerrit_auth else [self._gerrit_host]) +
1694 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001695 DieWithError('Credentials for the following hosts are required:\n'
1696 ' %s\n'
1697 'These are read from %s (or legacy %s)\n'
1698 '%s' % (
1699 '\n '.join(missing),
1700 cookie_auth.get_gitcookies_path(),
1701 cookie_auth.get_netrc_path(),
1702 cookie_auth.get_new_password_message(git_host)))
1703
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001704 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001705 if not self.GetIssue():
1706 return
1707
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001708 status = self._GetChangeDetail()['status']
1709 if status in ('MERGED', 'ABANDONED'):
1710 DieWithError('Change %s has been %s, new uploads are not allowed' %
1711 (self.GetIssueURL(),
1712 'submitted' if status == 'MERGED' else 'abandoned'))
1713
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001714 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1715 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1716 # Apparently this check is not very important? Otherwise get_auth_email
1717 # could have been added to other implementations of Authenticator.
1718 cookies_auth = gerrit_util.Authenticator.get()
1719 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001720 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001721
1722 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001723 if self.GetIssueOwner() == cookies_user:
1724 return
1725 logging.debug('change %s owner is %s, cookies user is %s',
1726 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001727 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001728 # so ask what Gerrit thinks of this user.
1729 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1730 if details['email'] == self.GetIssueOwner():
1731 return
1732 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001733 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001734 'as %s.\n'
1735 'Uploading may fail due to lack of permissions.' %
1736 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1737 confirm_or_exit(action='upload')
1738
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001739 def _PostUnsetIssueProperties(self):
1740 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001741 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001742
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001743 def GetGerritObjForPresubmit(self):
1744 return presubmit_support.GerritAccessor(self._GetGerritHost())
1745
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001746 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001747 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001748 or CQ status, assuming adherence to a common workflow.
1749
1750 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001751 * 'error' - error from review tool (including deleted issues)
1752 * 'unsent' - no reviewers added
1753 * 'waiting' - waiting for review
1754 * 'reply' - waiting for uploader to reply to review
1755 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001756 * 'dry-run' - dry-running in the CQ
1757 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001758 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001759 """
1760 if not self.GetIssue():
1761 return None
1762
1763 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001764 data = self._GetChangeDetail([
1765 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001766 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001767 return 'error'
1768
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001769 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001770 return 'closed'
1771
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001772 cq_label = data['labels'].get('Commit-Queue', {})
1773 max_cq_vote = 0
1774 for vote in cq_label.get('all', []):
1775 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1776 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001777 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001778 if max_cq_vote == 1:
1779 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001780
Aaron Gable9ab38c62017-04-06 14:36:33 -07001781 if data['labels'].get('Code-Review', {}).get('approved'):
1782 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001783
1784 if not data.get('reviewers', {}).get('REVIEWER', []):
1785 return 'unsent'
1786
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001787 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001788 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001789 while messages:
1790 m = messages.pop()
1791 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001792 # Ignore replies from CQ.
1793 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001794 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001795 # Most recent message was by owner.
1796 return 'waiting'
1797 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001798 # Some reply from non-owner.
1799 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001800
1801 # Somehow there are no messages even though there are reviewers.
1802 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001803
1804 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001805 if not self.GetIssue():
1806 return None
1807
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001808 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001809 patchset = data['revisions'][data['current_revision']]['_number']
1810 self.SetPatchset(patchset)
1811 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001812
Aaron Gable636b13f2017-07-14 10:42:48 -07001813 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001814 gerrit_util.SetReview(
1815 self._GetGerritHost(), self._GerritChangeIdentifier(),
1816 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001817
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001818 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001819 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001820 # CURRENT_REVISION is included to get the latest patchset so that
1821 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001822 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001823 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1824 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001825 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001826 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001827 robot_file_comments = gerrit_util.GetChangeRobotComments(
1828 self._GetGerritHost(), self._GerritChangeIdentifier())
1829
1830 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001831 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001832 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001833 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001834 line_comments = file_comments.setdefault(path, [])
1835 line_comments.extend(
1836 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001837
1838 # Build dictionary of file comments for easy access and sorting later.
1839 # {author+date: {path: {patchset: {line: url+message}}}}
1840 comments = collections.defaultdict(
1841 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001842 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001843 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001844 tag = comment.get('tag', '')
1845 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001846 continue
1847 key = (comment['author']['email'], comment['updated'])
1848 if comment.get('side', 'REVISION') == 'PARENT':
1849 patchset = 'Base'
1850 else:
1851 patchset = 'PS%d' % comment['patch_set']
1852 line = comment.get('line', 0)
1853 url = ('https://%s/c/%s/%s/%s#%s%s' %
1854 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1855 'b' if comment.get('side') == 'PARENT' else '',
1856 str(line) if line else ''))
1857 comments[key][path][patchset][line] = (url, comment['message'])
1858
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001859 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001860 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001861 summary = self._BuildCommentSummary(msg, comments, readable)
1862 if summary:
1863 summaries.append(summary)
1864 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001865
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001866 @staticmethod
1867 def _BuildCommentSummary(msg, comments, readable):
1868 key = (msg['author']['email'], msg['date'])
1869 # Don't bother showing autogenerated messages that don't have associated
1870 # file or line comments. this will filter out most autogenerated
1871 # messages, but will keep robot comments like those from Tricium.
1872 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1873 if is_autogenerated and not comments.get(key):
1874 return None
1875 message = msg['message']
1876 # Gerrit spits out nanoseconds.
1877 assert len(msg['date'].split('.')[-1]) == 9
1878 date = datetime.datetime.strptime(msg['date'][:-3],
1879 '%Y-%m-%d %H:%M:%S.%f')
1880 if key in comments:
1881 message += '\n'
1882 for path, patchsets in sorted(comments.get(key, {}).items()):
1883 if readable:
1884 message += '\n%s' % path
1885 for patchset, lines in sorted(patchsets.items()):
1886 for line, (url, content) in sorted(lines.items()):
1887 if line:
1888 line_str = 'Line %d' % line
1889 path_str = '%s:%d:' % (path, line)
1890 else:
1891 line_str = 'File comment'
1892 path_str = '%s:0:' % path
1893 if readable:
1894 message += '\n %s, %s: %s' % (patchset, line_str, url)
1895 message += '\n %s\n' % content
1896 else:
1897 message += '\n%s ' % path_str
1898 message += '\n%s\n' % content
1899
1900 return _CommentSummary(
1901 date=date,
1902 message=message,
1903 sender=msg['author']['email'],
1904 autogenerated=is_autogenerated,
1905 # These could be inferred from the text messages and correlated with
1906 # Code-Review label maximum, however this is not reliable.
1907 # Leaving as is until the need arises.
1908 approval=False,
1909 disapproval=False,
1910 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001911
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001912 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001913 gerrit_util.AbandonChange(
1914 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001916 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001917 gerrit_util.SubmitChange(
1918 self._GetGerritHost(), self._GerritChangeIdentifier(),
1919 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001920
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001921 def _GetChangeDetail(self, options=None):
1922 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001923 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001924 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001925
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001926 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001927 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001928 options.append('CURRENT_COMMIT')
1929
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001930 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001931 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001932 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001933
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001934 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1935 # Assumption: data fetched before with extra options is suitable
1936 # for return for a smaller set of options.
1937 # For example, if we cached data for
1938 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1939 # and request is for options=[CURRENT_REVISION],
1940 # THEN we can return prior cached data.
1941 if options_set.issubset(cached_options_set):
1942 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001943
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001944 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001945 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001946 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001947 except gerrit_util.GerritError as e:
1948 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001949 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001950 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001951
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001952 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001953 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001954
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001955 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001956 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001957 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001958 data = gerrit_util.GetChangeCommit(
1959 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001960 except gerrit_util.GerritError as e:
1961 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001962 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001963 raise
agable32978d92016-11-01 12:55:02 -07001964 return data
1965
Karen Qian40c19422019-03-13 21:28:29 +00001966 def _IsCqConfigured(self):
1967 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001968 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001969
Olivier Robin75ee7252018-04-13 10:02:56 +02001970 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001971 if git_common.is_dirty_git_tree('land'):
1972 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001973
tandriid60367b2016-06-22 05:25:12 -07001974 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001975 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001976 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001977 'which can test and land changes for you. '
1978 'Are you sure you wish to bypass it?\n',
1979 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001980 differs = True
tandriic4344b52016-08-29 06:04:54 -07001981 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001982 # Note: git diff outputs nothing if there is no diff.
1983 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001984 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001985 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001986 if detail['current_revision'] == last_upload:
1987 differs = False
1988 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001989 print('WARNING: Local branch contents differ from latest uploaded '
1990 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001991 if differs:
1992 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001993 confirm_or_exit(
1994 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1995 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001996 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001997 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001998 upstream = self.GetCommonAncestorWithUpstream()
1999 if self.GetIssue():
2000 description = self.FetchDescription()
2001 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002002 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002003 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002004 committing=True,
2005 may_prompt=not force,
2006 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002007 parallel=parallel,
2008 upstream=upstream,
2009 description=description,
2010 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002011
2012 self.SubmitIssue(wait_for_merge=True)
2013 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002014 links = self._GetChangeCommit().get('web_links', [])
2015 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002016 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002017 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002018 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002019 return 0
2020
Edward Lemurf38bc172019-09-03 21:02:13 +00002021 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002022 assert parsed_issue_arg.valid
2023
Edward Lemur125d60a2019-09-13 18:25:41 +00002024 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002025
2026 if parsed_issue_arg.hostname:
2027 self._gerrit_host = parsed_issue_arg.hostname
2028 self._gerrit_server = 'https://%s' % self._gerrit_host
2029
tandriic2405f52016-10-10 08:13:15 -07002030 try:
2031 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002032 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002033 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002034
2035 if not parsed_issue_arg.patchset:
2036 # Use current revision by default.
2037 revision_info = detail['revisions'][detail['current_revision']]
2038 patchset = int(revision_info['_number'])
2039 else:
2040 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002041 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002042 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2043 break
2044 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002045 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002046 (parsed_issue_arg.patchset, self.GetIssue()))
2047
Edward Lemur125d60a2019-09-13 18:25:41 +00002048 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002049 if remote_url.endswith('.git'):
2050 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002051 remote_url = remote_url.rstrip('/')
2052
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002053 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002054 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002055
2056 if remote_url != fetch_info['url']:
2057 DieWithError('Trying to patch a change from %s but this repo appears '
2058 'to be %s.' % (fetch_info['url'], remote_url))
2059
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002060 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002061
Aaron Gable62619a32017-06-16 08:22:09 -07002062 if force:
2063 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2064 print('Checked out commit for change %i patchset %i locally' %
2065 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002066 elif nocommit:
2067 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2068 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002069 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002070 RunGit(['cherry-pick', 'FETCH_HEAD'])
2071 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002072 (parsed_issue_arg.issue, patchset))
2073 print('Note: this created a local commit which does not have '
2074 'the same hash as the one uploaded for review. This will make '
2075 'uploading changes based on top of this branch difficult.\n'
2076 'If you want to do that, use "git cl patch --force" instead.')
2077
Stefan Zagerd08043c2017-10-12 12:07:02 -07002078 if self.GetBranch():
2079 self.SetIssue(parsed_issue_arg.issue)
2080 self.SetPatchset(patchset)
2081 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2082 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2083 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2084 else:
2085 print('WARNING: You are in detached HEAD state.\n'
2086 'The patch has been applied to your checkout, but you will not be '
2087 'able to upload a new patch set to the gerrit issue.\n'
2088 'Try using the \'-b\' option if you would like to work on a '
2089 'branch and/or upload a new patch set.')
2090
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002091 return 0
2092
tandrii16e0b4e2016-06-07 10:34:28 -07002093 def _GerritCommitMsgHookCheck(self, offer_removal):
2094 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2095 if not os.path.exists(hook):
2096 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002097 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2098 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002099 data = gclient_utils.FileRead(hook)
2100 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2101 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002102 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002103 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002104 'and may interfere with it in subtle ways.\n'
2105 'We recommend you remove the commit-msg hook.')
2106 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002107 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002108 gclient_utils.rm_file_or_tree(hook)
2109 print('Gerrit commit-msg hook removed.')
2110 else:
2111 print('OK, will keep Gerrit commit-msg hook in place.')
2112
Edward Lemur1b52d872019-05-09 21:12:12 +00002113 def _CleanUpOldTraces(self):
2114 """Keep only the last |MAX_TRACES| traces."""
2115 try:
2116 traces = sorted([
2117 os.path.join(TRACES_DIR, f)
2118 for f in os.listdir(TRACES_DIR)
2119 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2120 and not f.startswith('tmp'))
2121 ])
2122 traces_to_delete = traces[:-MAX_TRACES]
2123 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002124 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002125 except OSError:
2126 print('WARNING: Failed to remove old git traces from\n'
2127 ' %s'
2128 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002129
Edward Lemur5737f022019-05-17 01:24:00 +00002130 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002131 """Zip and write the git push traces stored in traces_dir."""
2132 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002133 traces_zip = trace_name + '-traces'
2134 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002135 # Create a temporary dir to store git config and gitcookies in. It will be
2136 # compressed and stored next to the traces.
2137 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002138 git_info_zip = trace_name + '-git-info'
2139
Edward Lemur5737f022019-05-17 01:24:00 +00002140 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002141 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002142 git_push_metadata['now'] = git_push_metadata['now'].decode(
2143 sys.stdin.encoding)
2144
Edward Lemur1b52d872019-05-09 21:12:12 +00002145 git_push_metadata['trace_name'] = trace_name
2146 gclient_utils.FileWrite(
2147 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2148
2149 # Keep only the first 6 characters of the git hashes on the packet
2150 # trace. This greatly decreases size after compression.
2151 packet_traces = os.path.join(traces_dir, 'trace-packet')
2152 if os.path.isfile(packet_traces):
2153 contents = gclient_utils.FileRead(packet_traces)
2154 gclient_utils.FileWrite(
2155 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2156 shutil.make_archive(traces_zip, 'zip', traces_dir)
2157
2158 # Collect and compress the git config and gitcookies.
2159 git_config = RunGit(['config', '-l'])
2160 gclient_utils.FileWrite(
2161 os.path.join(git_info_dir, 'git-config'),
2162 git_config)
2163
2164 cookie_auth = gerrit_util.Authenticator.get()
2165 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2166 gitcookies_path = cookie_auth.get_gitcookies_path()
2167 if os.path.isfile(gitcookies_path):
2168 gitcookies = gclient_utils.FileRead(gitcookies_path)
2169 gclient_utils.FileWrite(
2170 os.path.join(git_info_dir, 'gitcookies'),
2171 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2172 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2173
Edward Lemur1b52d872019-05-09 21:12:12 +00002174 gclient_utils.rmtree(git_info_dir)
2175
2176 def _RunGitPushWithTraces(
2177 self, change_desc, refspec, refspec_opts, git_push_metadata):
2178 """Run git push and collect the traces resulting from the execution."""
2179 # Create a temporary directory to store traces in. Traces will be compressed
2180 # and stored in a 'traces' dir inside depot_tools.
2181 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002182 trace_name = os.path.join(
2183 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002184
2185 env = os.environ.copy()
2186 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2187 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002188 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002189 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2190 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2191 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2192
2193 try:
2194 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002195 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002196 before_push = time_time()
2197 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002198 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002199 env=env,
2200 print_stdout=True,
2201 # Flush after every line: useful for seeing progress when running as
2202 # recipe.
2203 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002204 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002205 except subprocess2.CalledProcessError as e:
2206 push_returncode = e.returncode
2207 DieWithError('Failed to create a change. Please examine output above '
2208 'for the reason of the failure.\n'
2209 'Hint: run command below to diagnose common Git/Gerrit '
2210 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002211 ' git cl creds-check\n'
2212 '\n'
2213 'If git-cl is not working correctly, file a bug under the '
2214 'Infra>SDK component including the files below.\n'
2215 'Review the files before upload, since they might contain '
2216 'sensitive information.\n'
2217 'Set the Restrict-View-Google label so that they are not '
2218 'publicly accessible.\n'
2219 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002220 change_desc)
2221 finally:
2222 execution_time = time_time() - before_push
2223 metrics.collector.add_repeated('sub_commands', {
2224 'command': 'git push',
2225 'execution_time': execution_time,
2226 'exit_code': push_returncode,
2227 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2228 })
2229
Edward Lemur1b52d872019-05-09 21:12:12 +00002230 git_push_metadata['execution_time'] = execution_time
2231 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002232 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002233
Edward Lemur1b52d872019-05-09 21:12:12 +00002234 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002235 gclient_utils.rmtree(traces_dir)
2236
2237 return push_stdout
2238
Edward Lemura12175c2020-03-09 16:58:26 +00002239 def CMDUploadChange(
Edward Lesmesc48fb842020-03-13 23:05:55 +00002240 self, options, git_diff_args, custom_cl_base, message):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002241 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002242 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002243 # Load default for user, repo, squash=true, in this order.
2244 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002245
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002246 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002247 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Edward Lesmesc48fb842020-03-13 23:05:55 +00002248 # This may be None; default fallback value is determined in logic below.
2249 title = options.title
2250
2251 # Extract bug number from branch name.
2252 bug = options.bug
2253 fixed = options.fixed
2254 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2255 self.GetBranch())
2256 if not bug and not fixed and match:
2257 if match.group('type') == 'bug':
2258 bug = match.group('bugnum')
2259 else:
2260 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002261
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002262 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002263 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002264 if self.GetIssue():
Edward Lesmesc48fb842020-03-13 23:05:55 +00002265 if not title:
2266 if options.message:
2267 # When uploading a subsequent patchset, -m|--message is taken
2268 # as the patchset title if --title was not provided.
2269 title = options.message.strip()
2270 else:
2271 default_title = RunGit(
2272 ['show', '-s', '--format=%s', 'HEAD']).strip()
2273 if options.force:
2274 title = default_title
2275 else:
2276 title = ask_for_data(
2277 'Title for patchset [%s]: ' % default_title) or default_title
2278
Josipe827b0f2020-01-30 00:07:20 +00002279 # User requested to change description
2280 if options.edit_description:
Edward Lesmesc48fb842020-03-13 23:05:55 +00002281 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Josipe827b0f2020-01-30 00:07:20 +00002282 change_desc.prompt()
Edward Lesmesc48fb842020-03-13 23:05:55 +00002283 message = change_desc.description
2284
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 change_id = self._GetChangeDetail()['change_id']
Edward Lesmesc48fb842020-03-13 23:05:55 +00002286
2287 # Make sure that the Change-Id in the description matches the one
2288 # fetched from Gerrit.
2289 footer_change_ids = git_footers.get_footer_change_id(message)
2290 if footer_change_ids != [change_id]:
2291 if footer_change_ids:
2292 # Remove any existing Change-Id footers since they don't match the
2293 # expected change_id footer.
2294 message = git_footers.remove_footer(message, 'Change-Id')
2295 # Add the expected Change-Id footer.
2296 message = git_footers.add_footer_change_id(message, change_id)
2297 print('WARNING: Change-Id has been set to Change-Id fetched from '
2298 'Gerrit. Use `git cl issue 0` if you want to clear it and '
2299 'set a new one.')
2300 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002301 else: # if not self.GetIssue()
Edward Lesmesc48fb842020-03-13 23:05:55 +00002302 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002303 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002304 change_desc.prompt()
Edward Lesmesc48fb842020-03-13 23:05:55 +00002305
2306 # On first upload, patchset title is always this string, while
2307 # --title flag gets converted to first line of message.
2308 title = 'Initial upload'
2309 if not change_desc.description:
2310 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002311 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lesmesc48fb842020-03-13 23:05:55 +00002312 if len(change_ids) > 1:
2313 DieWithError('too many Change-Id footers, at most 1 allowed.')
2314 if not change_ids:
2315 # Generate the Change-Id automatically.
2316 change_desc.set_description(git_footers.add_footer_change_id(
2317 change_desc.description,
2318 GenerateGerritChangeId(change_desc.description)))
2319 change_ids = git_footers.get_footer_change_id(change_desc.description)
2320 assert len(change_ids) == 1
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002321 change_id = change_ids[0]
2322
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002323 if options.preserve_tryjobs:
2324 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002325
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002326 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lesmesc48fb842020-03-13 23:05:55 +00002327 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2328 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002329 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002330 with gclient_utils.temporary_file() as desc_tempfile:
2331 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2332 ref_to_push = RunGit(
2333 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002334 else: # if not options.squash
Edward Lesmesc48fb842020-03-13 23:05:55 +00002335 change_desc = ChangeDescription(message)
2336 if not change_desc.description:
2337 DieWithError("Description is empty. Aborting...")
2338
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002339 if not git_footers.get_footer_change_id(change_desc.description):
2340 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002341 change_desc.set_description(
Edward Lesmesc48fb842020-03-13 23:05:55 +00002342 self._AddChangeIdToCommitMessage(message, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002343 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002344 # For no-squash mode, we assume the remote called "origin" is the one we
2345 # want. It is not worthwhile to support different workflows for
2346 # no-squash mode.
2347 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002348 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2349
Edward Lesmesc48fb842020-03-13 23:05:55 +00002350 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002351 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002352 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2353 ref_to_push)]).splitlines()
2354 if len(commits) > 1:
2355 print('WARNING: This will upload %d commits. Run the following command '
2356 'to see which commits will be uploaded: ' % len(commits))
2357 print('git log %s..%s' % (parent, ref_to_push))
2358 print('You can also use `git squash-branch` to squash these into a '
2359 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002360 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002361
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002362 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002363 cc = []
2364 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2365 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2366 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002367 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002368 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002369 if options.cc:
2370 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002371 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002372 if change_desc.get_cced():
2373 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002374 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2375 valid_accounts = set(reviewers + cc)
2376 # TODO(crbug/877717): relax this for all hosts.
2377 else:
2378 valid_accounts = gerrit_util.ValidAccounts(
2379 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002380 logging.info('accounts %s are recognized, %s invalid',
2381 sorted(valid_accounts),
2382 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002383
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002384 # Extra options that can be specified at push time. Doc:
2385 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002386 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002387
Aaron Gable844cf292017-06-28 11:32:59 -07002388 # By default, new changes are started in WIP mode, and subsequent patchsets
2389 # don't send email. At any time, passing --send-mail will mark the change
2390 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002391 if options.send_mail:
2392 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002393 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002394 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002395 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002396 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002397 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002398
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002399 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002400 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002401
Aaron Gable9b713dd2016-12-14 16:04:21 -08002402 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002403 # Punctuation and whitespace in |title| must be percent-encoded.
2404 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002405
agablec6787972016-09-09 16:13:34 -07002406 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002407 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002408
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002409 for r in sorted(reviewers):
2410 if r in valid_accounts:
2411 refspec_opts.append('r=%s' % r)
2412 reviewers.remove(r)
2413 else:
2414 # TODO(tandrii): this should probably be a hard failure.
2415 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2416 % r)
2417 for c in sorted(cc):
2418 # refspec option will be rejected if cc doesn't correspond to an
2419 # account, even though REST call to add such arbitrary cc may succeed.
2420 if c in valid_accounts:
2421 refspec_opts.append('cc=%s' % c)
2422 cc.remove(c)
2423
rmistry9eadede2016-09-19 11:22:43 -07002424 if options.topic:
2425 # Documentation on Gerrit topics is here:
2426 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002427 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002428
Edward Lemur687ca902018-12-05 02:30:30 +00002429 if options.enable_auto_submit:
2430 refspec_opts.append('l=Auto-Submit+1')
2431 if options.use_commit_queue:
2432 refspec_opts.append('l=Commit-Queue+2')
2433 elif options.cq_dry_run:
2434 refspec_opts.append('l=Commit-Queue+1')
2435
2436 if change_desc.get_reviewers(tbr_only=True):
2437 score = gerrit_util.GetCodeReviewTbrScore(
2438 self._GetGerritHost(),
2439 self._GetGerritProject())
2440 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002441
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002442 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002443 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002444 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002445 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002446 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2447
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002448 refspec_suffix = ''
2449 if refspec_opts:
2450 refspec_suffix = '%' + ','.join(refspec_opts)
2451 assert ' ' not in refspec_suffix, (
2452 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2453 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2454
Edward Lemur1b52d872019-05-09 21:12:12 +00002455 git_push_metadata = {
2456 'gerrit_host': self._GetGerritHost(),
2457 'title': title or '<untitled>',
2458 'change_id': change_id,
2459 'description': change_desc.description,
2460 }
2461 push_stdout = self._RunGitPushWithTraces(
2462 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002463
2464 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002465 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002466 change_numbers = [m.group(1)
2467 for m in map(regex.match, push_stdout.splitlines())
2468 if m]
2469 if len(change_numbers) != 1:
2470 DieWithError(
2471 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002472 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002473 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002474 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002475
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002476 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002477 # GetIssue() is not set in case of non-squash uploads according to tests.
2478 # TODO(agable): non-squash uploads in git cl should be removed.
2479 gerrit_util.AddReviewers(
2480 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002481 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002482 reviewers, cc,
2483 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002484
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002485 return 0
2486
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002487 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2488 change_desc):
2489 """Computes parent of the generated commit to be uploaded to Gerrit.
2490
2491 Returns revision or a ref name.
2492 """
2493 if custom_cl_base:
2494 # Try to avoid creating additional unintended CLs when uploading, unless
2495 # user wants to take this risk.
2496 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2497 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2498 local_ref_of_target_remote])
2499 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002500 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002501 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2502 'If you proceed with upload, more than 1 CL may be created by '
2503 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2504 'If you are certain that specified base `%s` has already been '
2505 'uploaded to Gerrit as another CL, you may proceed.\n' %
2506 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2507 if not force:
2508 confirm_or_exit(
2509 'Do you take responsibility for cleaning up potential mess '
2510 'resulting from proceeding with upload?',
2511 action='upload')
2512 return custom_cl_base
2513
Aaron Gablef97e33d2017-03-30 15:44:27 -07002514 if remote != '.':
2515 return self.GetCommonAncestorWithUpstream()
2516
2517 # If our upstream branch is local, we base our squashed commit on its
2518 # squashed version.
2519 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2520
Aaron Gablef97e33d2017-03-30 15:44:27 -07002521 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002522 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002523
2524 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002525 # TODO(tandrii): consider checking parent change in Gerrit and using its
2526 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2527 # the tree hash of the parent branch. The upside is less likely bogus
2528 # requests to reupload parent change just because it's uploadhash is
2529 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002530 parent = RunGit(['config',
2531 'branch.%s.gerritsquashhash' % upstream_branch_name],
2532 error_ok=True).strip()
2533 # Verify that the upstream branch has been uploaded too, otherwise
2534 # Gerrit will create additional CLs when uploading.
2535 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2536 RunGitSilent(['rev-parse', parent + ':'])):
2537 DieWithError(
2538 '\nUpload upstream branch %s first.\n'
2539 'It is likely that this branch has been rebased since its last '
2540 'upload, so you just need to upload it again.\n'
2541 '(If you uploaded it with --no-squash, then branch dependencies '
2542 'are not supported, and you should reupload with --squash.)'
2543 % upstream_branch_name,
2544 change_desc)
2545 return parent
2546
Edward Lemura12175c2020-03-09 16:58:26 +00002547 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002548 """Re-commits using the current message, assumes the commit hook is in
2549 place.
2550 """
Edward Lemura12175c2020-03-09 16:58:26 +00002551 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002552 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002553 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002554 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002555 return new_log_desc
2556 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002557 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002558
tandriie113dfd2016-10-11 10:20:12 -07002559 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002560 try:
2561 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002562 except GerritChangeNotExists:
2563 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002564
2565 if data['status'] in ('ABANDONED', 'MERGED'):
2566 return 'CL %s is closed' % self.GetIssue()
2567
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002568 def GetGerritChange(self, patchset=None):
2569 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002570 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002571 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002572 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002573 data = self._GetChangeDetail(['ALL_REVISIONS'])
2574
2575 assert host and issue and patchset, 'CL must be uploaded first'
2576
2577 has_patchset = any(
2578 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002579 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002580 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002581 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002582 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002583
tandrii8c5a3532016-11-04 07:52:02 -07002584 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002585 'host': host,
2586 'change': issue,
2587 'project': data['project'],
2588 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002589 }
tandriie113dfd2016-10-11 10:20:12 -07002590
tandriide281ae2016-10-12 06:02:30 -07002591 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002592 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002593
Edward Lemur707d70b2018-02-07 00:50:14 +01002594 def GetReviewers(self):
2595 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002596 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002597
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002598
tandriif9aefb72016-07-01 09:06:51 -07002599def _get_bug_line_values(default_project, bugs):
2600 """Given default_project and comma separated list of bugs, yields bug line
2601 values.
2602
2603 Each bug can be either:
2604 * a number, which is combined with default_project
2605 * string, which is left as is.
2606
2607 This function may produce more than one line, because bugdroid expects one
2608 project per line.
2609
2610 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2611 ['v8:123', 'chromium:789']
2612 """
2613 default_bugs = []
2614 others = []
2615 for bug in bugs.split(','):
2616 bug = bug.strip()
2617 if bug:
2618 try:
2619 default_bugs.append(int(bug))
2620 except ValueError:
2621 others.append(bug)
2622
2623 if default_bugs:
2624 default_bugs = ','.join(map(str, default_bugs))
2625 if default_project:
2626 yield '%s:%s' % (default_project, default_bugs)
2627 else:
2628 yield default_bugs
2629 for other in sorted(others):
2630 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2631 yield other
2632
2633
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002634class ChangeDescription(object):
2635 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002636 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002637 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002638 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002639 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002640 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002641 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2642 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002643 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002644 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002645
Dan Beamd8b04ca2019-10-10 21:23:26 +00002646 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002647 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002648 if bug:
2649 regexp = re.compile(self.BUG_LINE)
2650 prefix = settings.GetBugPrefix()
2651 if not any((regexp.match(line) for line in self._description_lines)):
2652 values = list(_get_bug_line_values(prefix, bug))
2653 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002654 if fixed:
2655 regexp = re.compile(self.FIXED_LINE)
2656 prefix = settings.GetBugPrefix()
2657 if not any((regexp.match(line) for line in self._description_lines)):
2658 values = list(_get_bug_line_values(prefix, fixed))
2659 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002660
agable@chromium.org42c20792013-09-12 17:34:49 +00002661 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002662 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002663 return '\n'.join(self._description_lines)
2664
2665 def set_description(self, desc):
2666 if isinstance(desc, basestring):
2667 lines = desc.splitlines()
2668 else:
2669 lines = [line.rstrip() for line in desc]
2670 while lines and not lines[0]:
2671 lines.pop(0)
2672 while lines and not lines[-1]:
2673 lines.pop(-1)
2674 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002675
Edward Lemur2c62b332020-03-12 22:12:33 +00002676 def update_reviewers(
2677 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002678 """Rewrites the R=/TBR= line(s) as a single line each.
2679
2680 Args:
2681 reviewers (list(str)) - list of additional emails to use for reviewers.
2682 tbrs (list(str)) - list of additional emails to use for TBRs.
2683 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2684 the change that are missing OWNER coverage. If this is not None, you
2685 must also pass a value for `change`.
2686 change (Change) - The Change that should be used for OWNERS lookups.
2687 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002688 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002689 assert isinstance(tbrs, list), tbrs
2690
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002691 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002692 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002693
2694 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002695 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002696
2697 reviewers = set(reviewers)
2698 tbrs = set(tbrs)
2699 LOOKUP = {
2700 'TBR': tbrs,
2701 'R': reviewers,
2702 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002703
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002704 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002705 regexp = re.compile(self.R_LINE)
2706 matches = [regexp.match(line) for line in self._description_lines]
2707 new_desc = [l for i, l in enumerate(self._description_lines)
2708 if not matches[i]]
2709 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002710
agable@chromium.org42c20792013-09-12 17:34:49 +00002711 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002712
2713 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002714 for match in matches:
2715 if not match:
2716 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002717 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2718
2719 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002720 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002721 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002722 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002723 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002724 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002725 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002726 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002727
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002728 # If any folks ended up in both groups, remove them from tbrs.
2729 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002730
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002731 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2732 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002733
2734 # Put the new lines in the description where the old first R= line was.
2735 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2736 if 0 <= line_loc < len(self._description_lines):
2737 if new_tbr_line:
2738 self._description_lines.insert(line_loc, new_tbr_line)
2739 if new_r_line:
2740 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002741 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002742 if new_r_line:
2743 self.append_footer(new_r_line)
2744 if new_tbr_line:
2745 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002746
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002747 def set_preserve_tryjobs(self):
2748 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2749 footers = git_footers.parse_footers(self.description)
2750 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2751 if v.lower() == 'true':
2752 return
2753 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2754
Anthony Polito8b955342019-09-24 19:01:36 +00002755 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002756 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002757 self.set_description([
2758 '# Enter a description of the change.',
2759 '# This will be displayed on the codereview site.',
2760 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002761 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002762 '--------------------',
2763 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002764 bug_regexp = re.compile(self.BUG_LINE)
2765 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002766 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002767 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2768 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002769 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002770
agable@chromium.org42c20792013-09-12 17:34:49 +00002771 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002772 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002773 if not content:
2774 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002775 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002776
Bruce Dawson2377b012018-01-11 16:46:49 -08002777 # Strip off comments and default inserted "Bug:" line.
2778 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002779 (line.startswith('#') or
2780 line.rstrip() == "Bug:" or
2781 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002782 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002783 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002784 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002785
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002786 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002787 """Adds a footer line to the description.
2788
2789 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2790 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2791 that Gerrit footers are always at the end.
2792 """
2793 parsed_footer_line = git_footers.parse_footer(line)
2794 if parsed_footer_line:
2795 # Line is a gerrit footer in the form: Footer-Key: any value.
2796 # Thus, must be appended observing Gerrit footer rules.
2797 self.set_description(
2798 git_footers.add_footer(self.description,
2799 key=parsed_footer_line[0],
2800 value=parsed_footer_line[1]))
2801 return
2802
2803 if not self._description_lines:
2804 self._description_lines.append(line)
2805 return
2806
2807 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2808 if gerrit_footers:
2809 # git_footers.split_footers ensures that there is an empty line before
2810 # actual (gerrit) footers, if any. We have to keep it that way.
2811 assert top_lines and top_lines[-1] == ''
2812 top_lines, separator = top_lines[:-1], top_lines[-1:]
2813 else:
2814 separator = [] # No need for separator if there are no gerrit_footers.
2815
2816 prev_line = top_lines[-1] if top_lines else ''
2817 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2818 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2819 top_lines.append('')
2820 top_lines.append(line)
2821 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002822
tandrii99a72f22016-08-17 14:33:24 -07002823 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002824 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002825 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002826 reviewers = [match.group(2).strip()
2827 for match in matches
2828 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002829 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002830
bradnelsond975b302016-10-23 12:20:23 -07002831 def get_cced(self):
2832 """Retrieves the list of reviewers."""
2833 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2834 cced = [match.group(2).strip() for match in matches if match]
2835 return cleanup_list(cced)
2836
Nodir Turakulov23b82142017-11-16 11:04:25 -08002837 def get_hash_tags(self):
2838 """Extracts and sanitizes a list of Gerrit hashtags."""
2839 subject = (self._description_lines or ('',))[0]
2840 subject = re.sub(
2841 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2842
2843 tags = []
2844 start = 0
2845 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2846 while True:
2847 m = bracket_exp.match(subject, start)
2848 if not m:
2849 break
2850 tags.append(self.sanitize_hash_tag(m.group(1)))
2851 start = m.end()
2852
2853 if not tags:
2854 # Try "Tag: " prefix.
2855 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2856 if m:
2857 tags.append(self.sanitize_hash_tag(m.group(1)))
2858 return tags
2859
2860 @classmethod
2861 def sanitize_hash_tag(cls, tag):
2862 """Returns a sanitized Gerrit hash tag.
2863
2864 A sanitized hashtag can be used as a git push refspec parameter value.
2865 """
2866 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2867
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002868 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2869 """Updates this commit description given the parent.
2870
2871 This is essentially what Gnumbd used to do.
2872 Consult https://goo.gl/WMmpDe for more details.
2873 """
2874 assert parent_msg # No, orphan branch creation isn't supported.
2875 assert parent_hash
2876 assert dest_ref
2877 parent_footer_map = git_footers.parse_footers(parent_msg)
2878 # This will also happily parse svn-position, which GnumbD is no longer
2879 # supporting. While we'd generate correct footers, the verifier plugin
2880 # installed in Gerrit will block such commit (ie git push below will fail).
2881 parent_position = git_footers.get_position(parent_footer_map)
2882
2883 # Cherry-picks may have last line obscuring their prior footers,
2884 # from git_footers perspective. This is also what Gnumbd did.
2885 cp_line = None
2886 if (self._description_lines and
2887 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2888 cp_line = self._description_lines.pop()
2889
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002890 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002891
2892 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2893 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002894 for i, line in enumerate(footer_lines):
2895 k, v = git_footers.parse_footer(line) or (None, None)
2896 if k and k.startswith('Cr-'):
2897 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002898
2899 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002900 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002901 if parent_position[0] == dest_ref:
2902 # Same branch as parent.
2903 number = int(parent_position[1]) + 1
2904 else:
2905 number = 1 # New branch, and extra lineage.
2906 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2907 int(parent_position[1])))
2908
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002909 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2910 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002911
2912 self._description_lines = top_lines
2913 if cp_line:
2914 self._description_lines.append(cp_line)
2915 if self._description_lines[-1] != '':
2916 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002917 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002918
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002919
Aaron Gablea1bab272017-04-11 16:38:18 -07002920def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002921 """Retrieves the reviewers that approved a CL from the issue properties with
2922 messages.
2923
2924 Note that the list may contain reviewers that are not committer, thus are not
2925 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002926
2927 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002928 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002929 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002930 return sorted(
2931 set(
2932 message['sender']
2933 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07002934 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002935 )
2936 )
2937
2938
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002939def FindCodereviewSettingsFile(filename='codereview.settings'):
2940 """Finds the given file starting in the cwd and going up.
2941
2942 Only looks up to the top of the repository unless an
2943 'inherit-review-settings-ok' file exists in the root of the repository.
2944 """
2945 inherit_ok_file = 'inherit-review-settings-ok'
2946 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002947 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002948 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2949 root = '/'
2950 while True:
2951 if filename in os.listdir(cwd):
2952 if os.path.isfile(os.path.join(cwd, filename)):
2953 return open(os.path.join(cwd, filename))
2954 if cwd == root:
2955 break
2956 cwd = os.path.dirname(cwd)
2957
2958
2959def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002960 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002961 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002962
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002963 def SetProperty(name, setting, unset_error_ok=False):
2964 fullname = 'rietveld.' + name
2965 if setting in keyvals:
2966 RunGit(['config', fullname, keyvals[setting]])
2967 else:
2968 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2969
tandrii48df5812016-10-17 03:55:37 -07002970 if not keyvals.get('GERRIT_HOST', False):
2971 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002972 # Only server setting is required. Other settings can be absent.
2973 # In that case, we ignore errors raised during option deletion attempt.
2974 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2975 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2976 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002977 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002978 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2979 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002980 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2981 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002982 SetProperty(
2983 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002984
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002985 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002986 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002987
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002988 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07002989 RunGit(['config', 'gerrit.squash-uploads',
2990 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002991
tandrii@chromium.org28253532016-04-14 13:46:56 +00002992 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002993 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002994 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2995
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002996 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002997 # should be of the form
2998 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2999 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003000 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3001 keyvals['ORIGIN_URL_CONFIG']])
3002
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003003
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003004def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003005 """Downloads a network object to a local file, like urllib.urlretrieve.
3006
3007 This is necessary because urllib is broken for SSL connections via a proxy.
3008 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003009 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003010 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003011
3012
ukai@chromium.org712d6102013-11-27 00:52:58 +00003013def hasSheBang(fname):
3014 """Checks fname is a #! script."""
3015 with open(fname) as f:
3016 return f.read(2).startswith('#!')
3017
3018
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003019# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3020def DownloadHooks(*args, **kwargs):
3021 pass
3022
3023
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003024def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003025 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003026
3027 Args:
3028 force: True to update hooks. False to install hooks if not present.
3029 """
3030 if not settings.GetIsGerrit():
3031 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003032 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003033 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3034 if not os.access(dst, os.X_OK):
3035 if os.path.exists(dst):
3036 if not force:
3037 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003038 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003039 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003040 if not hasSheBang(dst):
3041 DieWithError('Not a script: %s\n'
3042 'You need to download from\n%s\n'
3043 'into .git/hooks/commit-msg and '
3044 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003045 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3046 except Exception:
3047 if os.path.exists(dst):
3048 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003049 DieWithError('\nFailed to download hooks.\n'
3050 'You need to download from\n%s\n'
3051 'into .git/hooks/commit-msg and '
3052 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003053
3054
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003055class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003056 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003057
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003058 _GOOGLESOURCE = 'googlesource.com'
3059
3060 def __init__(self):
3061 # Cached list of [host, identity, source], where source is either
3062 # .gitcookies or .netrc.
3063 self._all_hosts = None
3064
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003065 def ensure_configured_gitcookies(self):
3066 """Runs checks and suggests fixes to make git use .gitcookies from default
3067 path."""
3068 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3069 configured_path = RunGitSilent(
3070 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003071 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003072 if configured_path:
3073 self._ensure_default_gitcookies_path(configured_path, default)
3074 else:
3075 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003076
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003077 @staticmethod
3078 def _ensure_default_gitcookies_path(configured_path, default_path):
3079 assert configured_path
3080 if configured_path == default_path:
3081 print('git is already configured to use your .gitcookies from %s' %
3082 configured_path)
3083 return
3084
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003085 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003086 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3087 (configured_path, default_path))
3088
3089 if not os.path.exists(configured_path):
3090 print('However, your configured .gitcookies file is missing.')
3091 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3092 action='reconfigure')
3093 RunGit(['config', '--global', 'http.cookiefile', default_path])
3094 return
3095
3096 if os.path.exists(default_path):
3097 print('WARNING: default .gitcookies file already exists %s' %
3098 default_path)
3099 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3100 default_path)
3101
3102 confirm_or_exit('Move existing .gitcookies to default location?',
3103 action='move')
3104 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003105 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003106 print('Moved and reconfigured git to use .gitcookies from %s' %
3107 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003108
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003109 @staticmethod
3110 def _configure_gitcookies_path(default_path):
3111 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3112 if os.path.exists(netrc_path):
3113 print('You seem to be using outdated .netrc for git credentials: %s' %
3114 netrc_path)
3115 print('This tool will guide you through setting up recommended '
3116 '.gitcookies store for git credentials.\n'
3117 '\n'
3118 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3119 ' git config --global --unset http.cookiefile\n'
3120 ' mv %s %s.backup\n\n' % (default_path, default_path))
3121 confirm_or_exit(action='setup .gitcookies')
3122 RunGit(['config', '--global', 'http.cookiefile', default_path])
3123 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003124
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003125 def get_hosts_with_creds(self, include_netrc=False):
3126 if self._all_hosts is None:
3127 a = gerrit_util.CookiesAuthenticator()
3128 self._all_hosts = [
3129 (h, u, s)
3130 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003131 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3132 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003133 )
3134 if h.endswith(self._GOOGLESOURCE)
3135 ]
3136
3137 if include_netrc:
3138 return self._all_hosts
3139 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3140
3141 def print_current_creds(self, include_netrc=False):
3142 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3143 if not hosts:
3144 print('No Git/Gerrit credentials found')
3145 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003146 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003147 header = [('Host', 'User', 'Which file'),
3148 ['=' * l for l in lengths]]
3149 for row in (header + hosts):
3150 print('\t'.join((('%%+%ds' % l) % s)
3151 for l, s in zip(lengths, row)))
3152
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003153 @staticmethod
3154 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003155 """Parses identity "git-<username>.domain" into <username> and domain."""
3156 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003157 # distinguishable from sub-domains. But we do know typical domains:
3158 if identity.endswith('.chromium.org'):
3159 domain = 'chromium.org'
3160 username = identity[:-len('.chromium.org')]
3161 else:
3162 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003163 if username.startswith('git-'):
3164 username = username[len('git-'):]
3165 return username, domain
3166
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003167 def _canonical_git_googlesource_host(self, host):
3168 """Normalizes Gerrit hosts (with '-review') to Git host."""
3169 assert host.endswith(self._GOOGLESOURCE)
3170 # Prefix doesn't include '.' at the end.
3171 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3172 if prefix.endswith('-review'):
3173 prefix = prefix[:-len('-review')]
3174 return prefix + '.' + self._GOOGLESOURCE
3175
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003176 def _canonical_gerrit_googlesource_host(self, host):
3177 git_host = self._canonical_git_googlesource_host(host)
3178 prefix = git_host.split('.', 1)[0]
3179 return prefix + '-review.' + self._GOOGLESOURCE
3180
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003181 def _get_counterpart_host(self, host):
3182 assert host.endswith(self._GOOGLESOURCE)
3183 git = self._canonical_git_googlesource_host(host)
3184 gerrit = self._canonical_gerrit_googlesource_host(git)
3185 return git if gerrit == host else gerrit
3186
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003187 def has_generic_host(self):
3188 """Returns whether generic .googlesource.com has been configured.
3189
3190 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3191 """
3192 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3193 if host == '.' + self._GOOGLESOURCE:
3194 return True
3195 return False
3196
3197 def _get_git_gerrit_identity_pairs(self):
3198 """Returns map from canonic host to pair of identities (Git, Gerrit).
3199
3200 One of identities might be None, meaning not configured.
3201 """
3202 host_to_identity_pairs = {}
3203 for host, identity, _ in self.get_hosts_with_creds():
3204 canonical = self._canonical_git_googlesource_host(host)
3205 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3206 idx = 0 if canonical == host else 1
3207 pair[idx] = identity
3208 return host_to_identity_pairs
3209
3210 def get_partially_configured_hosts(self):
3211 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003212 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003213 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003214 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003215
3216 def get_conflicting_hosts(self):
3217 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003218 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003219 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003220 if None not in (i1, i2) and i1 != i2)
3221
3222 def get_duplicated_hosts(self):
3223 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003224 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003225
3226 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3227 'chromium.googlesource.com': 'chromium.org',
3228 'chrome-internal.googlesource.com': 'google.com',
3229 }
3230
3231 def get_hosts_with_wrong_identities(self):
3232 """Finds hosts which **likely** reference wrong identities.
3233
3234 Note: skips hosts which have conflicting identities for Git and Gerrit.
3235 """
3236 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003237 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003238 pair = self._get_git_gerrit_identity_pairs().get(host)
3239 if pair and pair[0] == pair[1]:
3240 _, domain = self._parse_identity(pair[0])
3241 if domain != expected:
3242 hosts.add(host)
3243 return hosts
3244
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003245 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003246 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003247 hosts = sorted(hosts)
3248 assert hosts
3249 if extra_column_func is None:
3250 extras = [''] * len(hosts)
3251 else:
3252 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003253 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3254 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003255 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003256 lines.append(tmpl % he)
3257 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003258
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003259 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003260 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003261 yield ('.googlesource.com wildcard record detected',
3262 ['Chrome Infrastructure team recommends to list full host names '
3263 'explicitly.'],
3264 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003265
3266 dups = self.get_duplicated_hosts()
3267 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003268 yield ('The following hosts were defined twice',
3269 self._format_hosts(dups),
3270 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003271
3272 partial = self.get_partially_configured_hosts()
3273 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003274 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3275 'These hosts are missing',
3276 self._format_hosts(partial, lambda host: 'but %s defined' %
3277 self._get_counterpart_host(host)),
3278 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003279
3280 conflicting = self.get_conflicting_hosts()
3281 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003282 yield ('The following Git hosts have differing credentials from their '
3283 'Gerrit counterparts',
3284 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3285 tuple(self._get_git_gerrit_identity_pairs()[host])),
3286 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003287
3288 wrong = self.get_hosts_with_wrong_identities()
3289 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003290 yield ('These hosts likely use wrong identity',
3291 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3292 (self._get_git_gerrit_identity_pairs()[host][0],
3293 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3294 wrong)
3295
3296 def find_and_report_problems(self):
3297 """Returns True if there was at least one problem, else False."""
3298 found = False
3299 bad_hosts = set()
3300 for title, sublines, hosts in self._find_problems():
3301 if not found:
3302 found = True
3303 print('\n\n.gitcookies problem report:\n')
3304 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003305 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003306 if sublines:
3307 print()
3308 print(' %s' % '\n '.join(sublines))
3309 print()
3310
3311 if bad_hosts:
3312 assert found
3313 print(' You can manually remove corresponding lines in your %s file and '
3314 'visit the following URLs with correct account to generate '
3315 'correct credential lines:\n' %
3316 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3317 print(' %s' % '\n '.join(sorted(set(
3318 gerrit_util.CookiesAuthenticator().get_new_password_url(
3319 self._canonical_git_googlesource_host(host))
3320 for host in bad_hosts
3321 ))))
3322 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003323
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003324
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003325@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003326def CMDcreds_check(parser, args):
3327 """Checks credentials and suggests changes."""
3328 _, _ = parser.parse_args(args)
3329
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003330 # Code below checks .gitcookies. Abort if using something else.
3331 authn = gerrit_util.Authenticator.get()
3332 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003333 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003334 'This command is not designed for bot environment. It checks '
3335 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003336 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3337 if isinstance(authn, gerrit_util.GceAuthenticator):
3338 message += (
3339 '\n'
3340 'If you need to run this on GCE or a cloudtop instance, '
3341 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3342 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003343
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003344 checker = _GitCookiesChecker()
3345 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003346
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003347 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003348 checker.print_current_creds(include_netrc=True)
3349
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003350 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003351 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003352 return 0
3353 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003354
3355
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003356@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003357def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003358 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003359 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003360 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003361 _, args = parser.parse_args(args)
3362 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003363 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003364 return RunGit(['config', 'branch.%s.base-url' % branch],
3365 error_ok=False).strip()
3366 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003367 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003368 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3369 error_ok=False).strip()
3370
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003371
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003372def color_for_status(status):
3373 """Maps a Changelist status to color, for CMDstatus and other tools."""
3374 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003375 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003376 'waiting': Fore.BLUE,
3377 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003378 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003379 'lgtm': Fore.GREEN,
3380 'commit': Fore.MAGENTA,
3381 'closed': Fore.CYAN,
3382 'error': Fore.WHITE,
3383 }.get(status, Fore.WHITE)
3384
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003385
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003386def get_cl_statuses(changes, fine_grained, max_processes=None):
3387 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003388
3389 If fine_grained is true, this will fetch CL statuses from the server.
3390 Otherwise, simply indicate if there's a matching url for the given branches.
3391
3392 If max_processes is specified, it is used as the maximum number of processes
3393 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3394 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003395
3396 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003397 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003398 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003399 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003400
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003401 if not fine_grained:
3402 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003403 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003404 for cl in changes:
3405 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003406 return
3407
3408 # First, sort out authentication issues.
3409 logging.debug('ensuring credentials exist')
3410 for cl in changes:
3411 cl.EnsureAuthenticated(force=False, refresh=True)
3412
3413 def fetch(cl):
3414 try:
3415 return (cl, cl.GetStatus())
3416 except:
3417 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003418 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003419 raise
3420
3421 threads_count = len(changes)
3422 if max_processes:
3423 threads_count = max(1, min(threads_count, max_processes))
3424 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3425
Edward Lemur61bf4172020-02-24 23:22:37 +00003426 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003427 fetched_cls = set()
3428 try:
3429 it = pool.imap_unordered(fetch, changes).__iter__()
3430 while True:
3431 try:
3432 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003433 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003434 break
3435 fetched_cls.add(cl)
3436 yield cl, status
3437 finally:
3438 pool.close()
3439
3440 # Add any branches that failed to fetch.
3441 for cl in set(changes) - fetched_cls:
3442 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003443
rmistry@google.com2dd99862015-06-22 12:22:18 +00003444
3445def upload_branch_deps(cl, args):
3446 """Uploads CLs of local branches that are dependents of the current branch.
3447
3448 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003449
3450 test1 -> test2.1 -> test3.1
3451 -> test3.2
3452 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003453
3454 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3455 run on the dependent branches in this order:
3456 test2.1, test3.1, test3.2, test2.2, test3.3
3457
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003458 Note: This function does not rebase your local dependent branches. Use it
3459 when you make a change to the parent branch that will not conflict
3460 with its dependent branches, and you would like their dependencies
3461 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003462 """
3463 if git_common.is_dirty_git_tree('upload-branch-deps'):
3464 return 1
3465
3466 root_branch = cl.GetBranch()
3467 if root_branch is None:
3468 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3469 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003470 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003471 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3472 'patchset dependencies without an uploaded CL.')
3473
3474 branches = RunGit(['for-each-ref',
3475 '--format=%(refname:short) %(upstream:short)',
3476 'refs/heads'])
3477 if not branches:
3478 print('No local branches found.')
3479 return 0
3480
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003481 # Create a dictionary of all local branches to the branches that are
3482 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003483 tracked_to_dependents = collections.defaultdict(list)
3484 for b in branches.splitlines():
3485 tokens = b.split()
3486 if len(tokens) == 2:
3487 branch_name, tracked = tokens
3488 tracked_to_dependents[tracked].append(branch_name)
3489
vapiera7fbd5a2016-06-16 09:17:49 -07003490 print()
3491 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003492 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003493
rmistry@google.com2dd99862015-06-22 12:22:18 +00003494 def traverse_dependents_preorder(branch, padding=''):
3495 dependents_to_process = tracked_to_dependents.get(branch, [])
3496 padding += ' '
3497 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003498 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003499 dependents.append(dependent)
3500 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003501
rmistry@google.com2dd99862015-06-22 12:22:18 +00003502 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003503 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003504
3505 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003506 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003507 return 0
3508
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003509 confirm_or_exit('This command will checkout all dependent branches and run '
3510 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003511
rmistry@google.com2dd99862015-06-22 12:22:18 +00003512 # Record all dependents that failed to upload.
3513 failures = {}
3514 # Go through all dependents, checkout the branch and upload.
3515 try:
3516 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003517 print()
3518 print('--------------------------------------')
3519 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003520 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003521 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003522 try:
3523 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003524 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003525 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003526 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003527 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003528 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003529 finally:
3530 # Swap back to the original root branch.
3531 RunGit(['checkout', '-q', root_branch])
3532
vapiera7fbd5a2016-06-16 09:17:49 -07003533 print()
3534 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003535 for dependent_branch in dependents:
3536 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003537 print(' %s : %s' % (dependent_branch, upload_status))
3538 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003539
3540 return 0
3541
3542
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003543def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3544 """Given a proposed tag name, returns a tag name that is guaranteed to be
3545 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3546 or 'foo-3', and so on."""
3547
3548 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3549 for suffix_num in itertools.count(1):
3550 if suffix_num == 1:
3551 to_check = proposed_tag
3552 else:
3553 to_check = '%s-%d' % (proposed_tag, suffix_num)
3554
3555 if to_check not in existing_tags:
3556 return to_check
3557
3558
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003559@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003560def CMDarchive(parser, args):
3561 """Archives and deletes branches associated with closed changelists."""
3562 parser.add_option(
3563 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003564 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003565 parser.add_option(
3566 '-f', '--force', action='store_true',
3567 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003568 parser.add_option(
3569 '-d', '--dry-run', action='store_true',
3570 help='Skip the branch tagging and removal steps.')
3571 parser.add_option(
3572 '-t', '--notags', action='store_true',
3573 help='Do not tag archived branches. '
3574 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003575
kmarshall3bff56b2016-06-06 18:31:47 -07003576 options, args = parser.parse_args(args)
3577 if args:
3578 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003579
3580 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3581 if not branches:
3582 return 0
3583
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003584 tags = RunGit(['for-each-ref', '--format=%(refname)',
3585 'refs/tags']).splitlines() or []
3586 tags = [t.split('/')[-1] for t in tags]
3587
vapiera7fbd5a2016-06-16 09:17:49 -07003588 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003589 changes = [Changelist(branchref=b)
3590 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003591 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3592 statuses = get_cl_statuses(changes,
3593 fine_grained=True,
3594 max_processes=options.maxjobs)
3595 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003596 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3597 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003598 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003599 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003600 proposal.sort()
3601
3602 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003603 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003604 return 0
3605
Edward Lemur85153282020-02-14 22:06:29 +00003606 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003607
vapiera7fbd5a2016-06-16 09:17:49 -07003608 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003609 if options.notags:
3610 for next_item in proposal:
3611 print(' ' + next_item[0])
3612 else:
3613 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3614 for next_item in proposal:
3615 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003616
kmarshall9249e012016-08-23 12:02:16 -07003617 # Quit now on precondition failure or if instructed by the user, either
3618 # via an interactive prompt or by command line flags.
3619 if options.dry_run:
3620 print('\nNo changes were made (dry run).\n')
3621 return 0
3622 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003623 print('You are currently on a branch \'%s\' which is associated with a '
3624 'closed codereview issue, so archive cannot proceed. Please '
3625 'checkout another branch and run this command again.' %
3626 current_branch)
3627 return 1
kmarshall9249e012016-08-23 12:02:16 -07003628 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003629 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3630 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003631 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003632 return 1
3633
3634 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003635 if not options.notags:
3636 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003637
3638 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3639 # Clean up the tag if we failed to delete the branch.
3640 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003641
vapiera7fbd5a2016-06-16 09:17:49 -07003642 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003643
3644 return 0
3645
3646
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003647@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003648def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003649 """Show status of changelists.
3650
3651 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003652 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003653 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003654 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003655 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003656 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003657 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003658 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003659
3660 Also see 'git cl comments'.
3661 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003662 parser.add_option(
3663 '--no-branch-color',
3664 action='store_true',
3665 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003666 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003667 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003668 parser.add_option('-f', '--fast', action='store_true',
3669 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003670 parser.add_option(
3671 '-j', '--maxjobs', action='store', type=int,
3672 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003673 parser.add_option(
3674 '-i', '--issue', type=int,
3675 help='Operate on this issue instead of the current branch\'s implicit '
3676 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003677 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003678 if args:
3679 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003680
iannuccie53c9352016-08-17 14:40:40 -07003681 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003682 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003683
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003684 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003685 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003686 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003687 if cl.GetIssue():
3688 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003689 elif options.field == 'id':
3690 issueid = cl.GetIssue()
3691 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003692 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003693 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003694 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003695 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003696 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003697 elif options.field == 'status':
3698 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003699 elif options.field == 'url':
3700 url = cl.GetIssueURL()
3701 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003702 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003703 return 0
3704
3705 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3706 if not branches:
3707 print('No local branch found.')
3708 return 0
3709
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003710 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003711 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003712 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003713 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003714 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003715 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003716 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003717
Edward Lemur85153282020-02-14 22:06:29 +00003718 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003719
3720 def FormatBranchName(branch, colorize=False):
3721 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3722 an asterisk when it is the current branch."""
3723
3724 asterisk = ""
3725 color = Fore.RESET
3726 if branch == current_branch:
3727 asterisk = "* "
3728 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003729 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003730
3731 if colorize:
3732 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003733 return asterisk + branch_name
3734
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003735 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003736
3737 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003738 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3739 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003740 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003741 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003742 branch_statuses[c.GetBranch()] = status
3743 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003744 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003745 if url and (not status or status == 'error'):
3746 # The issue probably doesn't exist anymore.
3747 url += ' (broken)'
3748
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003749 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003750 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003751 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003752 color = ''
3753 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003754 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003755
Alan Cuttera3be9a52019-03-04 18:50:33 +00003756 branch_display = FormatBranchName(branch)
3757 padding = ' ' * (alignment - len(branch_display))
3758 if not options.no_branch_color:
3759 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003760
Alan Cuttera3be9a52019-03-04 18:50:33 +00003761 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3762 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003763
vapiera7fbd5a2016-06-16 09:17:49 -07003764 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003765 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003766 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003767 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003768 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003769 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003770 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003771 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003772 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003773 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003774 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003775 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003776 return 0
3777
3778
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003779def colorize_CMDstatus_doc():
3780 """To be called once in main() to add colors to git cl status help."""
3781 colors = [i for i in dir(Fore) if i[0].isupper()]
3782
3783 def colorize_line(line):
3784 for color in colors:
3785 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003786 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003787 indent = len(line) - len(line.lstrip(' ')) + 1
3788 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3789 return line
3790
3791 lines = CMDstatus.__doc__.splitlines()
3792 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3793
3794
phajdan.jre328cf92016-08-22 04:12:17 -07003795def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003796 if path == '-':
3797 json.dump(contents, sys.stdout)
3798 else:
3799 with open(path, 'w') as f:
3800 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003801
3802
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003803@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003804@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003805def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003806 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003807
3808 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003809 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003810 parser.add_option('-r', '--reverse', action='store_true',
3811 help='Lookup the branch(es) for the specified issues. If '
3812 'no issues are specified, all branches with mapped '
3813 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003814 parser.add_option('--json',
3815 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003816 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003817
dnj@chromium.org406c4402015-03-03 17:22:28 +00003818 if options.reverse:
3819 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003820 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003821 # Reverse issue lookup.
3822 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003823
3824 git_config = {}
3825 for config in RunGit(['config', '--get-regexp',
3826 r'branch\..*issue']).splitlines():
3827 name, _space, val = config.partition(' ')
3828 git_config[name] = val
3829
dnj@chromium.org406c4402015-03-03 17:22:28 +00003830 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003831 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003832 Changelist.IssueConfigKey())
3833 issue = git_config.get(config_key)
3834 if issue:
3835 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003836 if not args:
3837 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003838 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003839 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003840 try:
3841 issue_num = int(issue)
3842 except ValueError:
3843 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003844 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003845 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003846 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003847 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003848 if options.json:
3849 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003850 return 0
3851
3852 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003853 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003854 if not issue.valid:
3855 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3856 'or no argument to list it.\n'
3857 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003858 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003859 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003860 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003861 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003862 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3863 if options.json:
3864 write_json(options.json, {
3865 'issue': cl.GetIssue(),
3866 'issue_url': cl.GetIssueURL(),
3867 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003868 return 0
3869
3870
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003871@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003872def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003873 """Shows or posts review comments for any changelist."""
3874 parser.add_option('-a', '--add-comment', dest='comment',
3875 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003876 parser.add_option('-p', '--publish', action='store_true',
3877 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003878 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003879 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003880 parser.add_option('-m', '--machine-readable', dest='readable',
3881 action='store_false', default=True,
3882 help='output comments in a format compatible with '
3883 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003884 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003885 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003886 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003887
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003888 issue = None
3889 if options.issue:
3890 try:
3891 issue = int(options.issue)
3892 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003893 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003894
Edward Lemur934836a2019-09-09 20:16:54 +00003895 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003896
3897 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003898 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003899 return 0
3900
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003901 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3902 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003903 for comment in summary:
3904 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003905 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003906 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003907 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003908 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003909 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003910 elif comment.autogenerated:
3911 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003912 else:
3913 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003914 print('\n%s%s %s%s\n%s' % (
3915 color,
3916 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3917 comment.sender,
3918 Fore.RESET,
3919 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3920
smut@google.comc85ac942015-09-15 16:34:43 +00003921 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003922 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003923 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003924 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3925 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003926 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003927 return 0
3928
3929
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003930@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003931@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003932def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003933 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003934 parser.add_option('-d', '--display', action='store_true',
3935 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003936 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003937 help='New description to set for this issue (- for stdin, '
3938 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003939 parser.add_option('-f', '--force', action='store_true',
3940 help='Delete any unpublished Gerrit edits for this issue '
3941 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003942
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003943 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003944
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003945 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003946 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003947 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003948 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003949 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003950
Edward Lemur934836a2019-09-09 20:16:54 +00003951 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003952 if target_issue_arg:
3953 kwargs['issue'] = target_issue_arg.issue
3954 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003955
3956 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003957 if not cl.GetIssue():
3958 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003959
Edward Lemur678a6842019-10-03 22:25:05 +00003960 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003961 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003962
Edward Lemur6c6827c2020-02-06 21:15:18 +00003963 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003964
smut@google.com34fb6b12015-07-13 20:03:26 +00003965 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003966 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003967 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003968
3969 if options.new_description:
3970 text = options.new_description
3971 if text == '-':
3972 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003973 elif text == '+':
3974 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003975 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003976
3977 description.set_description(text)
3978 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003979 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003980 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003981 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003982 return 0
3983
3984
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003985@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003986def CMDlint(parser, args):
3987 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003988 parser.add_option('--filter', action='append', metavar='-x,+y',
3989 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003990 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003991
3992 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003993 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003994 try:
3995 import cpplint
3996 import cpplint_chromium
3997 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003998 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003999 return 1
4000
4001 # Change the current working directory before calling lint so that it
4002 # shows the correct base.
4003 previous_cwd = os.getcwd()
4004 os.chdir(settings.GetRoot())
4005 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004006 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004007 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004008 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004009 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004010 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004011
4012 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004013 command = args + files
4014 if options.filter:
4015 command = ['--filter=' + ','.join(options.filter)] + command
4016 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004017
4018 white_regex = re.compile(settings.GetLintRegex())
4019 black_regex = re.compile(settings.GetLintIgnoreRegex())
4020 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4021 for filename in filenames:
4022 if white_regex.match(filename):
4023 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004024 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004025 else:
4026 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4027 extra_check_functions)
4028 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004029 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004030 finally:
4031 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004032 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004033 if cpplint._cpplint_state.error_count != 0:
4034 return 1
4035 return 0
4036
4037
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004038@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004039def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004040 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004041 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004042 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004043 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004044 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004045 parser.add_option('--all', action='store_true',
4046 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004047 parser.add_option('--parallel', action='store_true',
4048 help='Run all tests specified by input_api.RunTests in all '
4049 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004050 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004051
sbc@chromium.org71437c02015-04-09 19:29:40 +00004052 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004053 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004054 return 1
4055
Edward Lemur934836a2019-09-09 20:16:54 +00004056 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004057 if args:
4058 base_branch = args[0]
4059 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004060 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004061 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004062
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004063 if cl.GetIssue():
4064 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004065 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004066 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004067
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004068 cl.RunHook(
4069 committing=not options.upload,
4070 may_prompt=False,
4071 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004072 parallel=options.parallel,
4073 upstream=base_branch,
4074 description=description,
4075 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004076 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004077
4078
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004079def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004080 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004081
4082 Works the same way as
4083 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4084 but can be called on demand on all platforms.
4085
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004086 The basic idea is to generate git hash of a state of the tree, original
4087 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004088 """
4089 lines = []
4090 tree_hash = RunGitSilent(['write-tree'])
4091 lines.append('tree %s' % tree_hash.strip())
4092 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4093 if code == 0:
4094 lines.append('parent %s' % parent.strip())
4095 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4096 lines.append('author %s' % author.strip())
4097 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4098 lines.append('committer %s' % committer.strip())
4099 lines.append('')
4100 # Note: Gerrit's commit-hook actually cleans message of some lines and
4101 # whitespace. This code is not doing this, but it clearly won't decrease
4102 # entropy.
4103 lines.append(message)
4104 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004105 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004106 return 'I%s' % change_hash.strip()
4107
4108
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004109def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004110 """Computes the remote branch ref to use for the CL.
4111
4112 Args:
4113 remote (str): The git remote for the CL.
4114 remote_branch (str): The git remote branch for the CL.
4115 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004116 """
4117 if not (remote and remote_branch):
4118 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004119
wittman@chromium.org455dc922015-01-26 20:15:50 +00004120 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004121 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004122 # refs, which are then translated into the remote full symbolic refs
4123 # below.
4124 if '/' not in target_branch:
4125 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4126 else:
4127 prefix_replacements = (
4128 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4129 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4130 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4131 )
4132 match = None
4133 for regex, replacement in prefix_replacements:
4134 match = re.search(regex, target_branch)
4135 if match:
4136 remote_branch = target_branch.replace(match.group(0), replacement)
4137 break
4138 if not match:
4139 # This is a branch path but not one we recognize; use as-is.
4140 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004141 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4142 # Handle the refs that need to land in different refs.
4143 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004144
wittman@chromium.org455dc922015-01-26 20:15:50 +00004145 # Create the true path to the remote branch.
4146 # Does the following translation:
4147 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4148 # * refs/remotes/origin/master -> refs/heads/master
4149 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4150 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4151 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4152 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4153 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4154 'refs/heads/')
4155 elif remote_branch.startswith('refs/remotes/branch-heads'):
4156 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004157
wittman@chromium.org455dc922015-01-26 20:15:50 +00004158 return remote_branch
4159
4160
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004161def cleanup_list(l):
4162 """Fixes a list so that comma separated items are put as individual items.
4163
4164 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4165 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4166 """
4167 items = sum((i.split(',') for i in l), [])
4168 stripped_items = (i.strip() for i in items)
4169 return sorted(filter(None, stripped_items))
4170
4171
Aaron Gable4db38df2017-11-03 14:59:07 -07004172@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004173@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004174def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004175 """Uploads the current changelist to codereview.
4176
4177 Can skip dependency patchset uploads for a branch by running:
4178 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004179 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004180 git config --unset branch.branch_name.skip-deps-uploads
4181 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004182
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004183 If the name of the checked out branch starts with "bug-" or "fix-" followed
4184 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004185 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004186
4187 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004188 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004189 [git-cl] add support for hashtags
4190 Foo bar: implement foo
4191 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004192 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004193 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4194 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004195 parser.add_option('--bypass-watchlists', action='store_true',
4196 dest='bypass_watchlists',
4197 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004198 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004199 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004200 parser.add_option('--message', '-m', dest='message',
4201 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004202 parser.add_option('-b', '--bug',
4203 help='pre-populate the bug number(s) for this issue. '
4204 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004205 parser.add_option('--message-file', dest='message_file',
4206 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004207 parser.add_option('--title', '-t', dest='title',
4208 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004209 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004210 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004211 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004212 parser.add_option('--tbrs',
4213 action='append', default=[],
4214 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004215 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004216 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004217 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004218 parser.add_option('--hashtag', dest='hashtags',
4219 action='append', default=[],
4220 help=('Gerrit hashtag for new CL; '
4221 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004222 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004223 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004224 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004225 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004226 metavar='TARGET',
4227 help='Apply CL to remote ref TARGET. ' +
4228 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004229 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004230 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004231 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004232 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004233 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004234 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004235 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4236 const='TBR', help='add a set of OWNERS to TBR')
4237 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4238 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004239 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004240 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004241 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004242 'implies --send-mail')
4243 parser.add_option('-d', '--cq-dry-run',
4244 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004245 help='Send the patchset to do a CQ dry run right after '
4246 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004247 parser.add_option('--preserve-tryjobs', action='store_true',
4248 help='instruct the CQ to let tryjobs running even after '
4249 'new patchsets are uploaded instead of canceling '
4250 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004251 parser.add_option('--dependencies', action='store_true',
4252 help='Uploads CLs of all the local branches that depend on '
4253 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004254 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4255 help='Sends your change to the CQ after an approval. Only '
4256 'works on repos that have the Auto-Submit label '
4257 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004258 parser.add_option('--parallel', action='store_true',
4259 help='Run all tests specified by input_api.RunTests in all '
4260 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004261 parser.add_option('--no-autocc', action='store_true',
4262 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004263 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004264 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004265 parser.add_option('-R', '--retry-failed', action='store_true',
4266 help='Retry failed tryjobs from old patchset immediately '
4267 'after uploading new patchset. Cannot be used with '
4268 '--use-commit-queue or --cq-dry-run.')
4269 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4270 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004271 parser.add_option('--fixed', '-x',
4272 help='List of bugs that will be commented on and marked '
4273 'fixed (pre-populates "Fixed:" tag). Same format as '
4274 '-b option / "Bug:" tag. If fixing several issues, '
4275 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004276 parser.add_option('--edit-description', action='store_true', default=False,
4277 help='Modify description before upload. Cannot be used '
4278 'with --force. It is a noop when --no-squash is set '
4279 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004280
rmistry@google.com2dd99862015-06-22 12:22:18 +00004281 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004282 (options, args) = parser.parse_args(args)
4283
sbc@chromium.org71437c02015-04-09 19:29:40 +00004284 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004285 return 1
4286
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004287 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004288 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004289 options.cc = cleanup_list(options.cc)
4290
Josipe827b0f2020-01-30 00:07:20 +00004291 if options.edit_description and options.force:
4292 parser.error('Only one of --force and --edit-description allowed')
4293
tandriib80458a2016-06-23 12:20:07 -07004294 if options.message_file:
4295 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004296 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004297 options.message = gclient_utils.FileRead(options.message_file)
4298 options.message_file = None
4299
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004300 if ([options.cq_dry_run,
4301 options.use_commit_queue,
4302 options.retry_failed].count(True) > 1):
4303 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4304 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004305
Aaron Gableedbc4132017-09-11 13:22:28 -07004306 if options.use_commit_queue:
4307 options.send_mail = True
4308
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004309 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4310 settings.GetIsGerrit()
4311
Edward Lemur934836a2019-09-09 20:16:54 +00004312 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004313 # Warm change details cache now to avoid RPCs later, reducing latency for
4314 # developers.
4315 if cl.GetIssue():
4316 cl._GetChangeDetail(
4317 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4318
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004319 if options.retry_failed and not cl.GetIssue():
4320 print('No previous patchsets, so --retry-failed has no effect.')
4321 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004322
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004323 # cl.GetMostRecentPatchset uses cached information, and can return the last
4324 # patchset before upload. Calling it here makes it clear that it's the
4325 # last patchset before upload. Note that GetMostRecentPatchset will fail
4326 # if no CL has been uploaded yet.
4327 if options.retry_failed:
4328 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004329
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004330 ret = cl.CMDUpload(options, args, orig_args)
4331
4332 if options.retry_failed:
4333 if ret != 0:
4334 print('Upload failed, so --retry-failed has no effect.')
4335 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004336 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004337 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004338 jobs = _filter_failed_for_retry(builds)
4339 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004340 print('No failed tryjobs, so --retry-failed has no effect.')
4341 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004342 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004343
4344 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004345
4346
Francois Dorayd42c6812017-05-30 15:10:20 -04004347@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004348@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004349def CMDsplit(parser, args):
4350 """Splits a branch into smaller branches and uploads CLs.
4351
4352 Creates a branch and uploads a CL for each group of files modified in the
4353 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004354 comment, the string '$directory', is replaced with the directory containing
4355 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004356 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004357 parser.add_option('-d', '--description', dest='description_file',
4358 help='A text file containing a CL description in which '
4359 '$directory will be replaced by each CL\'s directory.')
4360 parser.add_option('-c', '--comment', dest='comment_file',
4361 help='A text file containing a CL comment.')
4362 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004363 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004364 help='List the files and reviewers for each CL that would '
4365 'be created, but don\'t create branches or CLs.')
4366 parser.add_option('--cq-dry-run', action='store_true',
4367 help='If set, will do a cq dry run for each uploaded CL. '
4368 'Please be careful when doing this; more than ~10 CLs '
4369 'has the potential to overload our build '
4370 'infrastructure. Try to upload these not during high '
4371 'load times (usually 11-3 Mountain View time). Email '
4372 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004373 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4374 default=True,
4375 help='Sends your change to the CQ after an approval. Only '
4376 'works on repos that have the Auto-Submit label '
4377 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004378 options, _ = parser.parse_args(args)
4379
4380 if not options.description_file:
4381 parser.error('No --description flag specified.')
4382
4383 def WrappedCMDupload(args):
4384 return CMDupload(OptionParser(), args)
4385
Edward Lemur2c62b332020-03-12 22:12:33 +00004386 return split_cl.SplitCl(
4387 options.description_file, options.comment_file, Changelist,
4388 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4389 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004390
4391
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004392@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004393@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004394def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004395 """DEPRECATED: Used to commit the current changelist via git-svn."""
4396 message = ('git-cl no longer supports committing to SVN repositories via '
4397 'git-svn. You probably want to use `git cl land` instead.')
4398 print(message)
4399 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004400
4401
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004402@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004403@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004404def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004405 """Commits the current changelist via git.
4406
4407 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4408 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004409 """
4410 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4411 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004412 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004413 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004414 parser.add_option('--parallel', action='store_true',
4415 help='Run all tests specified by input_api.RunTests in all '
4416 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004417 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004418
Edward Lemur934836a2019-09-09 20:16:54 +00004419 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004420
Robert Iannucci2e73d432018-03-14 01:10:47 -07004421 if not cl.GetIssue():
4422 DieWithError('You must upload the change first to Gerrit.\n'
4423 ' If you would rather have `git cl land` upload '
4424 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004425 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004426 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004427
4428
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004429@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004430@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004431def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004432 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004433 parser.add_option('-b', dest='newbranch',
4434 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004435 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004436 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004437 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004438 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004439
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004440 group = optparse.OptionGroup(
4441 parser,
4442 'Options for continuing work on the current issue uploaded from a '
4443 'different clone (e.g. different machine). Must be used independently '
4444 'from the other options. No issue number should be specified, and the '
4445 'branch must have an issue number associated with it')
4446 group.add_option('--reapply', action='store_true', dest='reapply',
4447 help='Reset the branch and reapply the issue.\n'
4448 'CAUTION: This will undo any local changes in this '
4449 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004450
4451 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004452 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004453 parser.add_option_group(group)
4454
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004455 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004456
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004457 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004458 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004459 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004460 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004461 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004462
Edward Lemur934836a2019-09-09 20:16:54 +00004463 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004464 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004465 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004466
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004467 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004468 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004469 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004470
4471 RunGit(['reset', '--hard', upstream])
4472 if options.pull:
4473 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004474
Edward Lemur678a6842019-10-03 22:25:05 +00004475 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4476 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004477
4478 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004479 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004480
Edward Lemurf38bc172019-09-03 21:02:13 +00004481 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004482 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004483 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004484
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004485 # We don't want uncommitted changes mixed up with the patch.
4486 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004487 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004488
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004489 if options.newbranch:
4490 if options.force:
4491 RunGit(['branch', '-D', options.newbranch],
4492 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004493 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004494
Edward Lemur678a6842019-10-03 22:25:05 +00004495 cl = Changelist(
4496 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004497
Edward Lemur678a6842019-10-03 22:25:05 +00004498 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004499 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004500
Edward Lemurf38bc172019-09-03 21:02:13 +00004501 return cl.CMDPatchWithParsedIssue(
4502 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004503
4504
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004505def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004506 """Fetches the tree status and returns either 'open', 'closed',
4507 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004508 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004509 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004510 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004511 if status.find('closed') != -1 or status == '0':
4512 return 'closed'
4513 elif status.find('open') != -1 or status == '1':
4514 return 'open'
4515 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004516 return 'unset'
4517
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004518
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004519def GetTreeStatusReason():
4520 """Fetches the tree status from a json url and returns the message
4521 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004522 url = settings.GetTreeStatusUrl()
4523 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004524 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004525 status = json.loads(connection.read())
4526 connection.close()
4527 return status['message']
4528
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004529
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004530@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004531def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004532 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004533 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004534 status = GetTreeStatus()
4535 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004536 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004537 return 2
4538
vapiera7fbd5a2016-06-16 09:17:49 -07004539 print('The tree is %s' % status)
4540 print()
4541 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004542 if status != 'open':
4543 return 1
4544 return 0
4545
4546
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004547@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004548def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004549 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4550 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004551 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004552 '-b', '--bot', action='append',
4553 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4554 'times to specify multiple builders. ex: '
4555 '"-b win_rel -b win_layout". See '
4556 'the try server waterfall for the builders name and the tests '
4557 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004558 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004559 '-B', '--bucket', default='',
4560 help=('Buildbucket bucket to send the try requests.'))
4561 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004562 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004563 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004564 'be determined by the try recipe that builder runs, which usually '
4565 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004566 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004567 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004568 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004569 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004570 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004571 '--category', default='git_cl_try', help='Specify custom build category.')
4572 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004573 '--project',
4574 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004575 'in recipe to determine to which repository or directory to '
4576 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004577 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004578 '-p', '--property', dest='properties', action='append', default=[],
4579 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004580 'key2=value2 etc. The value will be treated as '
4581 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004582 'NOTE: using this may make your tryjob not usable for CQ, '
4583 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004584 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004585 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4586 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004587 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004588 parser.add_option(
4589 '-R', '--retry-failed', action='store_true', default=False,
4590 help='Retry failed jobs from the latest set of tryjobs. '
4591 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004592 parser.add_option(
4593 '-i', '--issue', type=int,
4594 help='Operate on this issue instead of the current branch\'s implicit '
4595 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004596 options, args = parser.parse_args(args)
4597
machenbach@chromium.org45453142015-09-15 08:45:22 +00004598 # Make sure that all properties are prop=value pairs.
4599 bad_params = [x for x in options.properties if '=' not in x]
4600 if bad_params:
4601 parser.error('Got properties with missing "=": %s' % bad_params)
4602
maruel@chromium.org15192402012-09-06 12:38:29 +00004603 if args:
4604 parser.error('Unknown arguments: %s' % args)
4605
Edward Lemur934836a2019-09-09 20:16:54 +00004606 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004607 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004608 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004609
Edward Lemurf38bc172019-09-03 21:02:13 +00004610 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004611 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004612
tandriie113dfd2016-10-11 10:20:12 -07004613 error_message = cl.CannotTriggerTryJobReason()
4614 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004615 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004616
Edward Lemur45768512020-03-02 19:03:14 +00004617 if options.bot:
4618 if options.retry_failed:
4619 parser.error('--bot is not compatible with --retry-failed.')
4620 if not options.bucket:
4621 parser.error('A bucket (e.g. "chromium/try") is required.')
4622
4623 triggered = [b for b in options.bot if 'triggered' in b]
4624 if triggered:
4625 parser.error(
4626 'Cannot schedule builds on triggered bots: %s.\n'
4627 'This type of bot requires an initial job from a parent (usually a '
4628 'builder). Schedule a job on the parent instead.\n' % triggered)
4629
4630 if options.bucket.startswith('.master'):
4631 parser.error('Buildbot masters are not supported.')
4632
4633 project, bucket = _parse_bucket(options.bucket)
4634 if project is None or bucket is None:
4635 parser.error('Invalid bucket: %s.' % options.bucket)
4636 jobs = sorted((project, bucket, bot) for bot in options.bot)
4637 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004638 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004639 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004640 if options.verbose:
4641 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004642 jobs = _filter_failed_for_retry(builds)
4643 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004644 print('There are no failed jobs in the latest set of jobs '
4645 '(patchset #%d), doing nothing.' % patchset)
4646 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004647 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004648 if num_builders > 10:
4649 confirm_or_exit('There are %d builders with failed builds.'
4650 % num_builders, action='continue')
4651 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004652 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004653 print('git cl try with no bots now defaults to CQ dry run.')
4654 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4655 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004656
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004657 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004658 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004659 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004660 except BuildbucketResponseException as ex:
4661 print('ERROR: %s' % ex)
4662 return 1
4663 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004664
4665
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004666@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004667def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004668 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004669 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004670 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004671 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004672 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004673 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004674 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004675 '--color', action='store_true', default=setup_color.IS_TTY,
4676 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004677 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004678 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4679 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004680 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004681 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004682 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004683 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004684 parser.add_option(
4685 '-i', '--issue', type=int,
4686 help='Operate on this issue instead of the current branch\'s implicit '
4687 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004688 options, args = parser.parse_args(args)
4689 if args:
4690 parser.error('Unrecognized args: %s' % ' '.join(args))
4691
Edward Lemur934836a2019-09-09 20:16:54 +00004692 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004693 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004694 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004695
tandrii221ab252016-10-06 08:12:04 -07004696 patchset = options.patchset
4697 if not patchset:
4698 patchset = cl.GetMostRecentPatchset()
4699 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004700 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004701 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004702 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004703 cl.GetIssue())
4704
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004705 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004706 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004707 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004708 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004709 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004710 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004711 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004712 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004713 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004714 return 0
4715
4716
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004717@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004718@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004719def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004720 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004721 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004722 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004723 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004724
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004725 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004726 if args:
4727 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004728 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004729 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004730 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004731 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004732
4733 # Clear configured merge-base, if there is one.
4734 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004735 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004736 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004737 return 0
4738
4739
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004740@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004741def CMDweb(parser, args):
4742 """Opens the current CL in the web browser."""
4743 _, args = parser.parse_args(args)
4744 if args:
4745 parser.error('Unrecognized args: %s' % ' '.join(args))
4746
4747 issue_url = Changelist().GetIssueURL()
4748 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004749 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004750 return 1
4751
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004752 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004753 # allows us to hide the "Created new window in existing browser session."
4754 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004755 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004756 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004757 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004758 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004759 os.open(os.devnull, os.O_RDWR)
4760 try:
4761 webbrowser.open(issue_url)
4762 finally:
4763 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004764 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004765 return 0
4766
4767
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004768@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004769def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004770 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004771 parser.add_option('-d', '--dry-run', action='store_true',
4772 help='trigger in dry run mode')
4773 parser.add_option('-c', '--clear', action='store_true',
4774 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004775 parser.add_option(
4776 '-i', '--issue', type=int,
4777 help='Operate on this issue instead of the current branch\'s implicit '
4778 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004779 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004780 if args:
4781 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004782 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004783 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004784
Edward Lemur934836a2019-09-09 20:16:54 +00004785 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004786 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004787 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004788 elif options.dry_run:
4789 state = _CQState.DRY_RUN
4790 else:
4791 state = _CQState.COMMIT
4792 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004793 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004794 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004795 return 0
4796
4797
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004798@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004799def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004800 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004801 parser.add_option(
4802 '-i', '--issue', type=int,
4803 help='Operate on this issue instead of the current branch\'s implicit '
4804 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004805 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004806 if args:
4807 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004808 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004809 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004810 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004811 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004812 cl.CloseIssue()
4813 return 0
4814
4815
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004816@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004817def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004818 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004819 parser.add_option(
4820 '--stat',
4821 action='store_true',
4822 dest='stat',
4823 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004824 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004825 if args:
4826 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004827
Edward Lemur934836a2019-09-09 20:16:54 +00004828 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004829 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004830 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004831 if not issue:
4832 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004833
Aaron Gablea718c3e2017-08-28 17:47:28 -07004834 base = cl._GitGetBranchConfigValue('last-upload-hash')
4835 if not base:
4836 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4837 if not base:
4838 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4839 revision_info = detail['revisions'][detail['current_revision']]
4840 fetch_info = revision_info['fetch']['http']
4841 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4842 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004843
Aaron Gablea718c3e2017-08-28 17:47:28 -07004844 cmd = ['git', 'diff']
4845 if options.stat:
4846 cmd.append('--stat')
4847 cmd.append(base)
4848 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004849
4850 return 0
4851
4852
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004853@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004854def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004855 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004856 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004857 '--ignore-current',
4858 action='store_true',
4859 help='Ignore the CL\'s current reviewers and start from scratch.')
4860 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004861 '--ignore-self',
4862 action='store_true',
4863 help='Do not consider CL\'s author as an owners.')
4864 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004865 '--no-color',
4866 action='store_true',
4867 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004868 parser.add_option(
4869 '--batch',
4870 action='store_true',
4871 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004872 # TODO: Consider moving this to another command, since other
4873 # git-cl owners commands deal with owners for a given CL.
4874 parser.add_option(
4875 '--show-all',
4876 action='store_true',
4877 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004878 options, args = parser.parse_args(args)
4879
4880 author = RunGit(['config', 'user.email']).strip() or None
4881
Edward Lemur934836a2019-09-09 20:16:54 +00004882 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004883
Yang Guo6e269a02019-06-26 11:17:02 +00004884 if options.show_all:
4885 for arg in args:
4886 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004887 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004888 database.load_data_needed_for([arg])
4889 print('Owners for %s:' % arg)
4890 for owner in sorted(database.all_possible_owners([arg], None)):
4891 print(' - %s' % owner)
4892 return 0
4893
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004894 if args:
4895 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004896 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004897 base_branch = args[0]
4898 else:
4899 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004900 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004901
Edward Lemur2c62b332020-03-12 22:12:33 +00004902 root = settings.GetRoot()
4903 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004904
4905 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004906 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004907 print('\n'.join(db.reviewers_for(affected_files, author)))
4908 return 0
4909
Edward Lemur2c62b332020-03-12 22:12:33 +00004910 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4911 original_owner_files = {
4912 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4913 for f in owner_files}
4914
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004915 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004916 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004917 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004918 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004919 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004920 fopen=open,
4921 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004922 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004923 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004924 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004925
4926
Aiden Bennerc08566e2018-10-03 17:52:42 +00004927def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004928 """Generates a diff command."""
4929 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004930 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4931
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004932 if allow_prefix:
4933 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4934 # case that diff.noprefix is set in the user's git config.
4935 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4936 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004937 diff_cmd += ['--no-prefix']
4938
4939 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004940
4941 if args:
4942 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004943 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004944 diff_cmd.append(arg)
4945 else:
4946 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004947
4948 return diff_cmd
4949
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004950
Jamie Madill5e96ad12020-01-13 16:08:35 +00004951def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4952 """Runs clang-format-diff and sets a return value if necessary."""
4953
4954 if not clang_diff_files:
4955 return 0
4956
4957 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4958 # formatted. This is used to block during the presubmit.
4959 return_value = 0
4960
4961 # Locate the clang-format binary in the checkout
4962 try:
4963 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4964 except clang_format.NotFoundError as e:
4965 DieWithError(e)
4966
4967 if opts.full or settings.GetFormatFullByDefault():
4968 cmd = [clang_format_tool]
4969 if not opts.dry_run and not opts.diff:
4970 cmd.append('-i')
4971 if opts.dry_run:
4972 for diff_file in clang_diff_files:
4973 with open(diff_file, 'r') as myfile:
4974 code = myfile.read().replace('\r\n', '\n')
4975 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4976 stdout = stdout.replace('\r\n', '\n')
4977 if opts.diff:
4978 sys.stdout.write(stdout)
4979 if code != stdout:
4980 return_value = 2
4981 else:
4982 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4983 if opts.diff:
4984 sys.stdout.write(stdout)
4985 else:
4986 env = os.environ.copy()
4987 env['PATH'] = str(os.path.dirname(clang_format_tool))
4988 try:
4989 script = clang_format.FindClangFormatScriptInChromiumTree(
4990 'clang-format-diff.py')
4991 except clang_format.NotFoundError as e:
4992 DieWithError(e)
4993
4994 cmd = [sys.executable, script, '-p0']
4995 if not opts.dry_run and not opts.diff:
4996 cmd.append('-i')
4997
4998 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004999 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005000
5001 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5002 if opts.diff:
5003 sys.stdout.write(stdout)
5004 if opts.dry_run and len(stdout) > 0:
5005 return_value = 2
5006
5007 return return_value
5008
5009
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005010def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005011 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005012 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005013
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005014
enne@chromium.org555cfe42014-01-29 18:21:39 +00005015@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005016@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005017def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005018 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005019 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005020 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005021 parser.add_option('--full', action='store_true',
5022 help='Reformat the full content of all touched files')
5023 parser.add_option('--dry-run', action='store_true',
5024 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005025 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005026 '--no-clang-format',
5027 dest='clang_format',
5028 action='store_false',
5029 default=True,
5030 help='Disables formatting of various file types using clang-format.')
5031 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005032 '--python',
5033 action='store_true',
5034 default=None,
5035 help='Enables python formatting on all python files.')
5036 parser.add_option(
5037 '--no-python',
5038 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005039 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005040 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005041 'If neither --python or --no-python are set, python files that have a '
5042 '.style.yapf file in an ancestor directory will be formatted. '
5043 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005044 parser.add_option(
5045 '--js',
5046 action='store_true',
5047 help='Format javascript code with clang-format. '
5048 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005049 parser.add_option('--diff', action='store_true',
5050 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005051 parser.add_option('--presubmit', action='store_true',
5052 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005053 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005054
Garrett Beaty91a6f332020-01-06 16:57:24 +00005055 if opts.python is not None and opts.no_python:
5056 raise parser.error('Cannot set both --python and --no-python')
5057 if opts.no_python:
5058 opts.python = False
5059
Daniel Chengc55eecf2016-12-30 03:11:02 -08005060 # Normalize any remaining args against the current path, so paths relative to
5061 # the current directory are still resolved as expected.
5062 args = [os.path.join(os.getcwd(), arg) for arg in args]
5063
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005064 # git diff generates paths against the root of the repository. Change
5065 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005066 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005067 if rel_base_path:
5068 os.chdir(rel_base_path)
5069
digit@chromium.org29e47272013-05-17 17:01:46 +00005070 # Grab the merge-base commit, i.e. the upstream commit of the current
5071 # branch when it was created or the last time it was rebased. This is
5072 # to cover the case where the user may have called "git fetch origin",
5073 # moving the origin branch to a newer commit, but hasn't rebased yet.
5074 upstream_commit = None
5075 cl = Changelist()
5076 upstream_branch = cl.GetUpstreamBranch()
5077 if upstream_branch:
5078 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5079 upstream_commit = upstream_commit.strip()
5080
5081 if not upstream_commit:
5082 DieWithError('Could not find base commit for this branch. '
5083 'Are you in detached state?')
5084
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005085 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5086 diff_output = RunGit(changed_files_cmd)
5087 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005088 # Filter out files deleted by this CL
5089 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005090
Andreas Haas417d89c2020-02-06 10:24:27 +00005091 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005092 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005093
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005094 clang_diff_files = []
5095 if opts.clang_format:
5096 clang_diff_files = [
5097 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5098 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005099 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5100 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005101 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005102
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005103 top_dir = os.path.normpath(
5104 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5105
Jamie Madill5e96ad12020-01-13 16:08:35 +00005106 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5107 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005108
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005109 # Similar code to above, but using yapf on .py files rather than clang-format
5110 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005111 py_explicitly_disabled = opts.python is not None and not opts.python
5112 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005113 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5114 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5115 if sys.platform.startswith('win'):
5116 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005117
Aiden Bennerc08566e2018-10-03 17:52:42 +00005118 # Used for caching.
5119 yapf_configs = {}
5120 for f in python_diff_files:
5121 # Find the yapf style config for the current file, defaults to depot
5122 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005123 _FindYapfConfigFile(f, yapf_configs, top_dir)
5124
5125 # Turn on python formatting by default if a yapf config is specified.
5126 # This breaks in the case of this repo though since the specified
5127 # style file is also the global default.
5128 if opts.python is None:
5129 filtered_py_files = []
5130 for f in python_diff_files:
5131 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5132 filtered_py_files.append(f)
5133 else:
5134 filtered_py_files = python_diff_files
5135
5136 # Note: yapf still seems to fix indentation of the entire file
5137 # even if line ranges are specified.
5138 # See https://github.com/google/yapf/issues/499
5139 if not opts.full and filtered_py_files:
5140 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5141
Brian Sheedyb4307d52019-12-02 19:18:17 +00005142 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5143 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5144 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005145
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005146 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005147 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5148 # Default to pep8 if not .style.yapf is found.
5149 if not yapf_style:
5150 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005151
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005152 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005153
5154 has_formattable_lines = False
5155 if not opts.full:
5156 # Only run yapf over changed line ranges.
5157 for diff_start, diff_len in py_line_diffs[f]:
5158 diff_end = diff_start + diff_len - 1
5159 # Yapf errors out if diff_end < diff_start but this
5160 # is a valid line range diff for a removal.
5161 if diff_end >= diff_start:
5162 has_formattable_lines = True
5163 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5164 # If all line diffs were removals we have nothing to format.
5165 if not has_formattable_lines:
5166 continue
5167
5168 if opts.diff or opts.dry_run:
5169 cmd += ['--diff']
5170 # Will return non-zero exit code if non-empty diff.
5171 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5172 if opts.diff:
5173 sys.stdout.write(stdout)
5174 elif len(stdout) > 0:
5175 return_value = 2
5176 else:
5177 cmd += ['-i']
5178 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005179
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005180 # Dart's formatter does not have the nice property of only operating on
5181 # modified chunks, so hard code full.
5182 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005183 try:
5184 command = [dart_format.FindDartFmtToolInChromiumTree()]
5185 if not opts.dry_run and not opts.diff:
5186 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005187 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005188
ppi@chromium.org6593d932016-03-03 15:41:15 +00005189 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005190 if opts.dry_run and stdout:
5191 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005192 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005193 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5194 'found in this checkout. Files in other languages are still '
5195 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005196
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005197 # Format GN build files. Always run on full build files for canonical form.
5198 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005199 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005200 if opts.dry_run or opts.diff:
5201 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005202 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005203 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5204 shell=sys.platform == 'win32',
5205 cwd=top_dir)
5206 if opts.dry_run and gn_ret == 2:
5207 return_value = 2 # Not formatted.
5208 elif opts.diff and gn_ret == 2:
5209 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005210 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005211 elif gn_ret != 0:
5212 # For non-dry run cases (and non-2 return values for dry-run), a
5213 # nonzero error code indicates a failure, probably because the file
5214 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005215 DieWithError('gn format failed on ' + gn_diff_file +
5216 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005217
Ilya Shermane081cbe2017-08-15 17:51:04 -07005218 # Skip the metrics formatting from the global presubmit hook. These files have
5219 # a separate presubmit hook that issues an error if the files need formatting,
5220 # whereas the top-level presubmit script merely issues a warning. Formatting
5221 # these files is somewhat slow, so it's important not to duplicate the work.
5222 if not opts.presubmit:
5223 for xml_dir in GetDirtyMetricsDirs(diff_files):
5224 tool_dir = os.path.join(top_dir, xml_dir)
5225 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5226 if opts.dry_run or opts.diff:
5227 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005228 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005229 if opts.diff:
5230 sys.stdout.write(stdout)
5231 if opts.dry_run and stdout:
5232 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005233
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005234 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005235
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005236
Steven Holte2e664bf2017-04-21 13:10:47 -07005237def GetDirtyMetricsDirs(diff_files):
5238 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5239 metrics_xml_dirs = [
5240 os.path.join('tools', 'metrics', 'actions'),
5241 os.path.join('tools', 'metrics', 'histograms'),
5242 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005243 os.path.join('tools', 'metrics', 'ukm'),
5244 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005245 for xml_dir in metrics_xml_dirs:
5246 if any(file.startswith(xml_dir) for file in xml_diff_files):
5247 yield xml_dir
5248
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005249
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005250@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005251@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005252def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005253 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005254 _, args = parser.parse_args(args)
5255
5256 if len(args) != 1:
5257 parser.print_help()
5258 return 1
5259
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005260 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005261 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005262 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005263
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005264 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005265
Edward Lemur52969c92020-02-06 18:15:28 +00005266 issueprefix = Changelist.IssueConfigKey()
5267 output = RunGit(['config', '--local', '--get-regexp',
5268 r'branch\..*\.%s' % issueprefix],
5269 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005270
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005271 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005272 for key, issue in [x.split() for x in output.splitlines()]:
5273 if issue == target_issue:
5274 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5275
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005276 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005277 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005278 return 1
5279 if len(branches) == 1:
5280 RunGit(['checkout', branches[0]])
5281 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005282 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005283 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005284 print('%d: %s' % (i, branches[i]))
Edward Lemur1a83da12020-03-04 21:18:36 +00005285 which = ask_for_data('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005286 try:
5287 RunGit(['checkout', branches[int(which)]])
5288 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005289 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005290 return 1
5291
5292 return 0
5293
5294
maruel@chromium.org29404b52014-09-08 22:58:00 +00005295def CMDlol(parser, args):
5296 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005297 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005298 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5299 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5300 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005301 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005302 return 0
5303
5304
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005305class OptionParser(optparse.OptionParser):
5306 """Creates the option parse and add --verbose support."""
5307 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005308 optparse.OptionParser.__init__(
5309 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005310 self.add_option(
5311 '-v', '--verbose', action='count', default=0,
5312 help='Use 2 times for more debugging info')
5313
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005314 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005315 try:
5316 return self._parse_args(args)
5317 finally:
5318 # Regardless of success or failure of args parsing, we want to report
5319 # metrics, but only after logging has been initialized (if parsing
5320 # succeeded).
5321 global settings
5322 settings = Settings()
5323
5324 if not metrics.DISABLE_METRICS_COLLECTION:
5325 # GetViewVCUrl ultimately calls logging method.
5326 project_url = settings.GetViewVCUrl().strip('/+')
5327 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5328 metrics.collector.add('project_urls', [project_url])
5329
5330 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005331 # Create an optparse.Values object that will store only the actual passed
5332 # options, without the defaults.
5333 actual_options = optparse.Values()
5334 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5335 # Create an optparse.Values object with the default options.
5336 options = optparse.Values(self.get_default_values().__dict__)
5337 # Update it with the options passed by the user.
5338 options._update_careful(actual_options.__dict__)
5339 # Store the options passed by the user in an _actual_options attribute.
5340 # We store only the keys, and not the values, since the values can contain
5341 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005342 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005343
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005344 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005345 logging.basicConfig(
5346 level=levels[min(options.verbose, len(levels) - 1)],
5347 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5348 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005349
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005350 return options, args
5351
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005352
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005353def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005354 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005355 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005356 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005357 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005358
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005359 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005360 dispatcher = subcommand.CommandDispatcher(__name__)
5361 try:
5362 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005363 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005364 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005365 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005366 if e.code != 500:
5367 raise
5368 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005369 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005370 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005371 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005372
5373
5374if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005375 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5376 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005377 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005378 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005379 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005380 sys.exit(main(sys.argv[1:]))