blob: 60230cb19f04c1688eb29a3633b71a17fdccce93 [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
Christopher Lamf732cd52017-01-24 12:40:11 +1100132def DieWithError(message, change_desc=None):
133 if change_desc:
134 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000135 print('\n ** Content of CL description **\n' +
136 '='*72 + '\n' +
137 change_desc.description + '\n' +
138 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100139
vapiera7fbd5a2016-06-16 09:17:49 -0700140 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000141 sys.exit(1)
142
143
Christopher Lamf732cd52017-01-24 12:40:11 +1100144def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000145 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000146 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000147 with open(backup_path, 'w') as backup_file:
148 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100149
150
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000151def GetNoGitPagerEnv():
152 env = os.environ.copy()
153 # 'cat' is a magical git string that disables pagers on all platforms.
154 env['GIT_PAGER'] = 'cat'
155 return env
156
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000157
bsep@chromium.org627d9002016-04-29 00:00:52 +0000158def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000159 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000160 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
161 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000162 except subprocess2.CalledProcessError as e:
163 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000164 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000166 'Command "%s" failed.\n%s' % (
167 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000168 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000169
170
171def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000172 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000173 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000174
175
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000176def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000177 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700178 if suppress_stderr:
179 stderr = subprocess2.VOID
180 else:
181 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000182 try:
tandrii5d48c322016-08-18 16:19:37 -0700183 (out, _), code = subprocess2.communicate(['git'] + args,
184 env=GetNoGitPagerEnv(),
185 stdout=subprocess2.PIPE,
186 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000187 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700188 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900189 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000190 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000191
192
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000193def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000194 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000195 return RunGitWithCode(args, suppress_stderr=True)[1]
196
197
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000198def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000199 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000200 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000201 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000202 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000203
204
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000205def BranchExists(branch):
206 """Return True if specified branch exists."""
207 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
208 suppress_stderr=True)
209 return not code
210
211
tandrii2a16b952016-10-19 07:09:44 -0700212def time_sleep(seconds):
213 # Use this so that it can be mocked in tests without interfering with python
214 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700215 return time.sleep(seconds)
216
217
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000218def time_time():
219 # Use this so that it can be mocked in tests without interfering with python
220 # system machinery.
221 return time.time()
222
223
Edward Lemur1b52d872019-05-09 21:12:12 +0000224def datetime_now():
225 # Use this so that it can be mocked in tests without interfering with python
226 # system machinery.
227 return datetime.datetime.now()
228
229
Edward Lemur1a83da12020-03-04 21:18:36 +0000230def _raw_input(message):
231 # Use this so that it can be mocked in tests on Python 2 and 3.
232 if sys.version_info.major == 2:
233 return raw_input(message)
234 return input(message)
235
236
maruel@chromium.org90541732011-04-01 17:54:18 +0000237def ask_for_data(prompt):
238 try:
Edward Lemur1a83da12020-03-04 21:18:36 +0000239 return _raw_input(prompt)
maruel@chromium.org90541732011-04-01 17:54:18 +0000240 except KeyboardInterrupt:
241 # Hide the exception.
242 sys.exit(1)
243
244
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100245def confirm_or_exit(prefix='', action='confirm'):
246 """Asks user to press enter to continue or press Ctrl+C to abort."""
247 if not prefix or prefix.endswith('\n'):
248 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100249 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100250 mid = ' Press'
251 elif prefix.endswith(' '):
252 mid = 'press'
253 else:
254 mid = ' press'
255 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
256
257
258def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000259 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100260 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
261 while True:
262 if 'yes'.startswith(result):
263 return True
264 if 'no'.startswith(result):
265 return False
266 result = ask_for_data('Please, type yes or no: ').lower()
267
268
tandrii5d48c322016-08-18 16:19:37 -0700269def _git_branch_config_key(branch, key):
270 """Helper method to return Git config key for a branch."""
271 assert branch, 'branch name is required to set git config for it'
272 return 'branch.%s.%s' % (branch, key)
273
274
machenbach@chromium.org45453142015-09-15 08:45:22 +0000275def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000276 prop_list = getattr(options, 'properties', [])
277 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000278 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000279 try:
280 properties[key] = json.loads(val)
281 except ValueError:
282 pass # If a value couldn't be evaluated, treat it as a string.
283 return properties
284
285
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000286# TODO(crbug.com/976104): Remove this function once git-cl try-results has
287# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000288def _buildbucket_retry(operation_name, http, *args, **kwargs):
289 """Retries requests to buildbucket service and returns parsed json content."""
290 try_count = 0
291 while True:
292 response, content = http.request(*args, **kwargs)
293 try:
294 content_json = json.loads(content)
295 except ValueError:
296 content_json = None
297
298 # Buildbucket could return an error even if status==200.
299 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000300 error = content_json.get('error')
301 if error.get('code') == 403:
302 raise BuildbucketResponseException(
303 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000304 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000305 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000306 raise BuildbucketResponseException(msg)
307
308 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700309 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000310 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000311 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700312 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000313 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000314 content)
315 return content_json
316 if response.status < 500 or try_count >= 2:
317 raise httplib2.HttpLib2Error(content)
318
319 # status >= 500 means transient failures.
320 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000321 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000322 try_count += 1
323 assert False, 'unreachable'
324
325
Edward Lemur4c707a22019-09-24 21:13:43 +0000326def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000327 """Calls a buildbucket v2 method and returns the parsed json response."""
328 headers = {
329 'Accept': 'application/json',
330 'Content-Type': 'application/json',
331 }
332 request = json.dumps(request)
333 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
334
335 logging.info('POST %s with %s' % (url, request))
336
337 attempts = 1
338 time_to_sleep = 1
339 while True:
340 response, content = http.request(url, 'POST', body=request, headers=headers)
341 if response.status == 200:
342 return json.loads(content[4:])
343 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
344 msg = '%s error when calling POST %s with %s: %s' % (
345 response.status, url, request, content)
346 raise BuildbucketResponseException(msg)
347 logging.debug(
348 '%s error when calling POST %s with %s. '
349 'Sleeping for %d seconds and retrying...' % (
350 response.status, url, request, time_to_sleep))
351 time.sleep(time_to_sleep)
352 time_to_sleep *= 2
353 attempts += 1
354
355 assert False, 'unreachable'
356
357
Edward Lemur6215c792019-10-03 21:59:05 +0000358def _parse_bucket(raw_bucket):
359 legacy = True
360 project = bucket = None
361 if '/' in raw_bucket:
362 legacy = False
363 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000364 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000365 elif raw_bucket.startswith('luci.'):
366 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000367 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000368 elif '.' in raw_bucket:
369 project = raw_bucket.split('.')[0]
370 bucket = raw_bucket
371 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000372 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000373 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
374 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000375
376
Quinten Yearsley777660f2020-03-04 23:37:06 +0000377def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000378 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700379
380 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000381 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000382 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700383 options: Command-line options.
384 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000385 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000386 for project, bucket, builder in jobs:
387 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000388 print('To see results here, run: git cl try-results')
389 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700390
Quinten Yearsley777660f2020-03-04 23:37:06 +0000391 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000392 if not requests:
393 return
394
Edward Lemur5b929a42019-10-21 17:57:39 +0000395 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000396 http.force_exception_to_status_code = True
397
398 batch_request = {'requests': requests}
399 batch_response = _call_buildbucket(
400 http, options.buildbucket_host, 'Batch', batch_request)
401
402 errors = [
403 ' ' + response['error']['message']
404 for response in batch_response.get('responses', [])
405 if 'error' in response
406 ]
407 if errors:
408 raise BuildbucketResponseException(
409 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
410
411
Quinten Yearsley777660f2020-03-04 23:37:06 +0000412def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000413 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000414 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000415 shared_properties = {
416 'category': options.ensure_value('category', 'git_cl_try')
417 }
418 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000419 shared_properties['clobber'] = True
420 shared_properties.update(_get_properties_from_options(options) or {})
421
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000422 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000423 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000424 shared_tags.append({'key': 'retry_failed',
425 'value': '1'})
426
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000427 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000428 for (project, bucket, builder) in jobs:
429 properties = shared_properties.copy()
430 if 'presubmit' in builder.lower():
431 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000432
Edward Lemur45768512020-03-02 19:03:14 +0000433 requests.append({
434 'scheduleBuild': {
435 'requestId': str(uuid.uuid4()),
436 'builder': {
437 'project': getattr(options, 'project', None) or project,
438 'bucket': bucket,
439 'builder': builder,
440 },
441 'gerritChanges': gerrit_changes,
442 'properties': properties,
443 'tags': [
444 {'key': 'builder', 'value': builder},
445 ] + shared_tags,
446 }
447 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000448
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000449 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000450 requests[-1]['scheduleBuild']['gitilesCommit'] = {
451 'host': gerrit_changes[0]['host'],
452 'project': gerrit_changes[0]['project'],
453 'id': options.revision
454 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000455
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000456 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000457
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000458
Quinten Yearsley777660f2020-03-04 23:37:06 +0000459def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000460 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000461
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000462 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000463 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000464 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000465 request = {
466 'predicate': {
467 'gerritChanges': [changelist.GetGerritChange(patchset)],
468 },
469 'fields': ','.join('builds.*.' + field for field in fields),
470 }
tandrii221ab252016-10-06 08:12:04 -0700471
Edward Lemur5b929a42019-10-21 17:57:39 +0000472 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000473 if authenticator.has_cached_credentials():
474 http = authenticator.authorize(httplib2.Http())
475 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700476 print('Warning: Some results might be missing because %s' %
477 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000478 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000479 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000480 http.force_exception_to_status_code = True
481
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000482 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
483 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000484
Edward Lemur45768512020-03-02 19:03:14 +0000485
Edward Lemur5b929a42019-10-21 17:57:39 +0000486def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000487 """Fetches builds from the latest patchset that has builds (within
488 the last few patchsets).
489
490 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000491 changelist (Changelist): The CL to fetch builds for
492 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000493 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
494 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000495 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000496 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
497 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000498 """
499 assert buildbucket_host
500 assert changelist.GetIssue(), 'CL must be uploaded first'
501 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000502 if latest_patchset is None:
503 assert changelist.GetMostRecentPatchset()
504 ps = changelist.GetMostRecentPatchset()
505 else:
506 assert latest_patchset > 0, latest_patchset
507 ps = latest_patchset
508
Quinten Yearsley983111f2019-09-26 17:18:48 +0000509 min_ps = max(1, ps - 5)
510 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000511 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000512 if len(builds):
513 return builds, ps
514 ps -= 1
515 return [], 0
516
517
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000518def _filter_failed_for_retry(all_builds):
519 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000520
521 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000522 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000523 i.e. a list of buildbucket.v2.Builds which includes status and builder
524 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000525
526 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000527 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000528 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000529 """
Edward Lemur45768512020-03-02 19:03:14 +0000530 grouped = {}
531 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000532 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000533 key = (builder['project'], builder['bucket'], builder['builder'])
534 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000535
Edward Lemur45768512020-03-02 19:03:14 +0000536 jobs = []
537 for (project, bucket, builder), builds in grouped.items():
538 if 'triggered' in builder:
539 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
540 'from a parent. Please schedule a manual job for the parent '
541 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000542 continue
543 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
544 # Don't retry if any are running.
545 continue
Edward Lemur45768512020-03-02 19:03:14 +0000546 # If builder had several builds, retry only if the last one failed.
547 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
548 # build, but in case of retrying failed jobs retrying a flaky one makes
549 # sense.
550 builds = sorted(builds, key=lambda b: b['createTime'])
551 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
552 continue
553 # Don't retry experimental build previously triggered by CQ.
554 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
555 for t in builds[-1]['tags']):
556 continue
557 jobs.append((project, bucket, builder))
558
559 # Sort the jobs to make testing easier.
560 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000561
562
Quinten Yearsley777660f2020-03-04 23:37:06 +0000563def _print_tryjobs(options, builds):
564 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000566 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567 return
568
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000569 longest_builder = max(len(b['builder']['builder']) for b in builds)
570 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000571 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000572 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
573 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000574
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000575 builds_by_status = {}
576 for b in builds:
577 builds_by_status.setdefault(b['status'], []).append({
578 'id': b['id'],
579 'name': name_fmt.format(
580 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
581 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000582
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000583 sort_key = lambda b: (b['name'], b['id'])
584
585 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000586 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000587 if not builds:
588 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000589
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000590 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000591 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000592 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000593 else:
594 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
595
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000596 print(colorize(title))
597 for b in sorted(builds, key=sort_key):
598 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000599
600 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000601 print_builds(
602 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
603 print_builds(
604 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
605 color=Fore.MAGENTA)
606 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
607 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
608 color=Fore.MAGENTA)
609 print_builds('Started:', builds_by_status.pop('STARTED', []))
610 print_builds(
611 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000613 print_builds(
614 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000615 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000616
617
Aiden Bennerc08566e2018-10-03 17:52:42 +0000618def _ComputeDiffLineRanges(files, upstream_commit):
619 """Gets the changed line ranges for each file since upstream_commit.
620
621 Parses a git diff on provided files and returns a dict that maps a file name
622 to an ordered list of range tuples in the form (start_line, count).
623 Ranges are in the same format as a git diff.
624 """
625 # If files is empty then diff_output will be a full diff.
626 if len(files) == 0:
627 return {}
628
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000629 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000630 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000631 diff_output = RunGit(diff_cmd)
632
633 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
634 # 2 capture groups
635 # 0 == fname of diff file
636 # 1 == 'diff_start,diff_count' or 'diff_start'
637 # will match each of
638 # diff --git a/foo.foo b/foo.py
639 # @@ -12,2 +14,3 @@
640 # @@ -12,2 +17 @@
641 # running re.findall on the above string with pattern will give
642 # [('foo.py', ''), ('', '14,3'), ('', '17')]
643
644 curr_file = None
645 line_diffs = {}
646 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
647 if match[0] != '':
648 # Will match the second filename in diff --git a/a.py b/b.py.
649 curr_file = match[0]
650 line_diffs[curr_file] = []
651 else:
652 # Matches +14,3
653 if ',' in match[1]:
654 diff_start, diff_count = match[1].split(',')
655 else:
656 # Single line changes are of the form +12 instead of +12,1.
657 diff_start = match[1]
658 diff_count = 1
659
660 diff_start = int(diff_start)
661 diff_count = int(diff_count)
662
663 # If diff_count == 0 this is a removal we can ignore.
664 line_diffs[curr_file].append((diff_start, diff_count))
665
666 return line_diffs
667
668
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000669def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000670 """Checks if a yapf file is in any parent directory of fpath until top_dir.
671
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000672 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000673 is found returns None. Uses yapf_config_cache as a cache for previously found
674 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000675 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000676 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000677 # Return result if we've already computed it.
678 if fpath in yapf_config_cache:
679 return yapf_config_cache[fpath]
680
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000681 parent_dir = os.path.dirname(fpath)
682 if os.path.isfile(fpath):
683 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000684 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000685 # Otherwise fpath is a directory
686 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
687 if os.path.isfile(yapf_file):
688 ret = yapf_file
689 elif fpath == top_dir or parent_dir == fpath:
690 # If we're at the top level directory, or if we're at root
691 # there is no provided style.
692 ret = None
693 else:
694 # Otherwise recurse on the current directory.
695 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000696 yapf_config_cache[fpath] = ret
697 return ret
698
699
Brian Sheedyb4307d52019-12-02 19:18:17 +0000700def _GetYapfIgnorePatterns(top_dir):
701 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000702
703 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
704 but this functionality appears to break when explicitly passing files to
705 yapf for formatting. According to
706 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
707 the .yapfignore file should be in the directory that yapf is invoked from,
708 which we assume to be the top level directory in this case.
709
710 Args:
711 top_dir: The top level directory for the repository being formatted.
712
713 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000714 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000715 """
716 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000717 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000718 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000719 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000720
Brian Sheedyb4307d52019-12-02 19:18:17 +0000721 with open(yapfignore_file) as f:
722 for line in f.readlines():
723 stripped_line = line.strip()
724 # Comments and blank lines should be ignored.
725 if stripped_line.startswith('#') or stripped_line == '':
726 continue
727 ignore_patterns.add(stripped_line)
728 return ignore_patterns
729
730
731def _FilterYapfIgnoredFiles(filepaths, patterns):
732 """Filters out any filepaths that match any of the given patterns.
733
734 Args:
735 filepaths: An iterable of strings containing filepaths to filter.
736 patterns: An iterable of strings containing fnmatch patterns to filter on.
737
738 Returns:
739 A list of strings containing all the elements of |filepaths| that did not
740 match any of the patterns in |patterns|.
741 """
742 # Not inlined so that tests can use the same implementation.
743 return [f for f in filepaths
744 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000745
746
Aaron Gable13101a62018-02-09 13:20:41 -0800747def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000748 """Prints statistics about the change to the user."""
749 # --no-ext-diff is broken in some versions of Git, so try to work around
750 # this by overriding the environment (but there is still a problem if the
751 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000752 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000753 if 'GIT_EXTERNAL_DIFF' in env:
754 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000755
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000756 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800757 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000758 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000759
760
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000761class BuildbucketResponseException(Exception):
762 pass
763
764
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000765class Settings(object):
766 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000767 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000768 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769 self.tree_status_url = None
770 self.viewvc_url = None
771 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000772 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000773 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000774 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000775 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000776 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777
Edward Lemur26964072020-02-19 19:18:51 +0000778 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000779 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000780 if self.updated:
781 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000782
Edward Lemur26964072020-02-19 19:18:51 +0000783 # The only value that actually changes the behavior is
784 # autoupdate = "false". Everything else means "true".
785 autoupdate = (
786 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
787
788 cr_settings_file = FindCodereviewSettingsFile()
789 if autoupdate != 'false' and cr_settings_file:
790 LoadCodereviewSettingsFromFile(cr_settings_file)
791 cr_settings_file.close()
792
793 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000794
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000795 @staticmethod
796 def GetRelativeRoot():
797 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000798
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000799 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000800 if self.root is None:
801 self.root = os.path.abspath(self.GetRelativeRoot())
802 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000803
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804 def GetTreeStatusUrl(self, error_ok=False):
805 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000806 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
807 if self.tree_status_url is None and not error_ok:
808 DieWithError(
809 'You must configure your tree status URL by running '
810 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000811 return self.tree_status_url
812
813 def GetViewVCUrl(self):
814 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000815 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000816 return self.viewvc_url
817
rmistry@google.com90752582014-01-14 21:04:50 +0000818 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000819 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000820
rmistry@google.com5626a922015-02-26 14:03:30 +0000821 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000822 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000823 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000824 return run_post_upload_hook == "True"
825
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000826 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000827 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000828
ukai@chromium.orge8077812012-02-03 03:41:46 +0000829 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000830 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000831 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000832 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000833 return self.is_gerrit
834
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000835 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000836 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000837 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700838 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000839 if self.squash_gerrit_uploads is None:
840 # Default is squash now (http://crbug.com/611892#c23).
841 self.squash_gerrit_uploads = self._GetConfig(
842 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000843 return self.squash_gerrit_uploads
844
tandriia60502f2016-06-20 02:01:53 -0700845 def GetSquashGerritUploadsOverride(self):
846 """Return True or False if codereview.settings should be overridden.
847
848 Returns None if no override has been defined.
849 """
850 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000851 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700852 if result == 'true':
853 return True
854 if result == 'false':
855 return False
856 return None
857
tandrii@chromium.org28253532016-04-14 13:46:56 +0000858 def GetGerritSkipEnsureAuthenticated(self):
859 """Return True if EnsureAuthenticated should not be done for Gerrit
860 uploads."""
861 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000862 self.gerrit_skip_ensure_authenticated = self._GetConfig(
863 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000864 return self.gerrit_skip_ensure_authenticated
865
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000866 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000867 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000868 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000869 # Git requires single quotes for paths with spaces. We need to replace
870 # them with double quotes for Windows to treat such paths as a single
871 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000872 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000873 return self.git_editor or None
874
thestig@chromium.org44202a22014-03-11 19:22:18 +0000875 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000876 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000877
878 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000879 return self._GetConfig(
880 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000881
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000882 def GetFormatFullByDefault(self):
883 if self.format_full_by_default is None:
884 result = (
885 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
886 error_ok=True).strip())
887 self.format_full_by_default = (result == 'true')
888 return self.format_full_by_default
889
Edward Lemur26964072020-02-19 19:18:51 +0000890 def _GetConfig(self, key, default=''):
891 self._LazyUpdateIfNeeded()
892 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000893
894
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000895class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000896 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000897 NONE = 'none'
898 DRY_RUN = 'dry_run'
899 COMMIT = 'commit'
900
901 ALL_STATES = [NONE, DRY_RUN, COMMIT]
902
903
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000904class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000905 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000906 self.issue = issue
907 self.patchset = patchset
908 self.hostname = hostname
909
910 @property
911 def valid(self):
912 return self.issue is not None
913
914
Edward Lemurf38bc172019-09-03 21:02:13 +0000915def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000916 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
917 fail_result = _ParsedIssueNumberArgument()
918
Edward Lemur678a6842019-10-03 22:25:05 +0000919 if isinstance(arg, int):
920 return _ParsedIssueNumberArgument(issue=arg)
921 if not isinstance(arg, basestring):
922 return fail_result
923
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000924 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000925 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000926 if not arg.startswith('http'):
927 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700928
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000929 url = gclient_utils.UpgradeToHttps(arg)
930 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000931 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000932 except ValueError:
933 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200934
Edward Lemur678a6842019-10-03 22:25:05 +0000935 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
936 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
937 # Short urls like https://domain/<issue_number> can be used, but don't allow
938 # specifying the patchset (you'd 404), but we allow that here.
939 if parsed_url.path == '/':
940 part = parsed_url.fragment
941 else:
942 part = parsed_url.path
943
944 match = re.match(
945 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
946 if not match:
947 return fail_result
948
949 issue = int(match.group('issue'))
950 patchset = match.group('patchset')
951 return _ParsedIssueNumberArgument(
952 issue=issue,
953 patchset=int(patchset) if patchset else None,
954 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000955
956
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000957def _create_description_from_log(args):
958 """Pulls out the commit log to use as a base for the CL description."""
959 log_args = []
960 if len(args) == 1 and not args[0].endswith('.'):
961 log_args = [args[0] + '..']
962 elif len(args) == 1 and args[0].endswith('...'):
963 log_args = [args[0][:-1]]
964 elif len(args) == 2:
965 log_args = [args[0] + '..' + args[1]]
966 else:
967 log_args = args[:] # Hope for the best!
Edward Lemura12175c2020-03-09 16:58:26 +0000968 return RunGit(['log', '--pretty=format:%s%n%n%b'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000969
970
Aaron Gablea45ee112016-11-22 15:14:38 -0800971class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700972 def __init__(self, issue, url):
973 self.issue = issue
974 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800975 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700976
977 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800978 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700979 self.issue, self.url)
980
981
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100982_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000983 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100984 # TODO(tandrii): these two aren't known in Gerrit.
985 'approval', 'disapproval'])
986
987
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000988class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000989 """Changelist works with one changelist in local branch.
990
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000991 Notes:
992 * Not safe for concurrent multi-{thread,process} use.
993 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700994 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000995 """
996
Edward Lemur125d60a2019-09-13 18:25:41 +0000997 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000998 """Create a new ChangeList instance.
999
Edward Lemurf38bc172019-09-03 21:02:13 +00001000 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001001 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001002 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001003 global settings
1004 if not settings:
1005 # Happens when git_cl.py is used as a utility library.
1006 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001007
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008 self.branchref = branchref
1009 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001010 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001011 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001012 else:
1013 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001014 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001015 self.lookedup_issue = False
1016 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001017 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001018 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001019 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001020 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001021 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001022 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001023 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001024
Edward Lemur125d60a2019-09-13 18:25:41 +00001025 # Lazily cached values.
1026 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1027 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1028 # Map from change number (issue) to its detail cache.
1029 self._detail_cache = {}
1030
1031 if codereview_host is not None:
1032 assert not codereview_host.startswith('https://'), codereview_host
1033 self._gerrit_host = codereview_host
1034 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001035
1036 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001037 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001038
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001039 The return value is a string suitable for passing to git cl with the --cc
1040 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001041 """
1042 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001043 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001044 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001045 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1046 return self.cc
1047
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001048 def GetCCListWithoutDefault(self):
1049 """Return the users cc'd on this CL excluding default ones."""
1050 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001051 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001052 return self.cc
1053
Daniel Cheng7227d212017-11-17 08:12:37 -08001054 def ExtendCC(self, more_cc):
1055 """Extends the list of users to cc on this CL based on the changed files."""
1056 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001057
1058 def GetBranch(self):
1059 """Returns the short branch name, e.g. 'master'."""
1060 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001061 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001062 if not branchref:
1063 return None
1064 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001065 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001066 return self.branch
1067
1068 def GetBranchRef(self):
1069 """Returns the full branch name, e.g. 'refs/heads/master'."""
1070 self.GetBranch() # Poke the lazy loader.
1071 return self.branchref
1072
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001073 def ClearBranch(self):
1074 """Clears cached branch data of this object."""
1075 self.branch = self.branchref = None
1076
Edward Lemur85153282020-02-14 22:06:29 +00001077 def _GitGetBranchConfigValue(self, key, default=None):
1078 return scm.GIT.GetBranchConfig(
1079 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001080
Edward Lemur85153282020-02-14 22:06:29 +00001081 def _GitSetBranchConfigValue(self, key, value):
1082 action = 'set %s to %r' % (key, value)
1083 if not value:
1084 action = 'unset %s' % key
1085 assert self.GetBranch(), 'a branch is needed to ' + action
1086 return scm.GIT.SetBranchConfig(
1087 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001088
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001089 @staticmethod
1090 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001091 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001092 e.g. 'origin', 'refs/heads/master'
1093 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001094 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1095 settings.GetRoot(), branch)
1096 if not remote or not upstream_branch:
1097 DieWithError(
1098 'Unable to determine default branch to diff against.\n'
1099 'Either pass complete "git diff"-style arguments, like\n'
1100 ' git cl upload origin/master\n'
1101 'or verify this branch is set up to track another \n'
1102 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103
1104 return remote, upstream_branch
1105
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001106 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001107 upstream_branch = self.GetUpstreamBranch()
1108 if not BranchExists(upstream_branch):
1109 DieWithError('The upstream for the current branch (%s) does not exist '
1110 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001111 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001112 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001113
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001114 def GetUpstreamBranch(self):
1115 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001116 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001117 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001118 upstream_branch = upstream_branch.replace('refs/heads/',
1119 'refs/remotes/%s/' % remote)
1120 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1121 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001122 self.upstream_branch = upstream_branch
1123 return self.upstream_branch
1124
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001125 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001126 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001127 remote, branch = None, self.GetBranch()
1128 seen_branches = set()
1129 while branch not in seen_branches:
1130 seen_branches.add(branch)
1131 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001132 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001133 if remote != '.' or branch.startswith('refs/remotes'):
1134 break
1135 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001136 remotes = RunGit(['remote'], error_ok=True).split()
1137 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001138 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001139 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001140 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001141 logging.warn('Could not determine which remote this change is '
1142 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001143 else:
1144 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001145 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001146 branch = 'HEAD'
1147 if branch.startswith('refs/remotes'):
1148 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001149 elif branch.startswith('refs/branch-heads/'):
1150 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001151 else:
1152 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001153 return self._remote
1154
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001155 def GitSanityChecks(self, upstream_git_obj):
1156 """Checks git repo status and ensures diff is from local commits."""
1157
sbc@chromium.org79706062015-01-14 21:18:12 +00001158 if upstream_git_obj is None:
1159 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001160 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001161 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001162 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001163 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001164 return False
1165
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001166 # Verify the commit we're diffing against is in our current branch.
1167 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1168 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1169 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001170 print('ERROR: %s is not in the current branch. You may need to rebase '
1171 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 return False
1173
1174 # List the commits inside the diff, and verify they are all local.
1175 commits_in_diff = RunGit(
1176 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1177 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1178 remote_branch = remote_branch.strip()
1179 if code != 0:
1180 _, remote_branch = self.GetRemoteBranch()
1181
1182 commits_in_remote = RunGit(
1183 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1184
1185 common_commits = set(commits_in_diff) & set(commits_in_remote)
1186 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001187 print('ERROR: Your diff contains %d commits already in %s.\n'
1188 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1189 'the diff. If you are using a custom git flow, you can override'
1190 ' the reference used for this check with "git config '
1191 'gitcl.remotebranch <git-ref>".' % (
1192 len(common_commits), remote_branch, upstream_git_obj),
1193 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001194 return False
1195 return True
1196
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001197 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001198 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001199
1200 Returns None if it is not set.
1201 """
tandrii5d48c322016-08-18 16:19:37 -07001202 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001203
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001204 def GetRemoteUrl(self):
1205 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1206
1207 Returns None if there is no remote.
1208 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001209 is_cached, value = self._cached_remote_url
1210 if is_cached:
1211 return value
1212
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001213 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001214 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001215
Edward Lemur298f2cf2019-02-22 21:40:39 +00001216 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001217 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001218 if host:
1219 self._cached_remote_url = (True, url)
1220 return url
1221
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001222 # If it cannot be parsed as an url, assume it is a local directory,
1223 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001224 logging.warning('"%s" doesn\'t appear to point to a git host. '
1225 'Interpreting it as a local directory.', url)
1226 if not os.path.isdir(url):
1227 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001228 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1229 'but it doesn\'t exist.',
1230 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001231 return None
1232
1233 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001234 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001235
Edward Lemur79d4f992019-11-11 23:49:02 +00001236 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001237 if not host:
1238 logging.error(
1239 'Remote "%(remote)s" for branch "%(branch)s" points to '
1240 '"%(cache_path)s", but it is misconfigured.\n'
1241 '"%(cache_path)s" must be a git repo and must have a remote named '
1242 '"%(remote)s" pointing to the git host.', {
1243 'remote': remote,
1244 'cache_path': cache_path,
1245 'branch': self.GetBranch()})
1246 return None
1247
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001248 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001249 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001250
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001251 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001252 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001253 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001254 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1255 if self.issue is not None:
1256 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001257 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001258 return self.issue
1259
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 def GetIssueURL(self):
1261 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001262 issue = self.GetIssue()
1263 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001264 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001265 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001266
Edward Lemur6c6827c2020-02-06 21:15:18 +00001267 def FetchDescription(self, pretty=False):
1268 assert self.GetIssue(), 'issue is required to query Gerrit'
1269
Edward Lemur9aa1a962020-02-25 00:58:38 +00001270 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001271 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1272 current_rev = data['current_revision']
1273 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001274
1275 if not pretty:
1276 return self.description
1277
1278 # Set width to 72 columns + 2 space indent.
1279 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1280 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1281 lines = self.description.splitlines()
1282 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283
1284 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001285 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001286 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001287 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1288 if self.patchset is not None:
1289 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001290 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001291 return self.patchset
1292
Edward Lemur9aa1a962020-02-25 00:58:38 +00001293 def GetAuthor(self):
1294 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1295
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001296 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001297 """Set this branch's patchset. If patchset=0, clears the patchset."""
1298 assert self.GetBranch()
1299 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001300 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001301 else:
1302 self.patchset = int(patchset)
1303 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001304 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001305
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001306 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001307 """Set this branch's issue. If issue isn't given, clears the issue."""
1308 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001310 issue = int(issue)
1311 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001312 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001313 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001314 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001315 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001316 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001317 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001318 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001319 else:
tandrii5d48c322016-08-18 16:19:37 -07001320 # Reset all of these just to be clean.
1321 reset_suffixes = [
1322 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001323 self.IssueConfigKey(),
1324 self.PatchsetConfigKey(),
1325 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001326 ] + self._PostUnsetIssueProperties()
1327 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001328 try:
1329 self._GitSetBranchConfigValue(prop, None)
1330 except subprocess2.CalledProcessError:
1331 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001332 msg = RunGit(['log', '-1', '--format=%B']).strip()
1333 if msg and git_footers.get_footer_change_id(msg):
1334 print('WARNING: The change patched into this branch has a Change-Id. '
1335 'Removing it.')
1336 RunGit(['commit', '--amend', '-m',
1337 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001338 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001339 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001340 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001341
Edward Lemura12175c2020-03-09 16:58:26 +00001342 def GetChange(self, upstream_branch, description):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001343 if not self.GitSanityChecks(upstream_branch):
1344 DieWithError('\nGit sanity check failure')
1345
Edward Lemur7f6dec02020-02-06 20:23:58 +00001346 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001347 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001348 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001349 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001350 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001351 except subprocess2.CalledProcessError:
1352 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001353 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001354 'This branch probably doesn\'t exist anymore. To reset the\n'
1355 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001356 ' git branch --set-upstream-to origin/master %s\n'
1357 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001358 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001359
maruel@chromium.org52424302012-08-29 15:14:30 +00001360 issue = self.GetIssue()
1361 patchset = self.GetPatchset()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001362
Edward Lemur9aa1a962020-02-25 00:58:38 +00001363 author = self.GetAuthor()
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001364 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001365 name,
1366 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001367 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001368 files,
1369 issue,
1370 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001371 author,
1372 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001373
dsansomee2d6fd92016-09-08 00:10:47 -07001374 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001375 assert self.GetIssue(), 'issue is required to update description'
1376
1377 if gerrit_util.HasPendingChangeEdit(
1378 self._GetGerritHost(), self._GerritChangeIdentifier()):
1379 if not force:
1380 confirm_or_exit(
1381 'The description cannot be modified while the issue has a pending '
1382 'unpublished edit. Either publish the edit in the Gerrit web UI '
1383 'or delete it.\n\n', action='delete the unpublished edit')
1384
1385 gerrit_util.DeletePendingChangeEdit(
1386 self._GetGerritHost(), self._GerritChangeIdentifier())
1387 gerrit_util.SetCommitMessage(
1388 self._GetGerritHost(), self._GerritChangeIdentifier(),
1389 description, notify='NONE')
1390
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001391 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001392
Edward Lemur75526302020-02-27 22:31:05 +00001393 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001394 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001395 '--root', settings.GetRoot(),
1396 '--upstream', upstream,
1397 ]
1398
1399 args.extend(['--verbose'] * verbose)
1400
Edward Lemur99df04e2020-03-05 19:39:43 +00001401 author = self.GetAuthor()
1402 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001403 issue = self.GetIssue()
1404 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001405 if author:
1406 args.extend(['--author', author])
1407 if gerrit_url:
1408 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001409 if issue:
1410 args.extend(['--issue', str(issue)])
1411 if patchset:
1412 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001413
Edward Lemur75526302020-02-27 22:31:05 +00001414 return args
1415
1416 def RunHook(
1417 self, committing, may_prompt, verbose, parallel, upstream, description,
1418 all_files):
1419 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1420 args = self._GetCommonPresubmitArgs(verbose, upstream)
1421 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001422 if may_prompt:
1423 args.append('--may_prompt')
1424 if parallel:
1425 args.append('--parallel')
1426 if all_files:
1427 args.append('--all_files')
1428
1429 with gclient_utils.temporary_file() as description_file:
1430 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001431
1432 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001433 args.extend(['--json_output', json_output])
1434 args.extend(['--description_file', description_file])
1435
1436 start = time_time()
1437 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1438 exit_code = p.wait()
1439 metrics.collector.add_repeated('sub_commands', {
1440 'command': 'presubmit',
1441 'execution_time': time_time() - start,
1442 'exit_code': exit_code,
1443 })
1444
1445 if exit_code:
1446 sys.exit(exit_code)
1447
1448 json_results = gclient_utils.FileRead(json_output)
1449 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001450
Edward Lemur75526302020-02-27 22:31:05 +00001451 def RunPostUploadHook(self, verbose, upstream, description):
1452 args = self._GetCommonPresubmitArgs(verbose, upstream)
1453 args.append('--post_upload')
1454
1455 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001456 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001457 args.extend(['--description_file', description_file])
1458 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1459 p.wait()
1460
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001461 def CMDUpload(self, options, git_diff_args, orig_args):
1462 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001463 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001464 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001465 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001466 else:
1467 if self.GetBranch() is None:
1468 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1469
1470 # Default to diffing against common ancestor of upstream branch
1471 base_branch = self.GetCommonAncestorWithUpstream()
1472 git_diff_args = [base_branch, 'HEAD']
1473
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001474 # Fast best-effort checks to abort before running potentially expensive
1475 # hooks if uploading is likely to fail anyway. Passing these checks does
1476 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001477 self.EnsureAuthenticated(force=options.force)
1478 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001479
Edward Lemura12175c2020-03-09 16:58:26 +00001480 # Get description message for upload.
1481 if self.GetIssue():
1482 description = self.FetchDescription()
1483 elif options.message:
1484 description = options.message
1485 else:
1486 description = _create_description_from_log(git_diff_args)
1487 if options.title and options.squash:
1488 description = options.title + '\n\n' + message
1489
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001490 # Apply watchlists on upload.
Edward Lemura12175c2020-03-09 16:58:26 +00001491 change = self.GetChange(base_branch, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001492 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1493 files = [f.LocalPath() for f in change.AffectedFiles()]
1494 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001495 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001496
Edward Lemur75526302020-02-27 22:31:05 +00001497 if options.reviewers or options.tbrs or options.add_owners_to:
1498 # Set the reviewer list now so that presubmit checks can access it.
1499 change_description = ChangeDescription(description)
1500 change_description.update_reviewers(options.reviewers,
1501 options.tbrs,
1502 options.add_owners_to,
1503 change)
1504 description = change_description.description
1505
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001506 if not options.bypass_hooks:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001507 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001508 may_prompt=not options.force,
1509 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001510 parallel=options.parallel,
1511 upstream=base_branch,
1512 description=description,
1513 all_files=False)
1514 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001515
Aaron Gable13101a62018-02-09 13:20:41 -08001516 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001517 ret = self.CMDUploadChange(
1518 options, git_diff_args, custom_cl_base, change, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001519 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001520 self._GitSetBranchConfigValue(
1521 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001522 # Run post upload hooks, if specified.
1523 if settings.GetRunPostUploadHook():
Edward Lemur75526302020-02-27 22:31:05 +00001524 self.RunPostUploadHook(options.verbose, base_branch, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001525
1526 # Upload all dependencies if specified.
1527 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001528 print()
1529 print('--dependencies has been specified.')
1530 print('All dependent local branches will be re-uploaded.')
1531 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001532 # Remove the dependencies flag from args so that we do not end up in a
1533 # loop.
1534 orig_args.remove('--dependencies')
1535 ret = upload_branch_deps(self, orig_args)
1536 return ret
1537
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001538 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001539 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001540
1541 Issue must have been already uploaded and known.
1542 """
1543 assert new_state in _CQState.ALL_STATES
1544 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001545 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001546 vote_map = {
1547 _CQState.NONE: 0,
1548 _CQState.DRY_RUN: 1,
1549 _CQState.COMMIT: 2,
1550 }
1551 labels = {'Commit-Queue': vote_map[new_state]}
1552 notify = False if new_state == _CQState.DRY_RUN else None
1553 gerrit_util.SetReview(
1554 self._GetGerritHost(), self._GerritChangeIdentifier(),
1555 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001556 return 0
1557 except KeyboardInterrupt:
1558 raise
1559 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001560 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001561 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001562 ' * Your project has no CQ,\n'
1563 ' * You don\'t have permission to change the CQ state,\n'
1564 ' * There\'s a bug in this code (see stack trace below).\n'
1565 'Consider specifying which bots to trigger manually or asking your '
1566 'project owners for permissions or contacting Chrome Infra at:\n'
1567 'https://www.chromium.org/infra\n\n' %
1568 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001569 # Still raise exception so that stack trace is printed.
1570 raise
1571
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001572 def _GetGerritHost(self):
1573 # Lazy load of configs.
1574 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001575 if self._gerrit_host and '.' not in self._gerrit_host:
1576 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1577 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001578 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001579 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001580 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001581 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001582 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1583 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001584 return self._gerrit_host
1585
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001586 def _GetGitHost(self):
1587 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001588 remote_url = self.GetRemoteUrl()
1589 if not remote_url:
1590 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001591 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001592
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001593 def GetCodereviewServer(self):
1594 if not self._gerrit_server:
1595 # If we're on a branch then get the server potentially associated
1596 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001597 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001598 self._gerrit_server = self._GitGetBranchConfigValue(
1599 self.CodereviewServerConfigKey())
1600 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001601 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001602 if not self._gerrit_server:
1603 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1604 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001605 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001606 parts[0] = parts[0] + '-review'
1607 self._gerrit_host = '.'.join(parts)
1608 self._gerrit_server = 'https://%s' % self._gerrit_host
1609 return self._gerrit_server
1610
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001611 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001612 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001613 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001614 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001615 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001616 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001617 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001618 if project.endswith('.git'):
1619 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001620 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1621 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1622 # gitiles/git-over-https protocol. E.g.,
1623 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1624 # as
1625 # https://chromium.googlesource.com/v8/v8
1626 if project.startswith('a/'):
1627 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001628 return project
1629
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001630 def _GerritChangeIdentifier(self):
1631 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1632
1633 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001634 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001635 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001636 project = self._GetGerritProject()
1637 if project:
1638 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1639 # Fall back on still unique, but less efficient change number.
1640 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001641
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001642 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001643 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001644 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001645
tandrii5d48c322016-08-18 16:19:37 -07001646 @classmethod
1647 def PatchsetConfigKey(cls):
1648 return 'gerritpatchset'
1649
1650 @classmethod
1651 def CodereviewServerConfigKey(cls):
1652 return 'gerritserver'
1653
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001654 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001655 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001656 if settings.GetGerritSkipEnsureAuthenticated():
1657 # For projects with unusual authentication schemes.
1658 # See http://crbug.com/603378.
1659 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001660
1661 # Check presence of cookies only if using cookies-based auth method.
1662 cookie_auth = gerrit_util.Authenticator.get()
1663 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001664 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001665
Florian Mayerae510e82020-01-30 21:04:48 +00001666 remote_url = self.GetRemoteUrl()
1667 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001668 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001669 return
1670 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001671 logging.warning('Ignoring branch %(branch)s with non-https remote '
1672 '%(remote)s', {
1673 'branch': self.branch,
1674 'remote': self.GetRemoteUrl()
1675 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001676 return
1677
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001678 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001679 self.GetCodereviewServer()
1680 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001681 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001682
1683 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1684 git_auth = cookie_auth.get_auth_header(git_host)
1685 if gerrit_auth and git_auth:
1686 if gerrit_auth == git_auth:
1687 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001688 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001689 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001690 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001691 ' %s\n'
1692 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001693 ' Consider running the following command:\n'
1694 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001695 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001696 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001697 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001698 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001699 cookie_auth.get_new_password_message(git_host)))
1700 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001701 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001702 return
1703 else:
1704 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001705 ([] if gerrit_auth else [self._gerrit_host]) +
1706 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001707 DieWithError('Credentials for the following hosts are required:\n'
1708 ' %s\n'
1709 'These are read from %s (or legacy %s)\n'
1710 '%s' % (
1711 '\n '.join(missing),
1712 cookie_auth.get_gitcookies_path(),
1713 cookie_auth.get_netrc_path(),
1714 cookie_auth.get_new_password_message(git_host)))
1715
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001716 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001717 if not self.GetIssue():
1718 return
1719
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001720 status = self._GetChangeDetail()['status']
1721 if status in ('MERGED', 'ABANDONED'):
1722 DieWithError('Change %s has been %s, new uploads are not allowed' %
1723 (self.GetIssueURL(),
1724 'submitted' if status == 'MERGED' else 'abandoned'))
1725
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001726 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1727 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1728 # Apparently this check is not very important? Otherwise get_auth_email
1729 # could have been added to other implementations of Authenticator.
1730 cookies_auth = gerrit_util.Authenticator.get()
1731 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001732 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001733
1734 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001735 if self.GetIssueOwner() == cookies_user:
1736 return
1737 logging.debug('change %s owner is %s, cookies user is %s',
1738 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001739 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001740 # so ask what Gerrit thinks of this user.
1741 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1742 if details['email'] == self.GetIssueOwner():
1743 return
1744 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001745 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001746 'as %s.\n'
1747 'Uploading may fail due to lack of permissions.' %
1748 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1749 confirm_or_exit(action='upload')
1750
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001751 def _PostUnsetIssueProperties(self):
1752 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001753 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001754
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001755 def GetGerritObjForPresubmit(self):
1756 return presubmit_support.GerritAccessor(self._GetGerritHost())
1757
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001758 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001759 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001760 or CQ status, assuming adherence to a common workflow.
1761
1762 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001763 * 'error' - error from review tool (including deleted issues)
1764 * 'unsent' - no reviewers added
1765 * 'waiting' - waiting for review
1766 * 'reply' - waiting for uploader to reply to review
1767 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001768 * 'dry-run' - dry-running in the CQ
1769 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001770 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001771 """
1772 if not self.GetIssue():
1773 return None
1774
1775 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001776 data = self._GetChangeDetail([
1777 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001778 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001779 return 'error'
1780
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001781 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001782 return 'closed'
1783
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001784 cq_label = data['labels'].get('Commit-Queue', {})
1785 max_cq_vote = 0
1786 for vote in cq_label.get('all', []):
1787 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1788 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001789 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001790 if max_cq_vote == 1:
1791 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001792
Aaron Gable9ab38c62017-04-06 14:36:33 -07001793 if data['labels'].get('Code-Review', {}).get('approved'):
1794 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001795
1796 if not data.get('reviewers', {}).get('REVIEWER', []):
1797 return 'unsent'
1798
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001799 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001800 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001801 while messages:
1802 m = messages.pop()
1803 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001804 # Ignore replies from CQ.
1805 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001806 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001807 # Most recent message was by owner.
1808 return 'waiting'
1809 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001810 # Some reply from non-owner.
1811 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001812
1813 # Somehow there are no messages even though there are reviewers.
1814 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001815
1816 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001817 if not self.GetIssue():
1818 return None
1819
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001820 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001821 patchset = data['revisions'][data['current_revision']]['_number']
1822 self.SetPatchset(patchset)
1823 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001824
Aaron Gable636b13f2017-07-14 10:42:48 -07001825 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001826 gerrit_util.SetReview(
1827 self._GetGerritHost(), self._GerritChangeIdentifier(),
1828 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001829
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001830 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001831 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001832 # CURRENT_REVISION is included to get the latest patchset so that
1833 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001834 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001835 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1836 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001837 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001838 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001839 robot_file_comments = gerrit_util.GetChangeRobotComments(
1840 self._GetGerritHost(), self._GerritChangeIdentifier())
1841
1842 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001843 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001844 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001845 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001846 line_comments = file_comments.setdefault(path, [])
1847 line_comments.extend(
1848 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001849
1850 # Build dictionary of file comments for easy access and sorting later.
1851 # {author+date: {path: {patchset: {line: url+message}}}}
1852 comments = collections.defaultdict(
1853 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001854 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001855 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001856 tag = comment.get('tag', '')
1857 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001858 continue
1859 key = (comment['author']['email'], comment['updated'])
1860 if comment.get('side', 'REVISION') == 'PARENT':
1861 patchset = 'Base'
1862 else:
1863 patchset = 'PS%d' % comment['patch_set']
1864 line = comment.get('line', 0)
1865 url = ('https://%s/c/%s/%s/%s#%s%s' %
1866 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1867 'b' if comment.get('side') == 'PARENT' else '',
1868 str(line) if line else ''))
1869 comments[key][path][patchset][line] = (url, comment['message'])
1870
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001871 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001872 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001873 summary = self._BuildCommentSummary(msg, comments, readable)
1874 if summary:
1875 summaries.append(summary)
1876 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001877
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001878 @staticmethod
1879 def _BuildCommentSummary(msg, comments, readable):
1880 key = (msg['author']['email'], msg['date'])
1881 # Don't bother showing autogenerated messages that don't have associated
1882 # file or line comments. this will filter out most autogenerated
1883 # messages, but will keep robot comments like those from Tricium.
1884 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1885 if is_autogenerated and not comments.get(key):
1886 return None
1887 message = msg['message']
1888 # Gerrit spits out nanoseconds.
1889 assert len(msg['date'].split('.')[-1]) == 9
1890 date = datetime.datetime.strptime(msg['date'][:-3],
1891 '%Y-%m-%d %H:%M:%S.%f')
1892 if key in comments:
1893 message += '\n'
1894 for path, patchsets in sorted(comments.get(key, {}).items()):
1895 if readable:
1896 message += '\n%s' % path
1897 for patchset, lines in sorted(patchsets.items()):
1898 for line, (url, content) in sorted(lines.items()):
1899 if line:
1900 line_str = 'Line %d' % line
1901 path_str = '%s:%d:' % (path, line)
1902 else:
1903 line_str = 'File comment'
1904 path_str = '%s:0:' % path
1905 if readable:
1906 message += '\n %s, %s: %s' % (patchset, line_str, url)
1907 message += '\n %s\n' % content
1908 else:
1909 message += '\n%s ' % path_str
1910 message += '\n%s\n' % content
1911
1912 return _CommentSummary(
1913 date=date,
1914 message=message,
1915 sender=msg['author']['email'],
1916 autogenerated=is_autogenerated,
1917 # These could be inferred from the text messages and correlated with
1918 # Code-Review label maximum, however this is not reliable.
1919 # Leaving as is until the need arises.
1920 approval=False,
1921 disapproval=False,
1922 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001923
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001924 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001925 gerrit_util.AbandonChange(
1926 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001927
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001928 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001929 gerrit_util.SubmitChange(
1930 self._GetGerritHost(), self._GerritChangeIdentifier(),
1931 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001932
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001933 def _GetChangeDetail(self, options=None):
1934 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001935 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001936 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001937
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001938 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001939 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001940 options.append('CURRENT_COMMIT')
1941
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001942 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001943 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001944 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001945
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001946 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1947 # Assumption: data fetched before with extra options is suitable
1948 # for return for a smaller set of options.
1949 # For example, if we cached data for
1950 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1951 # and request is for options=[CURRENT_REVISION],
1952 # THEN we can return prior cached data.
1953 if options_set.issubset(cached_options_set):
1954 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001955
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001956 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001957 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001958 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001959 except gerrit_util.GerritError as e:
1960 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001961 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001962 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001963
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001964 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001965 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001966
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001967 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001968 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001969 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001970 data = gerrit_util.GetChangeCommit(
1971 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001972 except gerrit_util.GerritError as e:
1973 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001974 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001975 raise
agable32978d92016-11-01 12:55:02 -07001976 return data
1977
Karen Qian40c19422019-03-13 21:28:29 +00001978 def _IsCqConfigured(self):
1979 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001980 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001981
Olivier Robin75ee7252018-04-13 10:02:56 +02001982 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001983 if git_common.is_dirty_git_tree('land'):
1984 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001985
tandriid60367b2016-06-22 05:25:12 -07001986 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001987 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001988 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001989 'which can test and land changes for you. '
1990 'Are you sure you wish to bypass it?\n',
1991 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001992 differs = True
tandriic4344b52016-08-29 06:04:54 -07001993 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001994 # Note: git diff outputs nothing if there is no diff.
1995 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001996 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001997 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001998 if detail['current_revision'] == last_upload:
1999 differs = False
2000 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002001 print('WARNING: Local branch contents differ from latest uploaded '
2002 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002003 if differs:
2004 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002005 confirm_or_exit(
2006 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2007 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002008 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002009 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002010 upstream = self.GetCommonAncestorWithUpstream()
2011 if self.GetIssue():
2012 description = self.FetchDescription()
2013 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002014 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002015 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002016 committing=True,
2017 may_prompt=not force,
2018 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002019 parallel=parallel,
2020 upstream=upstream,
2021 description=description,
2022 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002023
2024 self.SubmitIssue(wait_for_merge=True)
2025 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002026 links = self._GetChangeCommit().get('web_links', [])
2027 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002028 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002029 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002030 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002031 return 0
2032
Edward Lemurf38bc172019-09-03 21:02:13 +00002033 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002034 assert parsed_issue_arg.valid
2035
Edward Lemur125d60a2019-09-13 18:25:41 +00002036 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002037
2038 if parsed_issue_arg.hostname:
2039 self._gerrit_host = parsed_issue_arg.hostname
2040 self._gerrit_server = 'https://%s' % self._gerrit_host
2041
tandriic2405f52016-10-10 08:13:15 -07002042 try:
2043 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002044 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002045 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002046
2047 if not parsed_issue_arg.patchset:
2048 # Use current revision by default.
2049 revision_info = detail['revisions'][detail['current_revision']]
2050 patchset = int(revision_info['_number'])
2051 else:
2052 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002053 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002054 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2055 break
2056 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002057 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002058 (parsed_issue_arg.patchset, self.GetIssue()))
2059
Edward Lemur125d60a2019-09-13 18:25:41 +00002060 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002061 if remote_url.endswith('.git'):
2062 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002063 remote_url = remote_url.rstrip('/')
2064
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002065 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002066 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002067
2068 if remote_url != fetch_info['url']:
2069 DieWithError('Trying to patch a change from %s but this repo appears '
2070 'to be %s.' % (fetch_info['url'], remote_url))
2071
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002072 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002073
Aaron Gable62619a32017-06-16 08:22:09 -07002074 if force:
2075 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2076 print('Checked out commit for change %i patchset %i locally' %
2077 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002078 elif nocommit:
2079 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2080 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002081 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002082 RunGit(['cherry-pick', 'FETCH_HEAD'])
2083 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002084 (parsed_issue_arg.issue, patchset))
2085 print('Note: this created a local commit which does not have '
2086 'the same hash as the one uploaded for review. This will make '
2087 'uploading changes based on top of this branch difficult.\n'
2088 'If you want to do that, use "git cl patch --force" instead.')
2089
Stefan Zagerd08043c2017-10-12 12:07:02 -07002090 if self.GetBranch():
2091 self.SetIssue(parsed_issue_arg.issue)
2092 self.SetPatchset(patchset)
2093 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2094 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2095 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2096 else:
2097 print('WARNING: You are in detached HEAD state.\n'
2098 'The patch has been applied to your checkout, but you will not be '
2099 'able to upload a new patch set to the gerrit issue.\n'
2100 'Try using the \'-b\' option if you would like to work on a '
2101 'branch and/or upload a new patch set.')
2102
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002103 return 0
2104
tandrii16e0b4e2016-06-07 10:34:28 -07002105 def _GerritCommitMsgHookCheck(self, offer_removal):
2106 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2107 if not os.path.exists(hook):
2108 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002109 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2110 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002111 data = gclient_utils.FileRead(hook)
2112 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2113 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002114 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002115 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002116 'and may interfere with it in subtle ways.\n'
2117 'We recommend you remove the commit-msg hook.')
2118 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002119 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002120 gclient_utils.rm_file_or_tree(hook)
2121 print('Gerrit commit-msg hook removed.')
2122 else:
2123 print('OK, will keep Gerrit commit-msg hook in place.')
2124
Edward Lemur1b52d872019-05-09 21:12:12 +00002125 def _CleanUpOldTraces(self):
2126 """Keep only the last |MAX_TRACES| traces."""
2127 try:
2128 traces = sorted([
2129 os.path.join(TRACES_DIR, f)
2130 for f in os.listdir(TRACES_DIR)
2131 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2132 and not f.startswith('tmp'))
2133 ])
2134 traces_to_delete = traces[:-MAX_TRACES]
2135 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002136 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002137 except OSError:
2138 print('WARNING: Failed to remove old git traces from\n'
2139 ' %s'
2140 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002141
Edward Lemur5737f022019-05-17 01:24:00 +00002142 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002143 """Zip and write the git push traces stored in traces_dir."""
2144 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002145 traces_zip = trace_name + '-traces'
2146 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002147 # Create a temporary dir to store git config and gitcookies in. It will be
2148 # compressed and stored next to the traces.
2149 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002150 git_info_zip = trace_name + '-git-info'
2151
Edward Lemur5737f022019-05-17 01:24:00 +00002152 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002153 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002154 git_push_metadata['now'] = git_push_metadata['now'].decode(
2155 sys.stdin.encoding)
2156
Edward Lemur1b52d872019-05-09 21:12:12 +00002157 git_push_metadata['trace_name'] = trace_name
2158 gclient_utils.FileWrite(
2159 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2160
2161 # Keep only the first 6 characters of the git hashes on the packet
2162 # trace. This greatly decreases size after compression.
2163 packet_traces = os.path.join(traces_dir, 'trace-packet')
2164 if os.path.isfile(packet_traces):
2165 contents = gclient_utils.FileRead(packet_traces)
2166 gclient_utils.FileWrite(
2167 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2168 shutil.make_archive(traces_zip, 'zip', traces_dir)
2169
2170 # Collect and compress the git config and gitcookies.
2171 git_config = RunGit(['config', '-l'])
2172 gclient_utils.FileWrite(
2173 os.path.join(git_info_dir, 'git-config'),
2174 git_config)
2175
2176 cookie_auth = gerrit_util.Authenticator.get()
2177 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2178 gitcookies_path = cookie_auth.get_gitcookies_path()
2179 if os.path.isfile(gitcookies_path):
2180 gitcookies = gclient_utils.FileRead(gitcookies_path)
2181 gclient_utils.FileWrite(
2182 os.path.join(git_info_dir, 'gitcookies'),
2183 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2184 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2185
Edward Lemur1b52d872019-05-09 21:12:12 +00002186 gclient_utils.rmtree(git_info_dir)
2187
2188 def _RunGitPushWithTraces(
2189 self, change_desc, refspec, refspec_opts, git_push_metadata):
2190 """Run git push and collect the traces resulting from the execution."""
2191 # Create a temporary directory to store traces in. Traces will be compressed
2192 # and stored in a 'traces' dir inside depot_tools.
2193 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002194 trace_name = os.path.join(
2195 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002196
2197 env = os.environ.copy()
2198 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2199 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002200 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002201 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2202 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2203 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2204
2205 try:
2206 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002207 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002208 before_push = time_time()
2209 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002210 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002211 env=env,
2212 print_stdout=True,
2213 # Flush after every line: useful for seeing progress when running as
2214 # recipe.
2215 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002216 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002217 except subprocess2.CalledProcessError as e:
2218 push_returncode = e.returncode
2219 DieWithError('Failed to create a change. Please examine output above '
2220 'for the reason of the failure.\n'
2221 'Hint: run command below to diagnose common Git/Gerrit '
2222 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002223 ' git cl creds-check\n'
2224 '\n'
2225 'If git-cl is not working correctly, file a bug under the '
2226 'Infra>SDK component including the files below.\n'
2227 'Review the files before upload, since they might contain '
2228 'sensitive information.\n'
2229 'Set the Restrict-View-Google label so that they are not '
2230 'publicly accessible.\n'
2231 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002232 change_desc)
2233 finally:
2234 execution_time = time_time() - before_push
2235 metrics.collector.add_repeated('sub_commands', {
2236 'command': 'git push',
2237 'execution_time': execution_time,
2238 'exit_code': push_returncode,
2239 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2240 })
2241
Edward Lemur1b52d872019-05-09 21:12:12 +00002242 git_push_metadata['execution_time'] = execution_time
2243 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002244 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002245
Edward Lemur1b52d872019-05-09 21:12:12 +00002246 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002247 gclient_utils.rmtree(traces_dir)
2248
2249 return push_stdout
2250
Edward Lemura12175c2020-03-09 16:58:26 +00002251 def CMDUploadChange(
2252 self, options, git_diff_args, custom_cl_base, change, message):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002253 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002254 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002255 # Load default for user, repo, squash=true, in this order.
2256 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002257
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002258 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002259 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002260 # This may be None; default fallback value is determined in logic below.
2261 title = options.title
2262
Dominic Battre7d1c4842017-10-27 09:17:28 +02002263 # Extract bug number from branch name.
2264 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002265 fixed = options.fixed
2266 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2267 self.GetBranch())
2268 if not bug and not fixed and match:
2269 if match.group('type') == 'bug':
2270 bug = match.group('bugnum')
2271 else:
2272 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002273
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002274 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002275 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002276 if self.GetIssue():
Aaron Gableb56ad332017-01-06 15:24:31 -08002277 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002278 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002279 # When uploading a subsequent patchset, -m|--message is taken
2280 # as the patchset title if --title was not provided.
2281 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002282 else:
2283 default_title = RunGit(
2284 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002285 if options.force:
2286 title = default_title
2287 else:
2288 title = ask_for_data(
2289 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002290
2291 # User requested to change description
2292 if options.edit_description:
2293 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2294 change_desc.prompt()
2295 message = change_desc.description
2296
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002297 change_id = self._GetChangeDetail()['change_id']
2298 while True:
2299 footer_change_ids = git_footers.get_footer_change_id(message)
2300 if footer_change_ids == [change_id]:
2301 break
2302 if not footer_change_ids:
2303 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002304 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002305 continue
2306 # There is already a valid footer but with different or several ids.
2307 # Doing this automatically is non-trivial as we don't want to lose
2308 # existing other footers, yet we want to append just 1 desired
2309 # Change-Id. Thus, just create a new footer, but let user verify the
2310 # new description.
2311 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002312 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002313 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002314 print(
2315 'WARNING: change %s has Change-Id footer(s):\n'
2316 ' %s\n'
2317 'but change has Change-Id %s, according to Gerrit.\n'
2318 'Please, check the proposed correction to the description, '
2319 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2320 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2321 change_id))
2322 confirm_or_exit(action='edit')
2323 change_desc.prompt()
2324
2325 message = change_desc.description
2326 if not message:
2327 DieWithError("Description is empty. Aborting...")
2328
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002329 # Continue the while loop.
2330 # Sanity check of this code - we should end up with proper message
2331 # footer.
2332 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002333 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002334 else: # if not self.GetIssue()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002335 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002336 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002337 change_desc.prompt()
2338
Aaron Gableb56ad332017-01-06 15:24:31 -08002339 # On first upload, patchset title is always this string, while
2340 # --title flag gets converted to first line of message.
2341 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002342 if not change_desc.description:
2343 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002344 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002345 if len(change_ids) > 1:
2346 DieWithError('too many Change-Id footers, at most 1 allowed.')
2347 if not change_ids:
2348 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002349 change_desc.set_description(git_footers.add_footer_change_id(
2350 change_desc.description,
2351 GenerateGerritChangeId(change_desc.description)))
2352 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002353 assert len(change_ids) == 1
2354 change_id = change_ids[0]
2355
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002356 if options.reviewers or options.tbrs or options.add_owners_to:
2357 change_desc.update_reviewers(options.reviewers, options.tbrs,
2358 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002359 if options.preserve_tryjobs:
2360 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002361
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002362 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002363 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2364 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002365 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002366 with gclient_utils.temporary_file() as desc_tempfile:
2367 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2368 ref_to_push = RunGit(
2369 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002370 else: # if not options.squash
Edward Lemura12175c2020-03-09 16:58:26 +00002371 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002372 if not change_desc.description:
2373 DieWithError("Description is empty. Aborting...")
2374
2375 if not git_footers.get_footer_change_id(change_desc.description):
2376 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002377 change_desc.set_description(
Edward Lemura12175c2020-03-09 16:58:26 +00002378 self._AddChangeIdToCommitMessage(message, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002379 if options.reviewers or options.tbrs or options.add_owners_to:
2380 change_desc.update_reviewers(options.reviewers, options.tbrs,
2381 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002382 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002383 # For no-squash mode, we assume the remote called "origin" is the one we
2384 # want. It is not worthwhile to support different workflows for
2385 # no-squash mode.
2386 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002387 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2388
2389 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002390 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002391 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2392 ref_to_push)]).splitlines()
2393 if len(commits) > 1:
2394 print('WARNING: This will upload %d commits. Run the following command '
2395 'to see which commits will be uploaded: ' % len(commits))
2396 print('git log %s..%s' % (parent, ref_to_push))
2397 print('You can also use `git squash-branch` to squash these into a '
2398 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002399 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002400
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002401 if options.reviewers or options.tbrs or options.add_owners_to:
2402 change_desc.update_reviewers(options.reviewers, options.tbrs,
2403 options.add_owners_to, change)
2404
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002405 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002406 cc = []
2407 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2408 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2409 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002410 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002411 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002412 if options.cc:
2413 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002414 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002415 if change_desc.get_cced():
2416 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002417 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2418 valid_accounts = set(reviewers + cc)
2419 # TODO(crbug/877717): relax this for all hosts.
2420 else:
2421 valid_accounts = gerrit_util.ValidAccounts(
2422 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002423 logging.info('accounts %s are recognized, %s invalid',
2424 sorted(valid_accounts),
2425 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002426
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002427 # Extra options that can be specified at push time. Doc:
2428 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002429 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002430
Aaron Gable844cf292017-06-28 11:32:59 -07002431 # By default, new changes are started in WIP mode, and subsequent patchsets
2432 # don't send email. At any time, passing --send-mail will mark the change
2433 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002434 if options.send_mail:
2435 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002436 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002437 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002438 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002439 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002440 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002441
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002442 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002443 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002444
Aaron Gable9b713dd2016-12-14 16:04:21 -08002445 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002446 # Punctuation and whitespace in |title| must be percent-encoded.
2447 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002448
agablec6787972016-09-09 16:13:34 -07002449 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002450 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002451
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002452 for r in sorted(reviewers):
2453 if r in valid_accounts:
2454 refspec_opts.append('r=%s' % r)
2455 reviewers.remove(r)
2456 else:
2457 # TODO(tandrii): this should probably be a hard failure.
2458 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2459 % r)
2460 for c in sorted(cc):
2461 # refspec option will be rejected if cc doesn't correspond to an
2462 # account, even though REST call to add such arbitrary cc may succeed.
2463 if c in valid_accounts:
2464 refspec_opts.append('cc=%s' % c)
2465 cc.remove(c)
2466
rmistry9eadede2016-09-19 11:22:43 -07002467 if options.topic:
2468 # Documentation on Gerrit topics is here:
2469 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002470 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002471
Edward Lemur687ca902018-12-05 02:30:30 +00002472 if options.enable_auto_submit:
2473 refspec_opts.append('l=Auto-Submit+1')
2474 if options.use_commit_queue:
2475 refspec_opts.append('l=Commit-Queue+2')
2476 elif options.cq_dry_run:
2477 refspec_opts.append('l=Commit-Queue+1')
2478
2479 if change_desc.get_reviewers(tbr_only=True):
2480 score = gerrit_util.GetCodeReviewTbrScore(
2481 self._GetGerritHost(),
2482 self._GetGerritProject())
2483 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002484
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002485 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002486 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002487 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002488 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002489 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2490
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002491 refspec_suffix = ''
2492 if refspec_opts:
2493 refspec_suffix = '%' + ','.join(refspec_opts)
2494 assert ' ' not in refspec_suffix, (
2495 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2496 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2497
Edward Lemur1b52d872019-05-09 21:12:12 +00002498 git_push_metadata = {
2499 'gerrit_host': self._GetGerritHost(),
2500 'title': title or '<untitled>',
2501 'change_id': change_id,
2502 'description': change_desc.description,
2503 }
2504 push_stdout = self._RunGitPushWithTraces(
2505 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002506
2507 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002508 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002509 change_numbers = [m.group(1)
2510 for m in map(regex.match, push_stdout.splitlines())
2511 if m]
2512 if len(change_numbers) != 1:
2513 DieWithError(
2514 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002515 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002516 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002517 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002518
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002519 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002520 # GetIssue() is not set in case of non-squash uploads according to tests.
2521 # TODO(agable): non-squash uploads in git cl should be removed.
2522 gerrit_util.AddReviewers(
2523 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002524 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002525 reviewers, cc,
2526 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002527
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002528 return 0
2529
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002530 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2531 change_desc):
2532 """Computes parent of the generated commit to be uploaded to Gerrit.
2533
2534 Returns revision or a ref name.
2535 """
2536 if custom_cl_base:
2537 # Try to avoid creating additional unintended CLs when uploading, unless
2538 # user wants to take this risk.
2539 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2540 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2541 local_ref_of_target_remote])
2542 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002543 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002544 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2545 'If you proceed with upload, more than 1 CL may be created by '
2546 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2547 'If you are certain that specified base `%s` has already been '
2548 'uploaded to Gerrit as another CL, you may proceed.\n' %
2549 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2550 if not force:
2551 confirm_or_exit(
2552 'Do you take responsibility for cleaning up potential mess '
2553 'resulting from proceeding with upload?',
2554 action='upload')
2555 return custom_cl_base
2556
Aaron Gablef97e33d2017-03-30 15:44:27 -07002557 if remote != '.':
2558 return self.GetCommonAncestorWithUpstream()
2559
2560 # If our upstream branch is local, we base our squashed commit on its
2561 # squashed version.
2562 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2563
Aaron Gablef97e33d2017-03-30 15:44:27 -07002564 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002565 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002566
2567 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002568 # TODO(tandrii): consider checking parent change in Gerrit and using its
2569 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2570 # the tree hash of the parent branch. The upside is less likely bogus
2571 # requests to reupload parent change just because it's uploadhash is
2572 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002573 parent = RunGit(['config',
2574 'branch.%s.gerritsquashhash' % upstream_branch_name],
2575 error_ok=True).strip()
2576 # Verify that the upstream branch has been uploaded too, otherwise
2577 # Gerrit will create additional CLs when uploading.
2578 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2579 RunGitSilent(['rev-parse', parent + ':'])):
2580 DieWithError(
2581 '\nUpload upstream branch %s first.\n'
2582 'It is likely that this branch has been rebased since its last '
2583 'upload, so you just need to upload it again.\n'
2584 '(If you uploaded it with --no-squash, then branch dependencies '
2585 'are not supported, and you should reupload with --squash.)'
2586 % upstream_branch_name,
2587 change_desc)
2588 return parent
2589
Edward Lemura12175c2020-03-09 16:58:26 +00002590 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002591 """Re-commits using the current message, assumes the commit hook is in
2592 place.
2593 """
Edward Lemura12175c2020-03-09 16:58:26 +00002594 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002595 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002596 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002597 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002598 return new_log_desc
2599 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002600 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002601
tandriie113dfd2016-10-11 10:20:12 -07002602 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002603 try:
2604 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002605 except GerritChangeNotExists:
2606 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002607
2608 if data['status'] in ('ABANDONED', 'MERGED'):
2609 return 'CL %s is closed' % self.GetIssue()
2610
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002611 def GetGerritChange(self, patchset=None):
2612 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002613 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002614 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002615 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002616 data = self._GetChangeDetail(['ALL_REVISIONS'])
2617
2618 assert host and issue and patchset, 'CL must be uploaded first'
2619
2620 has_patchset = any(
2621 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002622 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002623 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002624 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002625 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002626
tandrii8c5a3532016-11-04 07:52:02 -07002627 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002628 'host': host,
2629 'change': issue,
2630 'project': data['project'],
2631 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002632 }
tandriie113dfd2016-10-11 10:20:12 -07002633
tandriide281ae2016-10-12 06:02:30 -07002634 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002635 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002636
Edward Lemur707d70b2018-02-07 00:50:14 +01002637 def GetReviewers(self):
2638 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002639 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002640
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002641
tandriif9aefb72016-07-01 09:06:51 -07002642def _get_bug_line_values(default_project, bugs):
2643 """Given default_project and comma separated list of bugs, yields bug line
2644 values.
2645
2646 Each bug can be either:
2647 * a number, which is combined with default_project
2648 * string, which is left as is.
2649
2650 This function may produce more than one line, because bugdroid expects one
2651 project per line.
2652
2653 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2654 ['v8:123', 'chromium:789']
2655 """
2656 default_bugs = []
2657 others = []
2658 for bug in bugs.split(','):
2659 bug = bug.strip()
2660 if bug:
2661 try:
2662 default_bugs.append(int(bug))
2663 except ValueError:
2664 others.append(bug)
2665
2666 if default_bugs:
2667 default_bugs = ','.join(map(str, default_bugs))
2668 if default_project:
2669 yield '%s:%s' % (default_project, default_bugs)
2670 else:
2671 yield default_bugs
2672 for other in sorted(others):
2673 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2674 yield other
2675
2676
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002677class ChangeDescription(object):
2678 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002679 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002680 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002681 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002682 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002683 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002684 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2685 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002686 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002687 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002688
Dan Beamd8b04ca2019-10-10 21:23:26 +00002689 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002690 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002691 if bug:
2692 regexp = re.compile(self.BUG_LINE)
2693 prefix = settings.GetBugPrefix()
2694 if not any((regexp.match(line) for line in self._description_lines)):
2695 values = list(_get_bug_line_values(prefix, bug))
2696 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002697 if fixed:
2698 regexp = re.compile(self.FIXED_LINE)
2699 prefix = settings.GetBugPrefix()
2700 if not any((regexp.match(line) for line in self._description_lines)):
2701 values = list(_get_bug_line_values(prefix, fixed))
2702 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002703
agable@chromium.org42c20792013-09-12 17:34:49 +00002704 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002705 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002706 return '\n'.join(self._description_lines)
2707
2708 def set_description(self, desc):
2709 if isinstance(desc, basestring):
2710 lines = desc.splitlines()
2711 else:
2712 lines = [line.rstrip() for line in desc]
2713 while lines and not lines[0]:
2714 lines.pop(0)
2715 while lines and not lines[-1]:
2716 lines.pop(-1)
2717 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002718
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002719 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2720 """Rewrites the R=/TBR= line(s) as a single line each.
2721
2722 Args:
2723 reviewers (list(str)) - list of additional emails to use for reviewers.
2724 tbrs (list(str)) - list of additional emails to use for TBRs.
2725 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2726 the change that are missing OWNER coverage. If this is not None, you
2727 must also pass a value for `change`.
2728 change (Change) - The Change that should be used for OWNERS lookups.
2729 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002730 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002731 assert isinstance(tbrs, list), tbrs
2732
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002733 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002734 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002735
2736 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002737 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002738
2739 reviewers = set(reviewers)
2740 tbrs = set(tbrs)
2741 LOOKUP = {
2742 'TBR': tbrs,
2743 'R': reviewers,
2744 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002745
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002746 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002747 regexp = re.compile(self.R_LINE)
2748 matches = [regexp.match(line) for line in self._description_lines]
2749 new_desc = [l for i, l in enumerate(self._description_lines)
2750 if not matches[i]]
2751 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002752
agable@chromium.org42c20792013-09-12 17:34:49 +00002753 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002754
2755 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002756 for match in matches:
2757 if not match:
2758 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002759 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2760
2761 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002762 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002763 owners_db = owners.Database(change.RepositoryRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002764 fopen=open, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002765 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002766 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002767 LOOKUP[add_owners_to].update(
2768 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002769
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002770 # If any folks ended up in both groups, remove them from tbrs.
2771 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002772
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002773 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2774 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002775
2776 # Put the new lines in the description where the old first R= line was.
2777 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2778 if 0 <= line_loc < len(self._description_lines):
2779 if new_tbr_line:
2780 self._description_lines.insert(line_loc, new_tbr_line)
2781 if new_r_line:
2782 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002783 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002784 if new_r_line:
2785 self.append_footer(new_r_line)
2786 if new_tbr_line:
2787 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002788
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002789 def set_preserve_tryjobs(self):
2790 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2791 footers = git_footers.parse_footers(self.description)
2792 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2793 if v.lower() == 'true':
2794 return
2795 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2796
Anthony Polito8b955342019-09-24 19:01:36 +00002797 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002798 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002799 self.set_description([
2800 '# Enter a description of the change.',
2801 '# This will be displayed on the codereview site.',
2802 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002803 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002804 '--------------------',
2805 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002806 bug_regexp = re.compile(self.BUG_LINE)
2807 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002808 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002809 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2810 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002811 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002812
agable@chromium.org42c20792013-09-12 17:34:49 +00002813 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002814 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002815 if not content:
2816 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002817 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002818
Bruce Dawson2377b012018-01-11 16:46:49 -08002819 # Strip off comments and default inserted "Bug:" line.
2820 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002821 (line.startswith('#') or
2822 line.rstrip() == "Bug:" or
2823 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002824 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002825 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002826 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002827
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002828 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002829 """Adds a footer line to the description.
2830
2831 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2832 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2833 that Gerrit footers are always at the end.
2834 """
2835 parsed_footer_line = git_footers.parse_footer(line)
2836 if parsed_footer_line:
2837 # Line is a gerrit footer in the form: Footer-Key: any value.
2838 # Thus, must be appended observing Gerrit footer rules.
2839 self.set_description(
2840 git_footers.add_footer(self.description,
2841 key=parsed_footer_line[0],
2842 value=parsed_footer_line[1]))
2843 return
2844
2845 if not self._description_lines:
2846 self._description_lines.append(line)
2847 return
2848
2849 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2850 if gerrit_footers:
2851 # git_footers.split_footers ensures that there is an empty line before
2852 # actual (gerrit) footers, if any. We have to keep it that way.
2853 assert top_lines and top_lines[-1] == ''
2854 top_lines, separator = top_lines[:-1], top_lines[-1:]
2855 else:
2856 separator = [] # No need for separator if there are no gerrit_footers.
2857
2858 prev_line = top_lines[-1] if top_lines else ''
2859 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2860 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2861 top_lines.append('')
2862 top_lines.append(line)
2863 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002864
tandrii99a72f22016-08-17 14:33:24 -07002865 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002866 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002867 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002868 reviewers = [match.group(2).strip()
2869 for match in matches
2870 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002871 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002872
bradnelsond975b302016-10-23 12:20:23 -07002873 def get_cced(self):
2874 """Retrieves the list of reviewers."""
2875 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2876 cced = [match.group(2).strip() for match in matches if match]
2877 return cleanup_list(cced)
2878
Nodir Turakulov23b82142017-11-16 11:04:25 -08002879 def get_hash_tags(self):
2880 """Extracts and sanitizes a list of Gerrit hashtags."""
2881 subject = (self._description_lines or ('',))[0]
2882 subject = re.sub(
2883 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2884
2885 tags = []
2886 start = 0
2887 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2888 while True:
2889 m = bracket_exp.match(subject, start)
2890 if not m:
2891 break
2892 tags.append(self.sanitize_hash_tag(m.group(1)))
2893 start = m.end()
2894
2895 if not tags:
2896 # Try "Tag: " prefix.
2897 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2898 if m:
2899 tags.append(self.sanitize_hash_tag(m.group(1)))
2900 return tags
2901
2902 @classmethod
2903 def sanitize_hash_tag(cls, tag):
2904 """Returns a sanitized Gerrit hash tag.
2905
2906 A sanitized hashtag can be used as a git push refspec parameter value.
2907 """
2908 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2909
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002910 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2911 """Updates this commit description given the parent.
2912
2913 This is essentially what Gnumbd used to do.
2914 Consult https://goo.gl/WMmpDe for more details.
2915 """
2916 assert parent_msg # No, orphan branch creation isn't supported.
2917 assert parent_hash
2918 assert dest_ref
2919 parent_footer_map = git_footers.parse_footers(parent_msg)
2920 # This will also happily parse svn-position, which GnumbD is no longer
2921 # supporting. While we'd generate correct footers, the verifier plugin
2922 # installed in Gerrit will block such commit (ie git push below will fail).
2923 parent_position = git_footers.get_position(parent_footer_map)
2924
2925 # Cherry-picks may have last line obscuring their prior footers,
2926 # from git_footers perspective. This is also what Gnumbd did.
2927 cp_line = None
2928 if (self._description_lines and
2929 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2930 cp_line = self._description_lines.pop()
2931
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002932 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002933
2934 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2935 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002936 for i, line in enumerate(footer_lines):
2937 k, v = git_footers.parse_footer(line) or (None, None)
2938 if k and k.startswith('Cr-'):
2939 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002940
2941 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002942 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002943 if parent_position[0] == dest_ref:
2944 # Same branch as parent.
2945 number = int(parent_position[1]) + 1
2946 else:
2947 number = 1 # New branch, and extra lineage.
2948 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2949 int(parent_position[1])))
2950
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002951 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2952 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002953
2954 self._description_lines = top_lines
2955 if cp_line:
2956 self._description_lines.append(cp_line)
2957 if self._description_lines[-1] != '':
2958 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002959 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002960
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002961
Aaron Gablea1bab272017-04-11 16:38:18 -07002962def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002963 """Retrieves the reviewers that approved a CL from the issue properties with
2964 messages.
2965
2966 Note that the list may contain reviewers that are not committer, thus are not
2967 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002968
2969 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002970 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002971 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002972 return sorted(
2973 set(
2974 message['sender']
2975 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07002976 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002977 )
2978 )
2979
2980
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002981def FindCodereviewSettingsFile(filename='codereview.settings'):
2982 """Finds the given file starting in the cwd and going up.
2983
2984 Only looks up to the top of the repository unless an
2985 'inherit-review-settings-ok' file exists in the root of the repository.
2986 """
2987 inherit_ok_file = 'inherit-review-settings-ok'
2988 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002989 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002990 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2991 root = '/'
2992 while True:
2993 if filename in os.listdir(cwd):
2994 if os.path.isfile(os.path.join(cwd, filename)):
2995 return open(os.path.join(cwd, filename))
2996 if cwd == root:
2997 break
2998 cwd = os.path.dirname(cwd)
2999
3000
3001def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003002 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003003 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003004
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003005 def SetProperty(name, setting, unset_error_ok=False):
3006 fullname = 'rietveld.' + name
3007 if setting in keyvals:
3008 RunGit(['config', fullname, keyvals[setting]])
3009 else:
3010 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3011
tandrii48df5812016-10-17 03:55:37 -07003012 if not keyvals.get('GERRIT_HOST', False):
3013 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003014 # Only server setting is required. Other settings can be absent.
3015 # In that case, we ignore errors raised during option deletion attempt.
3016 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3017 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3018 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003019 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003020 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3021 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003022 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3023 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003024 SetProperty(
3025 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003026
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003027 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003028 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003029
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003030 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003031 RunGit(['config', 'gerrit.squash-uploads',
3032 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003033
tandrii@chromium.org28253532016-04-14 13:46:56 +00003034 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003035 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003036 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3037
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003038 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003039 # should be of the form
3040 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3041 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003042 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3043 keyvals['ORIGIN_URL_CONFIG']])
3044
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003045
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003046def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003047 """Downloads a network object to a local file, like urllib.urlretrieve.
3048
3049 This is necessary because urllib is broken for SSL connections via a proxy.
3050 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003051 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003052 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003053
3054
ukai@chromium.org712d6102013-11-27 00:52:58 +00003055def hasSheBang(fname):
3056 """Checks fname is a #! script."""
3057 with open(fname) as f:
3058 return f.read(2).startswith('#!')
3059
3060
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003061# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3062def DownloadHooks(*args, **kwargs):
3063 pass
3064
3065
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003066def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003067 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003068
3069 Args:
3070 force: True to update hooks. False to install hooks if not present.
3071 """
3072 if not settings.GetIsGerrit():
3073 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003074 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003075 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3076 if not os.access(dst, os.X_OK):
3077 if os.path.exists(dst):
3078 if not force:
3079 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003080 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003081 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003082 if not hasSheBang(dst):
3083 DieWithError('Not a script: %s\n'
3084 'You need to download from\n%s\n'
3085 'into .git/hooks/commit-msg and '
3086 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003087 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3088 except Exception:
3089 if os.path.exists(dst):
3090 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003091 DieWithError('\nFailed to download hooks.\n'
3092 'You need to download from\n%s\n'
3093 'into .git/hooks/commit-msg and '
3094 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003095
3096
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003097class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003098 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003099
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003100 _GOOGLESOURCE = 'googlesource.com'
3101
3102 def __init__(self):
3103 # Cached list of [host, identity, source], where source is either
3104 # .gitcookies or .netrc.
3105 self._all_hosts = None
3106
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003107 def ensure_configured_gitcookies(self):
3108 """Runs checks and suggests fixes to make git use .gitcookies from default
3109 path."""
3110 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3111 configured_path = RunGitSilent(
3112 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003113 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003114 if configured_path:
3115 self._ensure_default_gitcookies_path(configured_path, default)
3116 else:
3117 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003118
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003119 @staticmethod
3120 def _ensure_default_gitcookies_path(configured_path, default_path):
3121 assert configured_path
3122 if configured_path == default_path:
3123 print('git is already configured to use your .gitcookies from %s' %
3124 configured_path)
3125 return
3126
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003127 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003128 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3129 (configured_path, default_path))
3130
3131 if not os.path.exists(configured_path):
3132 print('However, your configured .gitcookies file is missing.')
3133 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3134 action='reconfigure')
3135 RunGit(['config', '--global', 'http.cookiefile', default_path])
3136 return
3137
3138 if os.path.exists(default_path):
3139 print('WARNING: default .gitcookies file already exists %s' %
3140 default_path)
3141 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3142 default_path)
3143
3144 confirm_or_exit('Move existing .gitcookies to default location?',
3145 action='move')
3146 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003147 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003148 print('Moved and reconfigured git to use .gitcookies from %s' %
3149 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003150
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003151 @staticmethod
3152 def _configure_gitcookies_path(default_path):
3153 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3154 if os.path.exists(netrc_path):
3155 print('You seem to be using outdated .netrc for git credentials: %s' %
3156 netrc_path)
3157 print('This tool will guide you through setting up recommended '
3158 '.gitcookies store for git credentials.\n'
3159 '\n'
3160 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3161 ' git config --global --unset http.cookiefile\n'
3162 ' mv %s %s.backup\n\n' % (default_path, default_path))
3163 confirm_or_exit(action='setup .gitcookies')
3164 RunGit(['config', '--global', 'http.cookiefile', default_path])
3165 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003166
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003167 def get_hosts_with_creds(self, include_netrc=False):
3168 if self._all_hosts is None:
3169 a = gerrit_util.CookiesAuthenticator()
3170 self._all_hosts = [
3171 (h, u, s)
3172 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003173 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3174 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003175 )
3176 if h.endswith(self._GOOGLESOURCE)
3177 ]
3178
3179 if include_netrc:
3180 return self._all_hosts
3181 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3182
3183 def print_current_creds(self, include_netrc=False):
3184 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3185 if not hosts:
3186 print('No Git/Gerrit credentials found')
3187 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003188 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003189 header = [('Host', 'User', 'Which file'),
3190 ['=' * l for l in lengths]]
3191 for row in (header + hosts):
3192 print('\t'.join((('%%+%ds' % l) % s)
3193 for l, s in zip(lengths, row)))
3194
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003195 @staticmethod
3196 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003197 """Parses identity "git-<username>.domain" into <username> and domain."""
3198 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003199 # distinguishable from sub-domains. But we do know typical domains:
3200 if identity.endswith('.chromium.org'):
3201 domain = 'chromium.org'
3202 username = identity[:-len('.chromium.org')]
3203 else:
3204 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003205 if username.startswith('git-'):
3206 username = username[len('git-'):]
3207 return username, domain
3208
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003209 def _canonical_git_googlesource_host(self, host):
3210 """Normalizes Gerrit hosts (with '-review') to Git host."""
3211 assert host.endswith(self._GOOGLESOURCE)
3212 # Prefix doesn't include '.' at the end.
3213 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3214 if prefix.endswith('-review'):
3215 prefix = prefix[:-len('-review')]
3216 return prefix + '.' + self._GOOGLESOURCE
3217
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003218 def _canonical_gerrit_googlesource_host(self, host):
3219 git_host = self._canonical_git_googlesource_host(host)
3220 prefix = git_host.split('.', 1)[0]
3221 return prefix + '-review.' + self._GOOGLESOURCE
3222
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003223 def _get_counterpart_host(self, host):
3224 assert host.endswith(self._GOOGLESOURCE)
3225 git = self._canonical_git_googlesource_host(host)
3226 gerrit = self._canonical_gerrit_googlesource_host(git)
3227 return git if gerrit == host else gerrit
3228
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003229 def has_generic_host(self):
3230 """Returns whether generic .googlesource.com has been configured.
3231
3232 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3233 """
3234 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3235 if host == '.' + self._GOOGLESOURCE:
3236 return True
3237 return False
3238
3239 def _get_git_gerrit_identity_pairs(self):
3240 """Returns map from canonic host to pair of identities (Git, Gerrit).
3241
3242 One of identities might be None, meaning not configured.
3243 """
3244 host_to_identity_pairs = {}
3245 for host, identity, _ in self.get_hosts_with_creds():
3246 canonical = self._canonical_git_googlesource_host(host)
3247 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3248 idx = 0 if canonical == host else 1
3249 pair[idx] = identity
3250 return host_to_identity_pairs
3251
3252 def get_partially_configured_hosts(self):
3253 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003254 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003255 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003256 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003257
3258 def get_conflicting_hosts(self):
3259 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003260 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003261 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003262 if None not in (i1, i2) and i1 != i2)
3263
3264 def get_duplicated_hosts(self):
3265 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003266 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003267
3268 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3269 'chromium.googlesource.com': 'chromium.org',
3270 'chrome-internal.googlesource.com': 'google.com',
3271 }
3272
3273 def get_hosts_with_wrong_identities(self):
3274 """Finds hosts which **likely** reference wrong identities.
3275
3276 Note: skips hosts which have conflicting identities for Git and Gerrit.
3277 """
3278 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003279 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003280 pair = self._get_git_gerrit_identity_pairs().get(host)
3281 if pair and pair[0] == pair[1]:
3282 _, domain = self._parse_identity(pair[0])
3283 if domain != expected:
3284 hosts.add(host)
3285 return hosts
3286
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003287 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003288 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003289 hosts = sorted(hosts)
3290 assert hosts
3291 if extra_column_func is None:
3292 extras = [''] * len(hosts)
3293 else:
3294 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003295 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3296 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003297 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003298 lines.append(tmpl % he)
3299 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003300
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003301 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003302 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003303 yield ('.googlesource.com wildcard record detected',
3304 ['Chrome Infrastructure team recommends to list full host names '
3305 'explicitly.'],
3306 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003307
3308 dups = self.get_duplicated_hosts()
3309 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003310 yield ('The following hosts were defined twice',
3311 self._format_hosts(dups),
3312 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003313
3314 partial = self.get_partially_configured_hosts()
3315 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003316 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3317 'These hosts are missing',
3318 self._format_hosts(partial, lambda host: 'but %s defined' %
3319 self._get_counterpart_host(host)),
3320 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003321
3322 conflicting = self.get_conflicting_hosts()
3323 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003324 yield ('The following Git hosts have differing credentials from their '
3325 'Gerrit counterparts',
3326 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3327 tuple(self._get_git_gerrit_identity_pairs()[host])),
3328 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003329
3330 wrong = self.get_hosts_with_wrong_identities()
3331 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003332 yield ('These hosts likely use wrong identity',
3333 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3334 (self._get_git_gerrit_identity_pairs()[host][0],
3335 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3336 wrong)
3337
3338 def find_and_report_problems(self):
3339 """Returns True if there was at least one problem, else False."""
3340 found = False
3341 bad_hosts = set()
3342 for title, sublines, hosts in self._find_problems():
3343 if not found:
3344 found = True
3345 print('\n\n.gitcookies problem report:\n')
3346 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003347 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003348 if sublines:
3349 print()
3350 print(' %s' % '\n '.join(sublines))
3351 print()
3352
3353 if bad_hosts:
3354 assert found
3355 print(' You can manually remove corresponding lines in your %s file and '
3356 'visit the following URLs with correct account to generate '
3357 'correct credential lines:\n' %
3358 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3359 print(' %s' % '\n '.join(sorted(set(
3360 gerrit_util.CookiesAuthenticator().get_new_password_url(
3361 self._canonical_git_googlesource_host(host))
3362 for host in bad_hosts
3363 ))))
3364 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003365
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003366
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003367@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003368def CMDcreds_check(parser, args):
3369 """Checks credentials and suggests changes."""
3370 _, _ = parser.parse_args(args)
3371
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003372 # Code below checks .gitcookies. Abort if using something else.
3373 authn = gerrit_util.Authenticator.get()
3374 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003375 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003376 'This command is not designed for bot environment. It checks '
3377 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003378 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3379 if isinstance(authn, gerrit_util.GceAuthenticator):
3380 message += (
3381 '\n'
3382 'If you need to run this on GCE or a cloudtop instance, '
3383 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3384 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003385
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003386 checker = _GitCookiesChecker()
3387 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003388
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003389 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003390 checker.print_current_creds(include_netrc=True)
3391
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003392 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003393 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003394 return 0
3395 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003396
3397
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003398@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003399def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003400 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003401 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003402 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003403 _, args = parser.parse_args(args)
3404 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003405 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003406 return RunGit(['config', 'branch.%s.base-url' % branch],
3407 error_ok=False).strip()
3408 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003409 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003410 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3411 error_ok=False).strip()
3412
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003413
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003414def color_for_status(status):
3415 """Maps a Changelist status to color, for CMDstatus and other tools."""
3416 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003417 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003418 'waiting': Fore.BLUE,
3419 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003420 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003421 'lgtm': Fore.GREEN,
3422 'commit': Fore.MAGENTA,
3423 'closed': Fore.CYAN,
3424 'error': Fore.WHITE,
3425 }.get(status, Fore.WHITE)
3426
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003427
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003428def get_cl_statuses(changes, fine_grained, max_processes=None):
3429 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003430
3431 If fine_grained is true, this will fetch CL statuses from the server.
3432 Otherwise, simply indicate if there's a matching url for the given branches.
3433
3434 If max_processes is specified, it is used as the maximum number of processes
3435 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3436 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003437
3438 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003439 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003440 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003441 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003442
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003443 if not fine_grained:
3444 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003445 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003446 for cl in changes:
3447 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003448 return
3449
3450 # First, sort out authentication issues.
3451 logging.debug('ensuring credentials exist')
3452 for cl in changes:
3453 cl.EnsureAuthenticated(force=False, refresh=True)
3454
3455 def fetch(cl):
3456 try:
3457 return (cl, cl.GetStatus())
3458 except:
3459 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003460 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003461 raise
3462
3463 threads_count = len(changes)
3464 if max_processes:
3465 threads_count = max(1, min(threads_count, max_processes))
3466 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3467
Edward Lemur61bf4172020-02-24 23:22:37 +00003468 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003469 fetched_cls = set()
3470 try:
3471 it = pool.imap_unordered(fetch, changes).__iter__()
3472 while True:
3473 try:
3474 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003475 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003476 break
3477 fetched_cls.add(cl)
3478 yield cl, status
3479 finally:
3480 pool.close()
3481
3482 # Add any branches that failed to fetch.
3483 for cl in set(changes) - fetched_cls:
3484 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003485
rmistry@google.com2dd99862015-06-22 12:22:18 +00003486
3487def upload_branch_deps(cl, args):
3488 """Uploads CLs of local branches that are dependents of the current branch.
3489
3490 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003491
3492 test1 -> test2.1 -> test3.1
3493 -> test3.2
3494 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003495
3496 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3497 run on the dependent branches in this order:
3498 test2.1, test3.1, test3.2, test2.2, test3.3
3499
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003500 Note: This function does not rebase your local dependent branches. Use it
3501 when you make a change to the parent branch that will not conflict
3502 with its dependent branches, and you would like their dependencies
3503 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003504 """
3505 if git_common.is_dirty_git_tree('upload-branch-deps'):
3506 return 1
3507
3508 root_branch = cl.GetBranch()
3509 if root_branch is None:
3510 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3511 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003512 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003513 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3514 'patchset dependencies without an uploaded CL.')
3515
3516 branches = RunGit(['for-each-ref',
3517 '--format=%(refname:short) %(upstream:short)',
3518 'refs/heads'])
3519 if not branches:
3520 print('No local branches found.')
3521 return 0
3522
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003523 # Create a dictionary of all local branches to the branches that are
3524 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003525 tracked_to_dependents = collections.defaultdict(list)
3526 for b in branches.splitlines():
3527 tokens = b.split()
3528 if len(tokens) == 2:
3529 branch_name, tracked = tokens
3530 tracked_to_dependents[tracked].append(branch_name)
3531
vapiera7fbd5a2016-06-16 09:17:49 -07003532 print()
3533 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003534 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003535
rmistry@google.com2dd99862015-06-22 12:22:18 +00003536 def traverse_dependents_preorder(branch, padding=''):
3537 dependents_to_process = tracked_to_dependents.get(branch, [])
3538 padding += ' '
3539 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003540 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003541 dependents.append(dependent)
3542 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003543
rmistry@google.com2dd99862015-06-22 12:22:18 +00003544 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003545 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003546
3547 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003548 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003549 return 0
3550
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003551 confirm_or_exit('This command will checkout all dependent branches and run '
3552 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003553
rmistry@google.com2dd99862015-06-22 12:22:18 +00003554 # Record all dependents that failed to upload.
3555 failures = {}
3556 # Go through all dependents, checkout the branch and upload.
3557 try:
3558 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003559 print()
3560 print('--------------------------------------')
3561 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003562 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003563 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003564 try:
3565 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003566 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003567 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003568 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003569 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003570 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003571 finally:
3572 # Swap back to the original root branch.
3573 RunGit(['checkout', '-q', root_branch])
3574
vapiera7fbd5a2016-06-16 09:17:49 -07003575 print()
3576 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003577 for dependent_branch in dependents:
3578 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003579 print(' %s : %s' % (dependent_branch, upload_status))
3580 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003581
3582 return 0
3583
3584
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003585def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3586 """Given a proposed tag name, returns a tag name that is guaranteed to be
3587 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3588 or 'foo-3', and so on."""
3589
3590 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3591 for suffix_num in itertools.count(1):
3592 if suffix_num == 1:
3593 to_check = proposed_tag
3594 else:
3595 to_check = '%s-%d' % (proposed_tag, suffix_num)
3596
3597 if to_check not in existing_tags:
3598 return to_check
3599
3600
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003601@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003602def CMDarchive(parser, args):
3603 """Archives and deletes branches associated with closed changelists."""
3604 parser.add_option(
3605 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003606 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003607 parser.add_option(
3608 '-f', '--force', action='store_true',
3609 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003610 parser.add_option(
3611 '-d', '--dry-run', action='store_true',
3612 help='Skip the branch tagging and removal steps.')
3613 parser.add_option(
3614 '-t', '--notags', action='store_true',
3615 help='Do not tag archived branches. '
3616 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003617
kmarshall3bff56b2016-06-06 18:31:47 -07003618 options, args = parser.parse_args(args)
3619 if args:
3620 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003621
3622 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3623 if not branches:
3624 return 0
3625
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003626 tags = RunGit(['for-each-ref', '--format=%(refname)',
3627 'refs/tags']).splitlines() or []
3628 tags = [t.split('/')[-1] for t in tags]
3629
vapiera7fbd5a2016-06-16 09:17:49 -07003630 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003631 changes = [Changelist(branchref=b)
3632 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003633 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3634 statuses = get_cl_statuses(changes,
3635 fine_grained=True,
3636 max_processes=options.maxjobs)
3637 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003638 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3639 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003640 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003641 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003642 proposal.sort()
3643
3644 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003645 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003646 return 0
3647
Edward Lemur85153282020-02-14 22:06:29 +00003648 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003649
vapiera7fbd5a2016-06-16 09:17:49 -07003650 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003651 if options.notags:
3652 for next_item in proposal:
3653 print(' ' + next_item[0])
3654 else:
3655 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3656 for next_item in proposal:
3657 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003658
kmarshall9249e012016-08-23 12:02:16 -07003659 # Quit now on precondition failure or if instructed by the user, either
3660 # via an interactive prompt or by command line flags.
3661 if options.dry_run:
3662 print('\nNo changes were made (dry run).\n')
3663 return 0
3664 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003665 print('You are currently on a branch \'%s\' which is associated with a '
3666 'closed codereview issue, so archive cannot proceed. Please '
3667 'checkout another branch and run this command again.' %
3668 current_branch)
3669 return 1
kmarshall9249e012016-08-23 12:02:16 -07003670 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003671 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3672 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003673 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003674 return 1
3675
3676 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003677 if not options.notags:
3678 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003679
3680 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3681 # Clean up the tag if we failed to delete the branch.
3682 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003683
vapiera7fbd5a2016-06-16 09:17:49 -07003684 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003685
3686 return 0
3687
3688
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003689@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003690def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003691 """Show status of changelists.
3692
3693 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003694 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003695 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003696 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003697 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003698 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003699 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003700 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003701
3702 Also see 'git cl comments'.
3703 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003704 parser.add_option(
3705 '--no-branch-color',
3706 action='store_true',
3707 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003708 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003709 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003710 parser.add_option('-f', '--fast', action='store_true',
3711 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003712 parser.add_option(
3713 '-j', '--maxjobs', action='store', type=int,
3714 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003715 parser.add_option(
3716 '-i', '--issue', type=int,
3717 help='Operate on this issue instead of the current branch\'s implicit '
3718 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003719 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003720 if args:
3721 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003722
iannuccie53c9352016-08-17 14:40:40 -07003723 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003724 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003725
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003726 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003727 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003728 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003729 if cl.GetIssue():
3730 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003731 elif options.field == 'id':
3732 issueid = cl.GetIssue()
3733 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003734 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003735 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003736 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003737 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003738 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003739 elif options.field == 'status':
3740 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003741 elif options.field == 'url':
3742 url = cl.GetIssueURL()
3743 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003744 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003745 return 0
3746
3747 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3748 if not branches:
3749 print('No local branch found.')
3750 return 0
3751
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003752 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003753 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003754 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003755 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003756 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003757 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003758 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003759
Edward Lemur85153282020-02-14 22:06:29 +00003760 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003761
3762 def FormatBranchName(branch, colorize=False):
3763 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3764 an asterisk when it is the current branch."""
3765
3766 asterisk = ""
3767 color = Fore.RESET
3768 if branch == current_branch:
3769 asterisk = "* "
3770 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003771 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003772
3773 if colorize:
3774 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003775 return asterisk + branch_name
3776
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003777 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003778
3779 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003780 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3781 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003782 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003783 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003784 branch_statuses[c.GetBranch()] = status
3785 status = branch_statuses.pop(branch)
3786 url = cl.GetIssueURL()
3787 if url and (not status or status == 'error'):
3788 # The issue probably doesn't exist anymore.
3789 url += ' (broken)'
3790
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003791 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003792 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003793 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003794 color = ''
3795 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003796 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003797
Alan Cuttera3be9a52019-03-04 18:50:33 +00003798 branch_display = FormatBranchName(branch)
3799 padding = ' ' * (alignment - len(branch_display))
3800 if not options.no_branch_color:
3801 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003802
Alan Cuttera3be9a52019-03-04 18:50:33 +00003803 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3804 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003805
vapiera7fbd5a2016-06-16 09:17:49 -07003806 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003807 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003808 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003809 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003810 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003811 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003812 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003813 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003814 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003815 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003816 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003817 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003818 return 0
3819
3820
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003821def colorize_CMDstatus_doc():
3822 """To be called once in main() to add colors to git cl status help."""
3823 colors = [i for i in dir(Fore) if i[0].isupper()]
3824
3825 def colorize_line(line):
3826 for color in colors:
3827 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003828 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003829 indent = len(line) - len(line.lstrip(' ')) + 1
3830 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3831 return line
3832
3833 lines = CMDstatus.__doc__.splitlines()
3834 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3835
3836
phajdan.jre328cf92016-08-22 04:12:17 -07003837def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003838 if path == '-':
3839 json.dump(contents, sys.stdout)
3840 else:
3841 with open(path, 'w') as f:
3842 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003843
3844
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003845@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003846@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003847def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003848 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003849
3850 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003851 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003852 parser.add_option('-r', '--reverse', action='store_true',
3853 help='Lookup the branch(es) for the specified issues. If '
3854 'no issues are specified, all branches with mapped '
3855 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003856 parser.add_option('--json',
3857 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003858 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003859
dnj@chromium.org406c4402015-03-03 17:22:28 +00003860 if options.reverse:
3861 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003862 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003863 # Reverse issue lookup.
3864 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003865
3866 git_config = {}
3867 for config in RunGit(['config', '--get-regexp',
3868 r'branch\..*issue']).splitlines():
3869 name, _space, val = config.partition(' ')
3870 git_config[name] = val
3871
dnj@chromium.org406c4402015-03-03 17:22:28 +00003872 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003873 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003874 Changelist.IssueConfigKey())
3875 issue = git_config.get(config_key)
3876 if issue:
3877 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003878 if not args:
3879 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003880 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003881 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003882 try:
3883 issue_num = int(issue)
3884 except ValueError:
3885 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003886 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003887 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003888 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003889 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003890 if options.json:
3891 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003892 return 0
3893
3894 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003895 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003896 if not issue.valid:
3897 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3898 'or no argument to list it.\n'
3899 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003900 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003901 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003902 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003903 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003904 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3905 if options.json:
3906 write_json(options.json, {
3907 'issue': cl.GetIssue(),
3908 'issue_url': cl.GetIssueURL(),
3909 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003910 return 0
3911
3912
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003913@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003914def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003915 """Shows or posts review comments for any changelist."""
3916 parser.add_option('-a', '--add-comment', dest='comment',
3917 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003918 parser.add_option('-p', '--publish', action='store_true',
3919 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003920 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003921 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003922 parser.add_option('-m', '--machine-readable', dest='readable',
3923 action='store_false', default=True,
3924 help='output comments in a format compatible with '
3925 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003926 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003927 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003928 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003929
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003930 issue = None
3931 if options.issue:
3932 try:
3933 issue = int(options.issue)
3934 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003935 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003936
Edward Lemur934836a2019-09-09 20:16:54 +00003937 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003938
3939 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003940 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003941 return 0
3942
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003943 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3944 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003945 for comment in summary:
3946 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003947 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003948 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003949 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003950 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003951 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003952 elif comment.autogenerated:
3953 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003954 else:
3955 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003956 print('\n%s%s %s%s\n%s' % (
3957 color,
3958 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3959 comment.sender,
3960 Fore.RESET,
3961 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3962
smut@google.comc85ac942015-09-15 16:34:43 +00003963 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003964 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003965 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003966 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3967 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003968 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003969 return 0
3970
3971
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003972@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003973@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003974def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003975 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003976 parser.add_option('-d', '--display', action='store_true',
3977 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003978 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003979 help='New description to set for this issue (- for stdin, '
3980 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003981 parser.add_option('-f', '--force', action='store_true',
3982 help='Delete any unpublished Gerrit edits for this issue '
3983 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003984
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003985 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003986
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003987 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003988 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003989 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003990 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003991 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003992
Edward Lemur934836a2019-09-09 20:16:54 +00003993 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003994 if target_issue_arg:
3995 kwargs['issue'] = target_issue_arg.issue
3996 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003997
3998 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003999 if not cl.GetIssue():
4000 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004001
Edward Lemur678a6842019-10-03 22:25:05 +00004002 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004003 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004004
Edward Lemur6c6827c2020-02-06 21:15:18 +00004005 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004006
smut@google.com34fb6b12015-07-13 20:03:26 +00004007 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004008 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004009 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004010
4011 if options.new_description:
4012 text = options.new_description
4013 if text == '-':
4014 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004015 elif text == '+':
4016 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004017 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004018
4019 description.set_description(text)
4020 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004021 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004022 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004023 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004024 return 0
4025
4026
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004027@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004028def CMDlint(parser, args):
4029 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004030 parser.add_option('--filter', action='append', metavar='-x,+y',
4031 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004032 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004033
4034 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004035 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004036 try:
4037 import cpplint
4038 import cpplint_chromium
4039 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004040 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004041 return 1
4042
4043 # Change the current working directory before calling lint so that it
4044 # shows the correct base.
4045 previous_cwd = os.getcwd()
4046 os.chdir(settings.GetRoot())
4047 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004048 cl = Changelist()
Edward Lemura12175c2020-03-09 16:58:26 +00004049 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), '')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004050 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004051 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004052 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004053 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004054
4055 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004056 command = args + files
4057 if options.filter:
4058 command = ['--filter=' + ','.join(options.filter)] + command
4059 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004060
4061 white_regex = re.compile(settings.GetLintRegex())
4062 black_regex = re.compile(settings.GetLintIgnoreRegex())
4063 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4064 for filename in filenames:
4065 if white_regex.match(filename):
4066 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004067 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004068 else:
4069 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4070 extra_check_functions)
4071 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004072 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004073 finally:
4074 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004075 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004076 if cpplint._cpplint_state.error_count != 0:
4077 return 1
4078 return 0
4079
4080
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004081@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004082def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004083 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004084 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004085 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004086 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004087 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004088 parser.add_option('--all', action='store_true',
4089 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004090 parser.add_option('--parallel', action='store_true',
4091 help='Run all tests specified by input_api.RunTests in all '
4092 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004093 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004094
sbc@chromium.org71437c02015-04-09 19:29:40 +00004095 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004096 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004097 return 1
4098
Edward Lemur934836a2019-09-09 20:16:54 +00004099 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004100 if args:
4101 base_branch = args[0]
4102 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004103 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004104 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004105
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004106 if cl.GetIssue():
4107 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004108 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004109 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004110
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004111 cl.RunHook(
4112 committing=not options.upload,
4113 may_prompt=False,
4114 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004115 parallel=options.parallel,
4116 upstream=base_branch,
4117 description=description,
4118 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004119 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004120
4121
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004122def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004123 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004124
4125 Works the same way as
4126 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4127 but can be called on demand on all platforms.
4128
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004129 The basic idea is to generate git hash of a state of the tree, original
4130 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004131 """
4132 lines = []
4133 tree_hash = RunGitSilent(['write-tree'])
4134 lines.append('tree %s' % tree_hash.strip())
4135 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4136 if code == 0:
4137 lines.append('parent %s' % parent.strip())
4138 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4139 lines.append('author %s' % author.strip())
4140 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4141 lines.append('committer %s' % committer.strip())
4142 lines.append('')
4143 # Note: Gerrit's commit-hook actually cleans message of some lines and
4144 # whitespace. This code is not doing this, but it clearly won't decrease
4145 # entropy.
4146 lines.append(message)
4147 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004148 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004149 return 'I%s' % change_hash.strip()
4150
4151
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004152def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004153 """Computes the remote branch ref to use for the CL.
4154
4155 Args:
4156 remote (str): The git remote for the CL.
4157 remote_branch (str): The git remote branch for the CL.
4158 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004159 """
4160 if not (remote and remote_branch):
4161 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004162
wittman@chromium.org455dc922015-01-26 20:15:50 +00004163 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004164 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004165 # refs, which are then translated into the remote full symbolic refs
4166 # below.
4167 if '/' not in target_branch:
4168 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4169 else:
4170 prefix_replacements = (
4171 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4172 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4173 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4174 )
4175 match = None
4176 for regex, replacement in prefix_replacements:
4177 match = re.search(regex, target_branch)
4178 if match:
4179 remote_branch = target_branch.replace(match.group(0), replacement)
4180 break
4181 if not match:
4182 # This is a branch path but not one we recognize; use as-is.
4183 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004184 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4185 # Handle the refs that need to land in different refs.
4186 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004187
wittman@chromium.org455dc922015-01-26 20:15:50 +00004188 # Create the true path to the remote branch.
4189 # Does the following translation:
4190 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4191 # * refs/remotes/origin/master -> refs/heads/master
4192 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4193 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4194 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4195 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4196 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4197 'refs/heads/')
4198 elif remote_branch.startswith('refs/remotes/branch-heads'):
4199 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004200
wittman@chromium.org455dc922015-01-26 20:15:50 +00004201 return remote_branch
4202
4203
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004204def cleanup_list(l):
4205 """Fixes a list so that comma separated items are put as individual items.
4206
4207 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4208 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4209 """
4210 items = sum((i.split(',') for i in l), [])
4211 stripped_items = (i.strip() for i in items)
4212 return sorted(filter(None, stripped_items))
4213
4214
Aaron Gable4db38df2017-11-03 14:59:07 -07004215@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004216@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004217def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004218 """Uploads the current changelist to codereview.
4219
4220 Can skip dependency patchset uploads for a branch by running:
4221 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004222 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004223 git config --unset branch.branch_name.skip-deps-uploads
4224 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004225
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004226 If the name of the checked out branch starts with "bug-" or "fix-" followed
4227 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004228 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004229
4230 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004231 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004232 [git-cl] add support for hashtags
4233 Foo bar: implement foo
4234 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004235 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004236 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4237 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004238 parser.add_option('--bypass-watchlists', action='store_true',
4239 dest='bypass_watchlists',
4240 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004241 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004242 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004243 parser.add_option('--message', '-m', dest='message',
4244 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004245 parser.add_option('-b', '--bug',
4246 help='pre-populate the bug number(s) for this issue. '
4247 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004248 parser.add_option('--message-file', dest='message_file',
4249 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004250 parser.add_option('--title', '-t', dest='title',
4251 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004252 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004253 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004254 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004255 parser.add_option('--tbrs',
4256 action='append', default=[],
4257 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004258 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004259 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004260 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004261 parser.add_option('--hashtag', dest='hashtags',
4262 action='append', default=[],
4263 help=('Gerrit hashtag for new CL; '
4264 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004265 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004266 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004267 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004268 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004269 metavar='TARGET',
4270 help='Apply CL to remote ref TARGET. ' +
4271 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004272 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004273 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004274 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004275 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004276 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004277 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004278 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4279 const='TBR', help='add a set of OWNERS to TBR')
4280 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4281 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004282 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004283 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004284 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004285 'implies --send-mail')
4286 parser.add_option('-d', '--cq-dry-run',
4287 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004288 help='Send the patchset to do a CQ dry run right after '
4289 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004290 parser.add_option('--preserve-tryjobs', action='store_true',
4291 help='instruct the CQ to let tryjobs running even after '
4292 'new patchsets are uploaded instead of canceling '
4293 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004294 parser.add_option('--dependencies', action='store_true',
4295 help='Uploads CLs of all the local branches that depend on '
4296 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004297 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4298 help='Sends your change to the CQ after an approval. Only '
4299 'works on repos that have the Auto-Submit label '
4300 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004301 parser.add_option('--parallel', action='store_true',
4302 help='Run all tests specified by input_api.RunTests in all '
4303 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004304 parser.add_option('--no-autocc', action='store_true',
4305 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004306 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004307 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004308 parser.add_option('-R', '--retry-failed', action='store_true',
4309 help='Retry failed tryjobs from old patchset immediately '
4310 'after uploading new patchset. Cannot be used with '
4311 '--use-commit-queue or --cq-dry-run.')
4312 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4313 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004314 parser.add_option('--fixed', '-x',
4315 help='List of bugs that will be commented on and marked '
4316 'fixed (pre-populates "Fixed:" tag). Same format as '
4317 '-b option / "Bug:" tag. If fixing several issues, '
4318 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004319 parser.add_option('--edit-description', action='store_true', default=False,
4320 help='Modify description before upload. Cannot be used '
4321 'with --force. It is a noop when --no-squash is set '
4322 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004323
rmistry@google.com2dd99862015-06-22 12:22:18 +00004324 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004325 (options, args) = parser.parse_args(args)
4326
sbc@chromium.org71437c02015-04-09 19:29:40 +00004327 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004328 return 1
4329
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004330 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004331 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004332 options.cc = cleanup_list(options.cc)
4333
Josipe827b0f2020-01-30 00:07:20 +00004334 if options.edit_description and options.force:
4335 parser.error('Only one of --force and --edit-description allowed')
4336
tandriib80458a2016-06-23 12:20:07 -07004337 if options.message_file:
4338 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004339 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004340 options.message = gclient_utils.FileRead(options.message_file)
4341 options.message_file = None
4342
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004343 if ([options.cq_dry_run,
4344 options.use_commit_queue,
4345 options.retry_failed].count(True) > 1):
4346 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4347 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004348
Aaron Gableedbc4132017-09-11 13:22:28 -07004349 if options.use_commit_queue:
4350 options.send_mail = True
4351
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004352 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4353 settings.GetIsGerrit()
4354
Edward Lemur934836a2019-09-09 20:16:54 +00004355 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004356 # Warm change details cache now to avoid RPCs later, reducing latency for
4357 # developers.
4358 if cl.GetIssue():
4359 cl._GetChangeDetail(
4360 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4361
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004362 if options.retry_failed and not cl.GetIssue():
4363 print('No previous patchsets, so --retry-failed has no effect.')
4364 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004365
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004366 # cl.GetMostRecentPatchset uses cached information, and can return the last
4367 # patchset before upload. Calling it here makes it clear that it's the
4368 # last patchset before upload. Note that GetMostRecentPatchset will fail
4369 # if no CL has been uploaded yet.
4370 if options.retry_failed:
4371 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004372
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004373 ret = cl.CMDUpload(options, args, orig_args)
4374
4375 if options.retry_failed:
4376 if ret != 0:
4377 print('Upload failed, so --retry-failed has no effect.')
4378 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004379 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004380 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004381 jobs = _filter_failed_for_retry(builds)
4382 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004383 print('No failed tryjobs, so --retry-failed has no effect.')
4384 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004385 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004386
4387 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004388
4389
Francois Dorayd42c6812017-05-30 15:10:20 -04004390@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004391@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004392def CMDsplit(parser, args):
4393 """Splits a branch into smaller branches and uploads CLs.
4394
4395 Creates a branch and uploads a CL for each group of files modified in the
4396 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004397 comment, the string '$directory', is replaced with the directory containing
4398 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004399 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004400 parser.add_option('-d', '--description', dest='description_file',
4401 help='A text file containing a CL description in which '
4402 '$directory will be replaced by each CL\'s directory.')
4403 parser.add_option('-c', '--comment', dest='comment_file',
4404 help='A text file containing a CL comment.')
4405 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004406 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004407 help='List the files and reviewers for each CL that would '
4408 'be created, but don\'t create branches or CLs.')
4409 parser.add_option('--cq-dry-run', action='store_true',
4410 help='If set, will do a cq dry run for each uploaded CL. '
4411 'Please be careful when doing this; more than ~10 CLs '
4412 'has the potential to overload our build '
4413 'infrastructure. Try to upload these not during high '
4414 'load times (usually 11-3 Mountain View time). Email '
4415 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004416 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4417 default=True,
4418 help='Sends your change to the CQ after an approval. Only '
4419 'works on repos that have the Auto-Submit label '
4420 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004421 options, _ = parser.parse_args(args)
4422
4423 if not options.description_file:
4424 parser.error('No --description flag specified.')
4425
4426 def WrappedCMDupload(args):
4427 return CMDupload(OptionParser(), args)
4428
4429 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004430 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004431 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004432
4433
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004434@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004435@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004436def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004437 """DEPRECATED: Used to commit the current changelist via git-svn."""
4438 message = ('git-cl no longer supports committing to SVN repositories via '
4439 'git-svn. You probably want to use `git cl land` instead.')
4440 print(message)
4441 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004442
4443
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004444@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004445@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004446def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004447 """Commits the current changelist via git.
4448
4449 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4450 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004451 """
4452 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4453 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004454 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004455 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004456 parser.add_option('--parallel', action='store_true',
4457 help='Run all tests specified by input_api.RunTests in all '
4458 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004459 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004460
Edward Lemur934836a2019-09-09 20:16:54 +00004461 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004462
Robert Iannucci2e73d432018-03-14 01:10:47 -07004463 if not cl.GetIssue():
4464 DieWithError('You must upload the change first to Gerrit.\n'
4465 ' If you would rather have `git cl land` upload '
4466 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004467 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004468 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004469
4470
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004471@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004472@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004473def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004474 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004475 parser.add_option('-b', dest='newbranch',
4476 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004477 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004478 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004479 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004480 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004481
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004482 group = optparse.OptionGroup(
4483 parser,
4484 'Options for continuing work on the current issue uploaded from a '
4485 'different clone (e.g. different machine). Must be used independently '
4486 'from the other options. No issue number should be specified, and the '
4487 'branch must have an issue number associated with it')
4488 group.add_option('--reapply', action='store_true', dest='reapply',
4489 help='Reset the branch and reapply the issue.\n'
4490 'CAUTION: This will undo any local changes in this '
4491 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004492
4493 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004494 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004495 parser.add_option_group(group)
4496
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004497 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004498
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004499 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004500 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004501 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004502 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004503 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004504
Edward Lemur934836a2019-09-09 20:16:54 +00004505 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004506 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004507 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004508
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004509 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004510 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004511 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004512
4513 RunGit(['reset', '--hard', upstream])
4514 if options.pull:
4515 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004516
Edward Lemur678a6842019-10-03 22:25:05 +00004517 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4518 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004519
4520 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004521 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004522
Edward Lemurf38bc172019-09-03 21:02:13 +00004523 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004524 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004525 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004526
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004527 # We don't want uncommitted changes mixed up with the patch.
4528 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004529 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004530
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004531 if options.newbranch:
4532 if options.force:
4533 RunGit(['branch', '-D', options.newbranch],
4534 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004535 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004536
Edward Lemur678a6842019-10-03 22:25:05 +00004537 cl = Changelist(
4538 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004539
Edward Lemur678a6842019-10-03 22:25:05 +00004540 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004541 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004542
Edward Lemurf38bc172019-09-03 21:02:13 +00004543 return cl.CMDPatchWithParsedIssue(
4544 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004545
4546
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004547def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004548 """Fetches the tree status and returns either 'open', 'closed',
4549 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004550 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004551 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004552 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004553 if status.find('closed') != -1 or status == '0':
4554 return 'closed'
4555 elif status.find('open') != -1 or status == '1':
4556 return 'open'
4557 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004558 return 'unset'
4559
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004560
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004561def GetTreeStatusReason():
4562 """Fetches the tree status from a json url and returns the message
4563 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004564 url = settings.GetTreeStatusUrl()
4565 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004566 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004567 status = json.loads(connection.read())
4568 connection.close()
4569 return status['message']
4570
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004571
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004572@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004573def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004574 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004575 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004576 status = GetTreeStatus()
4577 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004578 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004579 return 2
4580
vapiera7fbd5a2016-06-16 09:17:49 -07004581 print('The tree is %s' % status)
4582 print()
4583 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004584 if status != 'open':
4585 return 1
4586 return 0
4587
4588
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004589@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004590def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004591 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4592 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004593 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004594 '-b', '--bot', action='append',
4595 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4596 'times to specify multiple builders. ex: '
4597 '"-b win_rel -b win_layout". See '
4598 'the try server waterfall for the builders name and the tests '
4599 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004600 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004601 '-B', '--bucket', default='',
4602 help=('Buildbucket bucket to send the try requests.'))
4603 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004604 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004605 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004606 'be determined by the try recipe that builder runs, which usually '
4607 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004608 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004609 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004610 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004611 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004612 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004613 '--category', default='git_cl_try', help='Specify custom build category.')
4614 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004615 '--project',
4616 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004617 'in recipe to determine to which repository or directory to '
4618 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004619 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004620 '-p', '--property', dest='properties', action='append', default=[],
4621 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004622 'key2=value2 etc. The value will be treated as '
4623 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004624 'NOTE: using this may make your tryjob not usable for CQ, '
4625 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004626 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004627 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4628 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004629 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004630 parser.add_option(
4631 '-R', '--retry-failed', action='store_true', default=False,
4632 help='Retry failed jobs from the latest set of tryjobs. '
4633 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004634 parser.add_option(
4635 '-i', '--issue', type=int,
4636 help='Operate on this issue instead of the current branch\'s implicit '
4637 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004638 options, args = parser.parse_args(args)
4639
machenbach@chromium.org45453142015-09-15 08:45:22 +00004640 # Make sure that all properties are prop=value pairs.
4641 bad_params = [x for x in options.properties if '=' not in x]
4642 if bad_params:
4643 parser.error('Got properties with missing "=": %s' % bad_params)
4644
maruel@chromium.org15192402012-09-06 12:38:29 +00004645 if args:
4646 parser.error('Unknown arguments: %s' % args)
4647
Edward Lemur934836a2019-09-09 20:16:54 +00004648 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004649 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004650 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004651
Edward Lemurf38bc172019-09-03 21:02:13 +00004652 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004653 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004654
tandriie113dfd2016-10-11 10:20:12 -07004655 error_message = cl.CannotTriggerTryJobReason()
4656 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004657 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004658
Edward Lemur45768512020-03-02 19:03:14 +00004659 if options.bot:
4660 if options.retry_failed:
4661 parser.error('--bot is not compatible with --retry-failed.')
4662 if not options.bucket:
4663 parser.error('A bucket (e.g. "chromium/try") is required.')
4664
4665 triggered = [b for b in options.bot if 'triggered' in b]
4666 if triggered:
4667 parser.error(
4668 'Cannot schedule builds on triggered bots: %s.\n'
4669 'This type of bot requires an initial job from a parent (usually a '
4670 'builder). Schedule a job on the parent instead.\n' % triggered)
4671
4672 if options.bucket.startswith('.master'):
4673 parser.error('Buildbot masters are not supported.')
4674
4675 project, bucket = _parse_bucket(options.bucket)
4676 if project is None or bucket is None:
4677 parser.error('Invalid bucket: %s.' % options.bucket)
4678 jobs = sorted((project, bucket, bot) for bot in options.bot)
4679 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004680 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004681 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004682 if options.verbose:
4683 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004684 jobs = _filter_failed_for_retry(builds)
4685 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004686 print('There are no failed jobs in the latest set of jobs '
4687 '(patchset #%d), doing nothing.' % patchset)
4688 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004689 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004690 if num_builders > 10:
4691 confirm_or_exit('There are %d builders with failed builds.'
4692 % num_builders, action='continue')
4693 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004694 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004695 print('git cl try with no bots now defaults to CQ dry run.')
4696 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4697 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004698
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004699 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004700 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004701 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004702 except BuildbucketResponseException as ex:
4703 print('ERROR: %s' % ex)
4704 return 1
4705 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004706
4707
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004708@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004709def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004710 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004711 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004712 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004713 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004714 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004715 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004716 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004717 '--color', action='store_true', default=setup_color.IS_TTY,
4718 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004719 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004720 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4721 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004722 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004723 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004724 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004725 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004726 parser.add_option(
4727 '-i', '--issue', type=int,
4728 help='Operate on this issue instead of the current branch\'s implicit '
4729 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004730 options, args = parser.parse_args(args)
4731 if args:
4732 parser.error('Unrecognized args: %s' % ' '.join(args))
4733
Edward Lemur934836a2019-09-09 20:16:54 +00004734 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004735 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004736 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004737
tandrii221ab252016-10-06 08:12:04 -07004738 patchset = options.patchset
4739 if not patchset:
4740 patchset = cl.GetMostRecentPatchset()
4741 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004742 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004743 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004744 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004745 cl.GetIssue())
4746
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004747 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004748 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004749 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004750 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004751 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004752 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004753 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004754 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004755 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004756 return 0
4757
4758
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004759@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004760@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004761def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004762 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004763 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004764 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004765 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004766
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004767 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004768 if args:
4769 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004770 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004771 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004772 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004773 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004774
4775 # Clear configured merge-base, if there is one.
4776 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004777 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004778 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004779 return 0
4780
4781
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004782@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004783def CMDweb(parser, args):
4784 """Opens the current CL in the web browser."""
4785 _, args = parser.parse_args(args)
4786 if args:
4787 parser.error('Unrecognized args: %s' % ' '.join(args))
4788
4789 issue_url = Changelist().GetIssueURL()
4790 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004791 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004792 return 1
4793
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004794 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004795 # allows us to hide the "Created new window in existing browser session."
4796 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004797 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004798 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004799 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004800 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004801 os.open(os.devnull, os.O_RDWR)
4802 try:
4803 webbrowser.open(issue_url)
4804 finally:
4805 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004806 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004807 return 0
4808
4809
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004810@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004811def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004812 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004813 parser.add_option('-d', '--dry-run', action='store_true',
4814 help='trigger in dry run mode')
4815 parser.add_option('-c', '--clear', action='store_true',
4816 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004817 parser.add_option(
4818 '-i', '--issue', type=int,
4819 help='Operate on this issue instead of the current branch\'s implicit '
4820 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004821 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004822 if args:
4823 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004824 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004825 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004826
Edward Lemur934836a2019-09-09 20:16:54 +00004827 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004828 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004829 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004830 elif options.dry_run:
4831 state = _CQState.DRY_RUN
4832 else:
4833 state = _CQState.COMMIT
4834 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004835 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004836 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004837 return 0
4838
4839
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004840@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004841def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004842 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004843 parser.add_option(
4844 '-i', '--issue', type=int,
4845 help='Operate on this issue instead of the current branch\'s implicit '
4846 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004847 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004848 if args:
4849 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004850 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004851 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004852 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004853 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004854 cl.CloseIssue()
4855 return 0
4856
4857
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004858@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004859def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004860 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004861 parser.add_option(
4862 '--stat',
4863 action='store_true',
4864 dest='stat',
4865 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004866 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004867 if args:
4868 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004869
Edward Lemur934836a2019-09-09 20:16:54 +00004870 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004871 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004872 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004873 if not issue:
4874 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004875
Aaron Gablea718c3e2017-08-28 17:47:28 -07004876 base = cl._GitGetBranchConfigValue('last-upload-hash')
4877 if not base:
4878 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4879 if not base:
4880 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4881 revision_info = detail['revisions'][detail['current_revision']]
4882 fetch_info = revision_info['fetch']['http']
4883 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4884 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004885
Aaron Gablea718c3e2017-08-28 17:47:28 -07004886 cmd = ['git', 'diff']
4887 if options.stat:
4888 cmd.append('--stat')
4889 cmd.append(base)
4890 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004891
4892 return 0
4893
4894
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004895@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004896def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004897 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004898 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004899 '--ignore-current',
4900 action='store_true',
4901 help='Ignore the CL\'s current reviewers and start from scratch.')
4902 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004903 '--ignore-self',
4904 action='store_true',
4905 help='Do not consider CL\'s author as an owners.')
4906 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004907 '--no-color',
4908 action='store_true',
4909 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004910 parser.add_option(
4911 '--batch',
4912 action='store_true',
4913 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004914 # TODO: Consider moving this to another command, since other
4915 # git-cl owners commands deal with owners for a given CL.
4916 parser.add_option(
4917 '--show-all',
4918 action='store_true',
4919 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004920 options, args = parser.parse_args(args)
4921
4922 author = RunGit(['config', 'user.email']).strip() or None
4923
Edward Lemur934836a2019-09-09 20:16:54 +00004924 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004925
Yang Guo6e269a02019-06-26 11:17:02 +00004926 if options.show_all:
4927 for arg in args:
4928 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004929 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004930 database.load_data_needed_for([arg])
4931 print('Owners for %s:' % arg)
4932 for owner in sorted(database.all_possible_owners([arg], None)):
4933 print(' - %s' % owner)
4934 return 0
4935
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004936 if args:
4937 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004938 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004939 base_branch = args[0]
4940 else:
4941 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004942 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004943
Edward Lemura12175c2020-03-09 16:58:26 +00004944 change = cl.GetChange(base_branch, '')
Dirk Prankebf980882017-09-02 15:08:00 -07004945 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4946
4947 if options.batch:
Edward Lemurb7f759f2020-03-04 21:20:56 +00004948 db = owners.Database(change.RepositoryRoot(), open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004949 print('\n'.join(db.reviewers_for(affected_files, author)))
4950 return 0
4951
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004952 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004953 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004954 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004955 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004956 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00004957 fopen=open, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004958 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004959 override_files=change.OriginalOwnersFiles(),
4960 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004961
4962
Aiden Bennerc08566e2018-10-03 17:52:42 +00004963def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004964 """Generates a diff command."""
4965 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004966 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4967
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004968 if allow_prefix:
4969 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4970 # case that diff.noprefix is set in the user's git config.
4971 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4972 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004973 diff_cmd += ['--no-prefix']
4974
4975 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004976
4977 if args:
4978 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004979 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004980 diff_cmd.append(arg)
4981 else:
4982 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004983
4984 return diff_cmd
4985
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004986
Jamie Madill5e96ad12020-01-13 16:08:35 +00004987def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4988 """Runs clang-format-diff and sets a return value if necessary."""
4989
4990 if not clang_diff_files:
4991 return 0
4992
4993 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4994 # formatted. This is used to block during the presubmit.
4995 return_value = 0
4996
4997 # Locate the clang-format binary in the checkout
4998 try:
4999 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5000 except clang_format.NotFoundError as e:
5001 DieWithError(e)
5002
5003 if opts.full or settings.GetFormatFullByDefault():
5004 cmd = [clang_format_tool]
5005 if not opts.dry_run and not opts.diff:
5006 cmd.append('-i')
5007 if opts.dry_run:
5008 for diff_file in clang_diff_files:
5009 with open(diff_file, 'r') as myfile:
5010 code = myfile.read().replace('\r\n', '\n')
5011 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5012 stdout = stdout.replace('\r\n', '\n')
5013 if opts.diff:
5014 sys.stdout.write(stdout)
5015 if code != stdout:
5016 return_value = 2
5017 else:
5018 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5019 if opts.diff:
5020 sys.stdout.write(stdout)
5021 else:
5022 env = os.environ.copy()
5023 env['PATH'] = str(os.path.dirname(clang_format_tool))
5024 try:
5025 script = clang_format.FindClangFormatScriptInChromiumTree(
5026 'clang-format-diff.py')
5027 except clang_format.NotFoundError as e:
5028 DieWithError(e)
5029
5030 cmd = [sys.executable, script, '-p0']
5031 if not opts.dry_run and not opts.diff:
5032 cmd.append('-i')
5033
5034 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005035 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005036
5037 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5038 if opts.diff:
5039 sys.stdout.write(stdout)
5040 if opts.dry_run and len(stdout) > 0:
5041 return_value = 2
5042
5043 return return_value
5044
5045
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005046def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005047 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005048 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005049
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005050
enne@chromium.org555cfe42014-01-29 18:21:39 +00005051@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005052@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005053def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005054 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005055 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005056 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005057 parser.add_option('--full', action='store_true',
5058 help='Reformat the full content of all touched files')
5059 parser.add_option('--dry-run', action='store_true',
5060 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005061 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005062 '--no-clang-format',
5063 dest='clang_format',
5064 action='store_false',
5065 default=True,
5066 help='Disables formatting of various file types using clang-format.')
5067 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005068 '--python',
5069 action='store_true',
5070 default=None,
5071 help='Enables python formatting on all python files.')
5072 parser.add_option(
5073 '--no-python',
5074 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005075 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005076 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005077 'If neither --python or --no-python are set, python files that have a '
5078 '.style.yapf file in an ancestor directory will be formatted. '
5079 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005080 parser.add_option(
5081 '--js',
5082 action='store_true',
5083 help='Format javascript code with clang-format. '
5084 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005085 parser.add_option('--diff', action='store_true',
5086 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005087 parser.add_option('--presubmit', action='store_true',
5088 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005089 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005090
Garrett Beaty91a6f332020-01-06 16:57:24 +00005091 if opts.python is not None and opts.no_python:
5092 raise parser.error('Cannot set both --python and --no-python')
5093 if opts.no_python:
5094 opts.python = False
5095
Daniel Chengc55eecf2016-12-30 03:11:02 -08005096 # Normalize any remaining args against the current path, so paths relative to
5097 # the current directory are still resolved as expected.
5098 args = [os.path.join(os.getcwd(), arg) for arg in args]
5099
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005100 # git diff generates paths against the root of the repository. Change
5101 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005102 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005103 if rel_base_path:
5104 os.chdir(rel_base_path)
5105
digit@chromium.org29e47272013-05-17 17:01:46 +00005106 # Grab the merge-base commit, i.e. the upstream commit of the current
5107 # branch when it was created or the last time it was rebased. This is
5108 # to cover the case where the user may have called "git fetch origin",
5109 # moving the origin branch to a newer commit, but hasn't rebased yet.
5110 upstream_commit = None
5111 cl = Changelist()
5112 upstream_branch = cl.GetUpstreamBranch()
5113 if upstream_branch:
5114 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5115 upstream_commit = upstream_commit.strip()
5116
5117 if not upstream_commit:
5118 DieWithError('Could not find base commit for this branch. '
5119 'Are you in detached state?')
5120
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005121 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5122 diff_output = RunGit(changed_files_cmd)
5123 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005124 # Filter out files deleted by this CL
5125 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005126
Andreas Haas417d89c2020-02-06 10:24:27 +00005127 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005128 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005129
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005130 clang_diff_files = []
5131 if opts.clang_format:
5132 clang_diff_files = [
5133 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5134 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005135 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5136 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005137 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005138
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005139 top_dir = os.path.normpath(
5140 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5141
Jamie Madill5e96ad12020-01-13 16:08:35 +00005142 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5143 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005144
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005145 # Similar code to above, but using yapf on .py files rather than clang-format
5146 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005147 py_explicitly_disabled = opts.python is not None and not opts.python
5148 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005149 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5150 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5151 if sys.platform.startswith('win'):
5152 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005153
Aiden Bennerc08566e2018-10-03 17:52:42 +00005154 # Used for caching.
5155 yapf_configs = {}
5156 for f in python_diff_files:
5157 # Find the yapf style config for the current file, defaults to depot
5158 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005159 _FindYapfConfigFile(f, yapf_configs, top_dir)
5160
5161 # Turn on python formatting by default if a yapf config is specified.
5162 # This breaks in the case of this repo though since the specified
5163 # style file is also the global default.
5164 if opts.python is None:
5165 filtered_py_files = []
5166 for f in python_diff_files:
5167 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5168 filtered_py_files.append(f)
5169 else:
5170 filtered_py_files = python_diff_files
5171
5172 # Note: yapf still seems to fix indentation of the entire file
5173 # even if line ranges are specified.
5174 # See https://github.com/google/yapf/issues/499
5175 if not opts.full and filtered_py_files:
5176 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5177
Brian Sheedyb4307d52019-12-02 19:18:17 +00005178 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5179 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5180 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005181
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005182 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005183 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5184 # Default to pep8 if not .style.yapf is found.
5185 if not yapf_style:
5186 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005187
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005188 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005189
5190 has_formattable_lines = False
5191 if not opts.full:
5192 # Only run yapf over changed line ranges.
5193 for diff_start, diff_len in py_line_diffs[f]:
5194 diff_end = diff_start + diff_len - 1
5195 # Yapf errors out if diff_end < diff_start but this
5196 # is a valid line range diff for a removal.
5197 if diff_end >= diff_start:
5198 has_formattable_lines = True
5199 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5200 # If all line diffs were removals we have nothing to format.
5201 if not has_formattable_lines:
5202 continue
5203
5204 if opts.diff or opts.dry_run:
5205 cmd += ['--diff']
5206 # Will return non-zero exit code if non-empty diff.
5207 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5208 if opts.diff:
5209 sys.stdout.write(stdout)
5210 elif len(stdout) > 0:
5211 return_value = 2
5212 else:
5213 cmd += ['-i']
5214 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005215
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005216 # Dart's formatter does not have the nice property of only operating on
5217 # modified chunks, so hard code full.
5218 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005219 try:
5220 command = [dart_format.FindDartFmtToolInChromiumTree()]
5221 if not opts.dry_run and not opts.diff:
5222 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005223 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005224
ppi@chromium.org6593d932016-03-03 15:41:15 +00005225 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005226 if opts.dry_run and stdout:
5227 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005228 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005229 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5230 'found in this checkout. Files in other languages are still '
5231 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005232
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005233 # Format GN build files. Always run on full build files for canonical form.
5234 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005235 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005236 if opts.dry_run or opts.diff:
5237 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005238 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005239 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5240 shell=sys.platform == 'win32',
5241 cwd=top_dir)
5242 if opts.dry_run and gn_ret == 2:
5243 return_value = 2 # Not formatted.
5244 elif opts.diff and gn_ret == 2:
5245 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005246 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005247 elif gn_ret != 0:
5248 # For non-dry run cases (and non-2 return values for dry-run), a
5249 # nonzero error code indicates a failure, probably because the file
5250 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005251 DieWithError('gn format failed on ' + gn_diff_file +
5252 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005253
Ilya Shermane081cbe2017-08-15 17:51:04 -07005254 # Skip the metrics formatting from the global presubmit hook. These files have
5255 # a separate presubmit hook that issues an error if the files need formatting,
5256 # whereas the top-level presubmit script merely issues a warning. Formatting
5257 # these files is somewhat slow, so it's important not to duplicate the work.
5258 if not opts.presubmit:
5259 for xml_dir in GetDirtyMetricsDirs(diff_files):
5260 tool_dir = os.path.join(top_dir, xml_dir)
5261 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5262 if opts.dry_run or opts.diff:
5263 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005264 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005265 if opts.diff:
5266 sys.stdout.write(stdout)
5267 if opts.dry_run and stdout:
5268 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005269
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005270 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005271
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005272
Steven Holte2e664bf2017-04-21 13:10:47 -07005273def GetDirtyMetricsDirs(diff_files):
5274 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5275 metrics_xml_dirs = [
5276 os.path.join('tools', 'metrics', 'actions'),
5277 os.path.join('tools', 'metrics', 'histograms'),
5278 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005279 os.path.join('tools', 'metrics', 'ukm'),
5280 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005281 for xml_dir in metrics_xml_dirs:
5282 if any(file.startswith(xml_dir) for file in xml_diff_files):
5283 yield xml_dir
5284
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005285
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005286@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005287@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005288def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005289 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005290 _, args = parser.parse_args(args)
5291
5292 if len(args) != 1:
5293 parser.print_help()
5294 return 1
5295
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005296 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005297 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005298 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005299
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005300 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005301
Edward Lemur52969c92020-02-06 18:15:28 +00005302 issueprefix = Changelist.IssueConfigKey()
5303 output = RunGit(['config', '--local', '--get-regexp',
5304 r'branch\..*\.%s' % issueprefix],
5305 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005306
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005307 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005308 for key, issue in [x.split() for x in output.splitlines()]:
5309 if issue == target_issue:
5310 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5311
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005312 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005313 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005314 return 1
5315 if len(branches) == 1:
5316 RunGit(['checkout', branches[0]])
5317 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005318 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005319 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005320 print('%d: %s' % (i, branches[i]))
Edward Lemur1a83da12020-03-04 21:18:36 +00005321 which = ask_for_data('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005322 try:
5323 RunGit(['checkout', branches[int(which)]])
5324 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005325 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005326 return 1
5327
5328 return 0
5329
5330
maruel@chromium.org29404b52014-09-08 22:58:00 +00005331def CMDlol(parser, args):
5332 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005333 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005334 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5335 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5336 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005337 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005338 return 0
5339
5340
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005341class OptionParser(optparse.OptionParser):
5342 """Creates the option parse and add --verbose support."""
5343 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005344 optparse.OptionParser.__init__(
5345 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005346 self.add_option(
5347 '-v', '--verbose', action='count', default=0,
5348 help='Use 2 times for more debugging info')
5349
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005350 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005351 try:
5352 return self._parse_args(args)
5353 finally:
5354 # Regardless of success or failure of args parsing, we want to report
5355 # metrics, but only after logging has been initialized (if parsing
5356 # succeeded).
5357 global settings
5358 settings = Settings()
5359
5360 if not metrics.DISABLE_METRICS_COLLECTION:
5361 # GetViewVCUrl ultimately calls logging method.
5362 project_url = settings.GetViewVCUrl().strip('/+')
5363 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5364 metrics.collector.add('project_urls', [project_url])
5365
5366 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005367 # Create an optparse.Values object that will store only the actual passed
5368 # options, without the defaults.
5369 actual_options = optparse.Values()
5370 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5371 # Create an optparse.Values object with the default options.
5372 options = optparse.Values(self.get_default_values().__dict__)
5373 # Update it with the options passed by the user.
5374 options._update_careful(actual_options.__dict__)
5375 # Store the options passed by the user in an _actual_options attribute.
5376 # We store only the keys, and not the values, since the values can contain
5377 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005378 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005379
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005380 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005381 logging.basicConfig(
5382 level=levels[min(options.verbose, len(levels) - 1)],
5383 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5384 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005385
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005386 return options, args
5387
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005388
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005389def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005390 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005391 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005392 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005393 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005394
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005395 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005396 dispatcher = subcommand.CommandDispatcher(__name__)
5397 try:
5398 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005399 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005400 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005401 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005402 if e.code != 500:
5403 raise
5404 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005405 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005406 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005407 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005408
5409
5410if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005411 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5412 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005413 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005414 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005415 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005416 sys.exit(main(sys.argv[1:]))