blob: c41d89f16c5a56f2a05321deac643d99c7e84bfb [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
thakis@chromium.org3421c992014-11-02 02:20:32 +000013import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000014import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010015import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000016import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000017import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010018import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000019import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000021import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import optparse
23import os
24import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010025import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000026import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000027import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070028import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000030import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000032import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000033import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000034
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000035from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000036import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000037import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000038import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000039import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000040import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000041import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000042import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000043import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000044import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000045import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000046import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000047import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000048import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000049import presubmit_support
50import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000055import watchlists
56
Edward Lemur79d4f992019-11-11 23:49:02 +000057from third_party import six
58from six.moves import urllib
59
60
61if sys.version_info.major == 3:
62 basestring = (str,) # pylint: disable=redefined-builtin
63
Edward Lemurb9830242019-10-30 22:19:20 +000064
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
Edward Lemur0f58ae42019-04-30 17:24:12 +000067# Traces for git push will be stored in a traces directory inside the
68# depot_tools checkout.
69DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
70TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000071PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000072
73# When collecting traces, Git hashes will be reduced to 6 characters to reduce
74# the size after compression.
75GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
76# Used to redact the cookies from the gitcookies file.
77GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
78
Edward Lemurd4d1ba42019-09-20 21:46:37 +000079MAX_ATTEMPTS = 3
80
Edward Lemur1b52d872019-05-09 21:12:12 +000081# The maximum number of traces we will keep. Multiplied by 3 since we store
82# 3 files per trace.
83MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000084# Message to be displayed to the user to inform where to find the traces for a
85# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000086TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000087'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000088'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000089' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'Copies of your gitcookies file and git config have been recorded at:\n'
91' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000092# Format of the message to be stored as part of the traces to give developers a
93# better context when they go through traces.
94TRACES_README_FORMAT = (
95'Date: %(now)s\n'
96'\n'
97'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
98'Title: %(title)s\n'
99'\n'
100'%(description)s\n'
101'\n'
102'Execution time: %(execution_time)s\n'
103'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000104
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
thestig@chromium.org44202a22014-03-11 19:22:18 +0000112# Valid extensions for files we want to lint.
113DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
114DEFAULT_LINT_IGNORE_REGEX = r"$^"
115
Aiden Bennerc08566e2018-10-03 17:52:42 +0000116# File name for yapf style config files.
117YAPF_CONFIG_FILENAME = '.style.yapf'
118
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000119# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000120Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000121
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000122# Initialized in main()
123settings = None
124
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100125# Used by tests/git_cl_test.py to add extra logging.
126# Inside the weirdly failing test, add this:
127# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700128# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100129_IS_BEING_TESTED = False
130
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000131
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000132_KNOWN_GERRIT_TO_SHORT_URLS = {
133 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
134 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
135}
136
137
Christopher Lamf732cd52017-01-24 12:40:11 +1100138def DieWithError(message, change_desc=None):
139 if change_desc:
140 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000141 print('\n ** Content of CL description **\n' +
142 '='*72 + '\n' +
143 change_desc.description + '\n' +
144 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100145
vapiera7fbd5a2016-06-16 09:17:49 -0700146 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000147 sys.exit(1)
148
149
Christopher Lamf732cd52017-01-24 12:40:11 +1100150def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000151 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000152 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000153 with open(backup_path, 'w') as backup_file:
154 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100155
156
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000157def GetNoGitPagerEnv():
158 env = os.environ.copy()
159 # 'cat' is a magical git string that disables pagers on all platforms.
160 env['GIT_PAGER'] = 'cat'
161 return env
162
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000163
bsep@chromium.org627d9002016-04-29 00:00:52 +0000164def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000166 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
167 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000168 except subprocess2.CalledProcessError as e:
169 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000170 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000171 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000172 'Command "%s" failed.\n%s' % (
173 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000174 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000175
176
177def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000178 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000179 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000180
181
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000182def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000183 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700184 if suppress_stderr:
185 stderr = subprocess2.VOID
186 else:
187 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000188 try:
tandrii5d48c322016-08-18 16:19:37 -0700189 (out, _), code = subprocess2.communicate(['git'] + args,
190 env=GetNoGitPagerEnv(),
191 stdout=subprocess2.PIPE,
192 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000193 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700194 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900195 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000196 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000197
198
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000199def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000200 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000201 return RunGitWithCode(args, suppress_stderr=True)[1]
202
203
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000204def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000205 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000206 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000207 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000208 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000209
210
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000211def BranchExists(branch):
212 """Return True if specified branch exists."""
213 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
214 suppress_stderr=True)
215 return not code
216
217
tandrii2a16b952016-10-19 07:09:44 -0700218def time_sleep(seconds):
219 # Use this so that it can be mocked in tests without interfering with python
220 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700221 return time.sleep(seconds)
222
223
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000224def time_time():
225 # Use this so that it can be mocked in tests without interfering with python
226 # system machinery.
227 return time.time()
228
229
Edward Lemur1b52d872019-05-09 21:12:12 +0000230def datetime_now():
231 # Use this so that it can be mocked in tests without interfering with python
232 # system machinery.
233 return datetime.datetime.now()
234
235
Edward Lemur1a83da12020-03-04 21:18:36 +0000236def _raw_input(message):
237 # Use this so that it can be mocked in tests on Python 2 and 3.
238 if sys.version_info.major == 2:
239 return raw_input(message)
240 return input(message)
241
242
maruel@chromium.org90541732011-04-01 17:54:18 +0000243def ask_for_data(prompt):
244 try:
Edward Lemur1a83da12020-03-04 21:18:36 +0000245 return _raw_input(prompt)
maruel@chromium.org90541732011-04-01 17:54:18 +0000246 except KeyboardInterrupt:
247 # Hide the exception.
248 sys.exit(1)
249
250
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100251def confirm_or_exit(prefix='', action='confirm'):
252 """Asks user to press enter to continue or press Ctrl+C to abort."""
253 if not prefix or prefix.endswith('\n'):
254 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100255 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100256 mid = ' Press'
257 elif prefix.endswith(' '):
258 mid = 'press'
259 else:
260 mid = ' press'
261 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
262
263
264def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000265 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100266 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
267 while True:
268 if 'yes'.startswith(result):
269 return True
270 if 'no'.startswith(result):
271 return False
272 result = ask_for_data('Please, type yes or no: ').lower()
273
274
tandrii5d48c322016-08-18 16:19:37 -0700275def _git_branch_config_key(branch, key):
276 """Helper method to return Git config key for a branch."""
277 assert branch, 'branch name is required to set git config for it'
278 return 'branch.%s.%s' % (branch, key)
279
280
machenbach@chromium.org45453142015-09-15 08:45:22 +0000281def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000282 prop_list = getattr(options, 'properties', [])
283 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000284 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000285 try:
286 properties[key] = json.loads(val)
287 except ValueError:
288 pass # If a value couldn't be evaluated, treat it as a string.
289 return properties
290
291
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000292# TODO(crbug.com/976104): Remove this function once git-cl try-results has
293# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000294def _buildbucket_retry(operation_name, http, *args, **kwargs):
295 """Retries requests to buildbucket service and returns parsed json content."""
296 try_count = 0
297 while True:
298 response, content = http.request(*args, **kwargs)
299 try:
300 content_json = json.loads(content)
301 except ValueError:
302 content_json = None
303
304 # Buildbucket could return an error even if status==200.
305 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000306 error = content_json.get('error')
307 if error.get('code') == 403:
308 raise BuildbucketResponseException(
309 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000310 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000311 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000312 raise BuildbucketResponseException(msg)
313
314 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700315 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000316 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000317 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700318 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000319 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000320 content)
321 return content_json
322 if response.status < 500 or try_count >= 2:
323 raise httplib2.HttpLib2Error(content)
324
325 # status >= 500 means transient failures.
326 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000327 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000328 try_count += 1
329 assert False, 'unreachable'
330
331
Edward Lemur4c707a22019-09-24 21:13:43 +0000332def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333 """Calls a buildbucket v2 method and returns the parsed json response."""
334 headers = {
335 'Accept': 'application/json',
336 'Content-Type': 'application/json',
337 }
338 request = json.dumps(request)
339 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
340
341 logging.info('POST %s with %s' % (url, request))
342
343 attempts = 1
344 time_to_sleep = 1
345 while True:
346 response, content = http.request(url, 'POST', body=request, headers=headers)
347 if response.status == 200:
348 return json.loads(content[4:])
349 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
350 msg = '%s error when calling POST %s with %s: %s' % (
351 response.status, url, request, content)
352 raise BuildbucketResponseException(msg)
353 logging.debug(
354 '%s error when calling POST %s with %s. '
355 'Sleeping for %d seconds and retrying...' % (
356 response.status, url, request, time_to_sleep))
357 time.sleep(time_to_sleep)
358 time_to_sleep *= 2
359 attempts += 1
360
361 assert False, 'unreachable'
362
363
Edward Lemur6215c792019-10-03 21:59:05 +0000364def _parse_bucket(raw_bucket):
365 legacy = True
366 project = bucket = None
367 if '/' in raw_bucket:
368 legacy = False
369 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000370 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000371 elif raw_bucket.startswith('luci.'):
372 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000374 elif '.' in raw_bucket:
375 project = raw_bucket.split('.')[0]
376 bucket = raw_bucket
377 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000378 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000379 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
380 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381
382
Quinten Yearsley777660f2020-03-04 23:37:06 +0000383def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000384 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700385
386 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000387 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000388 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700389 options: Command-line options.
390 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000391 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000392 for project, bucket, builder in jobs:
393 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000394 print('To see results here, run: git cl try-results')
395 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700396
Quinten Yearsley777660f2020-03-04 23:37:06 +0000397 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000398 if not requests:
399 return
400
Edward Lemur5b929a42019-10-21 17:57:39 +0000401 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000402 http.force_exception_to_status_code = True
403
404 batch_request = {'requests': requests}
405 batch_response = _call_buildbucket(
406 http, options.buildbucket_host, 'Batch', batch_request)
407
408 errors = [
409 ' ' + response['error']['message']
410 for response in batch_response.get('responses', [])
411 if 'error' in response
412 ]
413 if errors:
414 raise BuildbucketResponseException(
415 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
416
417
Quinten Yearsley777660f2020-03-04 23:37:06 +0000418def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000419 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000420 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000421 shared_properties = {
422 'category': options.ensure_value('category', 'git_cl_try')
423 }
424 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425 shared_properties['clobber'] = True
426 shared_properties.update(_get_properties_from_options(options) or {})
427
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000428 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000429 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000430 shared_tags.append({'key': 'retry_failed',
431 'value': '1'})
432
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000433 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000434 for (project, bucket, builder) in jobs:
435 properties = shared_properties.copy()
436 if 'presubmit' in builder.lower():
437 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000438
Edward Lemur45768512020-03-02 19:03:14 +0000439 requests.append({
440 'scheduleBuild': {
441 'requestId': str(uuid.uuid4()),
442 'builder': {
443 'project': getattr(options, 'project', None) or project,
444 'bucket': bucket,
445 'builder': builder,
446 },
447 'gerritChanges': gerrit_changes,
448 'properties': properties,
449 'tags': [
450 {'key': 'builder', 'value': builder},
451 ] + shared_tags,
452 }
453 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000454
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000455 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000456 requests[-1]['scheduleBuild']['gitilesCommit'] = {
457 'host': gerrit_changes[0]['host'],
458 'project': gerrit_changes[0]['project'],
459 'id': options.revision
460 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000461
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000462 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000463
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000464
Quinten Yearsley777660f2020-03-04 23:37:06 +0000465def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000466 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000467
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000468 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000469 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000470 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000471 request = {
472 'predicate': {
473 'gerritChanges': [changelist.GetGerritChange(patchset)],
474 },
475 'fields': ','.join('builds.*.' + field for field in fields),
476 }
tandrii221ab252016-10-06 08:12:04 -0700477
Edward Lemur5b929a42019-10-21 17:57:39 +0000478 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000479 if authenticator.has_cached_credentials():
480 http = authenticator.authorize(httplib2.Http())
481 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700482 print('Warning: Some results might be missing because %s' %
483 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000484 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000485 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000486 http.force_exception_to_status_code = True
487
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000488 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
489 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000490
Edward Lemur45768512020-03-02 19:03:14 +0000491
Edward Lemur5b929a42019-10-21 17:57:39 +0000492def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 """Fetches builds from the latest patchset that has builds (within
494 the last few patchsets).
495
496 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000497 changelist (Changelist): The CL to fetch builds for
498 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000499 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
500 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000501 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000502 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
503 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000504 """
505 assert buildbucket_host
506 assert changelist.GetIssue(), 'CL must be uploaded first'
507 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000508 if latest_patchset is None:
509 assert changelist.GetMostRecentPatchset()
510 ps = changelist.GetMostRecentPatchset()
511 else:
512 assert latest_patchset > 0, latest_patchset
513 ps = latest_patchset
514
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515 min_ps = max(1, ps - 5)
516 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000517 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000518 if len(builds):
519 return builds, ps
520 ps -= 1
521 return [], 0
522
523
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000524def _filter_failed_for_retry(all_builds):
525 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000526
527 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000528 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000529 i.e. a list of buildbucket.v2.Builds which includes status and builder
530 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000531
532 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000533 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000534 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000535 """
Edward Lemur45768512020-03-02 19:03:14 +0000536 grouped = {}
537 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000538 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000539 key = (builder['project'], builder['bucket'], builder['builder'])
540 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000541
Edward Lemur45768512020-03-02 19:03:14 +0000542 jobs = []
543 for (project, bucket, builder), builds in grouped.items():
544 if 'triggered' in builder:
545 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
546 'from a parent. Please schedule a manual job for the parent '
547 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000548 continue
549 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
550 # Don't retry if any are running.
551 continue
Edward Lemur45768512020-03-02 19:03:14 +0000552 # If builder had several builds, retry only if the last one failed.
553 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
554 # build, but in case of retrying failed jobs retrying a flaky one makes
555 # sense.
556 builds = sorted(builds, key=lambda b: b['createTime'])
557 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
558 continue
559 # Don't retry experimental build previously triggered by CQ.
560 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
561 for t in builds[-1]['tags']):
562 continue
563 jobs.append((project, bucket, builder))
564
565 # Sort the jobs to make testing easier.
566 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000567
568
Quinten Yearsley777660f2020-03-04 23:37:06 +0000569def _print_tryjobs(options, builds):
570 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000571 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000572 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000573 return
574
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000575 longest_builder = max(len(b['builder']['builder']) for b in builds)
576 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
579 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000581 builds_by_status = {}
582 for b in builds:
583 builds_by_status.setdefault(b['status'], []).append({
584 'id': b['id'],
585 'name': name_fmt.format(
586 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
587 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000589 sort_key = lambda b: (b['name'], b['id'])
590
591 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 if not builds:
594 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000596 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000597 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000598 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000599 else:
600 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
601
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 print(colorize(title))
603 for b in sorted(builds, key=sort_key):
604 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000605
606 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000607 print_builds(
608 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
609 print_builds(
610 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
611 color=Fore.MAGENTA)
612 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
613 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
614 color=Fore.MAGENTA)
615 print_builds('Started:', builds_by_status.pop('STARTED', []))
616 print_builds(
617 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000618 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000619 print_builds(
620 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000621 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000622
623
Aiden Bennerc08566e2018-10-03 17:52:42 +0000624def _ComputeDiffLineRanges(files, upstream_commit):
625 """Gets the changed line ranges for each file since upstream_commit.
626
627 Parses a git diff on provided files and returns a dict that maps a file name
628 to an ordered list of range tuples in the form (start_line, count).
629 Ranges are in the same format as a git diff.
630 """
631 # If files is empty then diff_output will be a full diff.
632 if len(files) == 0:
633 return {}
634
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000635 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000636 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000637 diff_output = RunGit(diff_cmd)
638
639 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
640 # 2 capture groups
641 # 0 == fname of diff file
642 # 1 == 'diff_start,diff_count' or 'diff_start'
643 # will match each of
644 # diff --git a/foo.foo b/foo.py
645 # @@ -12,2 +14,3 @@
646 # @@ -12,2 +17 @@
647 # running re.findall on the above string with pattern will give
648 # [('foo.py', ''), ('', '14,3'), ('', '17')]
649
650 curr_file = None
651 line_diffs = {}
652 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
653 if match[0] != '':
654 # Will match the second filename in diff --git a/a.py b/b.py.
655 curr_file = match[0]
656 line_diffs[curr_file] = []
657 else:
658 # Matches +14,3
659 if ',' in match[1]:
660 diff_start, diff_count = match[1].split(',')
661 else:
662 # Single line changes are of the form +12 instead of +12,1.
663 diff_start = match[1]
664 diff_count = 1
665
666 diff_start = int(diff_start)
667 diff_count = int(diff_count)
668
669 # If diff_count == 0 this is a removal we can ignore.
670 line_diffs[curr_file].append((diff_start, diff_count))
671
672 return line_diffs
673
674
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000675def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676 """Checks if a yapf file is in any parent directory of fpath until top_dir.
677
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000678 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000679 is found returns None. Uses yapf_config_cache as a cache for previously found
680 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000681 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000682 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000683 # Return result if we've already computed it.
684 if fpath in yapf_config_cache:
685 return yapf_config_cache[fpath]
686
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000687 parent_dir = os.path.dirname(fpath)
688 if os.path.isfile(fpath):
689 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000690 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000691 # Otherwise fpath is a directory
692 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
693 if os.path.isfile(yapf_file):
694 ret = yapf_file
695 elif fpath == top_dir or parent_dir == fpath:
696 # If we're at the top level directory, or if we're at root
697 # there is no provided style.
698 ret = None
699 else:
700 # Otherwise recurse on the current directory.
701 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000702 yapf_config_cache[fpath] = ret
703 return ret
704
705
Brian Sheedyb4307d52019-12-02 19:18:17 +0000706def _GetYapfIgnorePatterns(top_dir):
707 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000708
709 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
710 but this functionality appears to break when explicitly passing files to
711 yapf for formatting. According to
712 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
713 the .yapfignore file should be in the directory that yapf is invoked from,
714 which we assume to be the top level directory in this case.
715
716 Args:
717 top_dir: The top level directory for the repository being formatted.
718
719 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000720 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000721 """
722 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000723 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000724 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000725 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000726
Brian Sheedyb4307d52019-12-02 19:18:17 +0000727 with open(yapfignore_file) as f:
728 for line in f.readlines():
729 stripped_line = line.strip()
730 # Comments and blank lines should be ignored.
731 if stripped_line.startswith('#') or stripped_line == '':
732 continue
733 ignore_patterns.add(stripped_line)
734 return ignore_patterns
735
736
737def _FilterYapfIgnoredFiles(filepaths, patterns):
738 """Filters out any filepaths that match any of the given patterns.
739
740 Args:
741 filepaths: An iterable of strings containing filepaths to filter.
742 patterns: An iterable of strings containing fnmatch patterns to filter on.
743
744 Returns:
745 A list of strings containing all the elements of |filepaths| that did not
746 match any of the patterns in |patterns|.
747 """
748 # Not inlined so that tests can use the same implementation.
749 return [f for f in filepaths
750 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000751
752
Aaron Gable13101a62018-02-09 13:20:41 -0800753def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 """Prints statistics about the change to the user."""
755 # --no-ext-diff is broken in some versions of Git, so try to work around
756 # this by overriding the environment (but there is still a problem if the
757 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000758 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000759 if 'GIT_EXTERNAL_DIFF' in env:
760 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000761
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000762 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800763 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000764 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000765
766
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000767class BuildbucketResponseException(Exception):
768 pass
769
770
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000771class Settings(object):
772 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000773 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000774 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775 self.tree_status_url = None
776 self.viewvc_url = None
777 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000778 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000779 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000780 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000781 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000782 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783
Edward Lemur26964072020-02-19 19:18:51 +0000784 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000785 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000786 if self.updated:
787 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788
Edward Lemur26964072020-02-19 19:18:51 +0000789 # The only value that actually changes the behavior is
790 # autoupdate = "false". Everything else means "true".
791 autoupdate = (
792 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
793
794 cr_settings_file = FindCodereviewSettingsFile()
795 if autoupdate != 'false' and cr_settings_file:
796 LoadCodereviewSettingsFromFile(cr_settings_file)
797 cr_settings_file.close()
798
799 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000801 @staticmethod
802 def GetRelativeRoot():
803 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000804
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000806 if self.root is None:
807 self.root = os.path.abspath(self.GetRelativeRoot())
808 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 def GetTreeStatusUrl(self, error_ok=False):
811 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000812 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
813 if self.tree_status_url is None and not error_ok:
814 DieWithError(
815 'You must configure your tree status URL by running '
816 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000817 return self.tree_status_url
818
819 def GetViewVCUrl(self):
820 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000821 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822 return self.viewvc_url
823
rmistry@google.com90752582014-01-14 21:04:50 +0000824 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000825 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000826
rmistry@google.com5626a922015-02-26 14:03:30 +0000827 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000828 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000829 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000830 return run_post_upload_hook == "True"
831
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000832 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000833 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000834
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
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001260 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 """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
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001265 server = self.GetCodereviewServer()
1266 if short:
1267 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1268 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001269
Edward Lemur6c6827c2020-02-06 21:15:18 +00001270 def FetchDescription(self, pretty=False):
1271 assert self.GetIssue(), 'issue is required to query Gerrit'
1272
Edward Lemur9aa1a962020-02-25 00:58:38 +00001273 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001274 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1275 current_rev = data['current_revision']
1276 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001277
1278 if not pretty:
1279 return self.description
1280
1281 # Set width to 72 columns + 2 space indent.
1282 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1283 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1284 lines = self.description.splitlines()
1285 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001286
1287 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001288 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001289 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001290 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1291 if self.patchset is not None:
1292 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001293 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001294 return self.patchset
1295
Edward Lemur9aa1a962020-02-25 00:58:38 +00001296 def GetAuthor(self):
1297 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1298
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001299 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001300 """Set this branch's patchset. If patchset=0, clears the patchset."""
1301 assert self.GetBranch()
1302 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001303 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001304 else:
1305 self.patchset = int(patchset)
1306 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001307 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001308
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001309 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001310 """Set this branch's issue. If issue isn't given, clears the issue."""
1311 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001312 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001313 issue = int(issue)
1314 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001315 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001316 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001317 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001318 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001319 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001320 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001321 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001322 else:
tandrii5d48c322016-08-18 16:19:37 -07001323 # Reset all of these just to be clean.
1324 reset_suffixes = [
1325 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001326 self.IssueConfigKey(),
1327 self.PatchsetConfigKey(),
1328 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001329 ] + self._PostUnsetIssueProperties()
1330 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001331 try:
1332 self._GitSetBranchConfigValue(prop, None)
1333 except subprocess2.CalledProcessError:
1334 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001335 msg = RunGit(['log', '-1', '--format=%B']).strip()
1336 if msg and git_footers.get_footer_change_id(msg):
1337 print('WARNING: The change patched into this branch has a Change-Id. '
1338 'Removing it.')
1339 RunGit(['commit', '--amend', '-m',
1340 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001341 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001342 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001343 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001344
Edward Lemur2c62b332020-03-12 22:12:33 +00001345 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001346 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001347 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001348 except subprocess2.CalledProcessError:
1349 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001350 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001351 'This branch probably doesn\'t exist anymore. To reset the\n'
1352 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001353 ' git branch --set-upstream-to origin/master %s\n'
1354 'or replace origin/master with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001355 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001356
dsansomee2d6fd92016-09-08 00:10:47 -07001357 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001358 assert self.GetIssue(), 'issue is required to update description'
1359
1360 if gerrit_util.HasPendingChangeEdit(
1361 self._GetGerritHost(), self._GerritChangeIdentifier()):
1362 if not force:
1363 confirm_or_exit(
1364 'The description cannot be modified while the issue has a pending '
1365 'unpublished edit. Either publish the edit in the Gerrit web UI '
1366 'or delete it.\n\n', action='delete the unpublished edit')
1367
1368 gerrit_util.DeletePendingChangeEdit(
1369 self._GetGerritHost(), self._GerritChangeIdentifier())
1370 gerrit_util.SetCommitMessage(
1371 self._GetGerritHost(), self._GerritChangeIdentifier(),
1372 description, notify='NONE')
1373
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001374 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001375
Edward Lemur75526302020-02-27 22:31:05 +00001376 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001377 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001378 '--root', settings.GetRoot(),
1379 '--upstream', upstream,
1380 ]
1381
1382 args.extend(['--verbose'] * verbose)
1383
Edward Lemur99df04e2020-03-05 19:39:43 +00001384 author = self.GetAuthor()
1385 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001386 issue = self.GetIssue()
1387 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001388 if author:
1389 args.extend(['--author', author])
1390 if gerrit_url:
1391 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001392 if issue:
1393 args.extend(['--issue', str(issue)])
1394 if patchset:
1395 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001396
Edward Lemur75526302020-02-27 22:31:05 +00001397 return args
1398
1399 def RunHook(
1400 self, committing, may_prompt, verbose, parallel, upstream, description,
1401 all_files):
1402 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1403 args = self._GetCommonPresubmitArgs(verbose, upstream)
1404 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001405 if may_prompt:
1406 args.append('--may_prompt')
1407 if parallel:
1408 args.append('--parallel')
1409 if all_files:
1410 args.append('--all_files')
1411
1412 with gclient_utils.temporary_file() as description_file:
1413 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001414
1415 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001416 args.extend(['--json_output', json_output])
1417 args.extend(['--description_file', description_file])
1418
1419 start = time_time()
1420 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1421 exit_code = p.wait()
1422 metrics.collector.add_repeated('sub_commands', {
1423 'command': 'presubmit',
1424 'execution_time': time_time() - start,
1425 'exit_code': exit_code,
1426 })
1427
1428 if exit_code:
1429 sys.exit(exit_code)
1430
1431 json_results = gclient_utils.FileRead(json_output)
1432 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001433
Edward Lemur75526302020-02-27 22:31:05 +00001434 def RunPostUploadHook(self, verbose, upstream, description):
1435 args = self._GetCommonPresubmitArgs(verbose, upstream)
1436 args.append('--post_upload')
1437
1438 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001439 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001440 args.extend(['--description_file', description_file])
1441 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1442 p.wait()
1443
Edward Lemur5a644f82020-03-18 16:44:57 +00001444 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1445 # Get description message for upload.
1446 if self.GetIssue():
1447 description = self.FetchDescription()
1448 elif options.message:
1449 description = options.message
1450 else:
1451 description = _create_description_from_log(git_diff_args)
1452 if options.title and options.squash:
1453 description = options.title + '\n\n' + message
1454
1455 # Extract bug number from branch name.
1456 bug = options.bug
1457 fixed = options.fixed
1458 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1459 self.GetBranch())
1460 if not bug and not fixed and match:
1461 if match.group('type') == 'bug':
1462 bug = match.group('bugnum')
1463 else:
1464 fixed = match.group('bugnum')
1465
1466 change_description = ChangeDescription(description, bug, fixed)
1467
1468 # Set the reviewer list now so that presubmit checks can access it.
1469 if options.reviewers or options.tbrs or options.add_owners_to:
1470 change_description.update_reviewers(
1471 options.reviewers, options.tbrs, options.add_owners_to, files,
1472 self.GetAuthor())
1473
1474 return change_description
1475
1476 def _GetTitleForUpload(self, options):
1477 # When not squashing, just return options.title.
1478 if not options.squash:
1479 return options.title
1480
1481 # On first upload, patchset title is always this string, while options.title
1482 # gets converted to first line of message.
1483 if not self.GetIssue():
1484 return 'Initial upload'
1485
1486 # When uploading subsequent patchsets, options.message is taken as the title
1487 # if options.title is not provided.
1488 if options.title:
1489 return options.title
1490 if options.message:
1491 return options.message.strip()
1492
1493 # Use the subject of the last commit as title by default.
1494 title = RunGit(
1495 ['show', '-s', '--format=%s', 'HEAD']).strip()
1496 if options.force:
1497 return title
1498 return ask_for_data('Title for patchset [%s]: ' % title) or title
1499
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001500 def CMDUpload(self, options, git_diff_args, orig_args):
1501 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001502 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001503 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001504 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001505 else:
1506 if self.GetBranch() is None:
1507 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1508
1509 # Default to diffing against common ancestor of upstream branch
1510 base_branch = self.GetCommonAncestorWithUpstream()
1511 git_diff_args = [base_branch, 'HEAD']
1512
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001513 # Fast best-effort checks to abort before running potentially expensive
1514 # hooks if uploading is likely to fail anyway. Passing these checks does
1515 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001516 self.EnsureAuthenticated(force=options.force)
1517 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001518
1519 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001520 watchlist = watchlists.Watchlists(settings.GetRoot())
1521 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001522 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001523 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001524
Edward Lemur5a644f82020-03-18 16:44:57 +00001525 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001526 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001527 hook_results = self.RunHook(
1528 committing=False,
1529 may_prompt=not options.force,
1530 verbose=options.verbose,
1531 parallel=options.parallel,
1532 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001533 description=change_desc.description,
Edward Lemur2c62b332020-03-12 22:12:33 +00001534 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001535 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001536
Aaron Gable13101a62018-02-09 13:20:41 -08001537 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001538 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001539 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001540 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001541 self._GitSetBranchConfigValue(
1542 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001543 # Run post upload hooks, if specified.
1544 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001545 self.RunPostUploadHook(
1546 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001547
1548 # Upload all dependencies if specified.
1549 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001550 print()
1551 print('--dependencies has been specified.')
1552 print('All dependent local branches will be re-uploaded.')
1553 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001554 # Remove the dependencies flag from args so that we do not end up in a
1555 # loop.
1556 orig_args.remove('--dependencies')
1557 ret = upload_branch_deps(self, orig_args)
1558 return ret
1559
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001560 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001561 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001562
1563 Issue must have been already uploaded and known.
1564 """
1565 assert new_state in _CQState.ALL_STATES
1566 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001567 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001568 vote_map = {
1569 _CQState.NONE: 0,
1570 _CQState.DRY_RUN: 1,
1571 _CQState.COMMIT: 2,
1572 }
1573 labels = {'Commit-Queue': vote_map[new_state]}
1574 notify = False if new_state == _CQState.DRY_RUN else None
1575 gerrit_util.SetReview(
1576 self._GetGerritHost(), self._GerritChangeIdentifier(),
1577 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001578 return 0
1579 except KeyboardInterrupt:
1580 raise
1581 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001582 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001583 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001584 ' * Your project has no CQ,\n'
1585 ' * You don\'t have permission to change the CQ state,\n'
1586 ' * There\'s a bug in this code (see stack trace below).\n'
1587 'Consider specifying which bots to trigger manually or asking your '
1588 'project owners for permissions or contacting Chrome Infra at:\n'
1589 'https://www.chromium.org/infra\n\n' %
1590 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001591 # Still raise exception so that stack trace is printed.
1592 raise
1593
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001594 def _GetGerritHost(self):
1595 # Lazy load of configs.
1596 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001597 if self._gerrit_host and '.' not in self._gerrit_host:
1598 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1599 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001600 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001601 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001602 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001603 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001604 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1605 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001606 return self._gerrit_host
1607
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001608 def _GetGitHost(self):
1609 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001610 remote_url = self.GetRemoteUrl()
1611 if not remote_url:
1612 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001613 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001614
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001615 def GetCodereviewServer(self):
1616 if not self._gerrit_server:
1617 # If we're on a branch then get the server potentially associated
1618 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001619 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001620 self._gerrit_server = self._GitGetBranchConfigValue(
1621 self.CodereviewServerConfigKey())
1622 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001623 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001624 if not self._gerrit_server:
1625 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1626 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001627 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001628 parts[0] = parts[0] + '-review'
1629 self._gerrit_host = '.'.join(parts)
1630 self._gerrit_server = 'https://%s' % self._gerrit_host
1631 return self._gerrit_server
1632
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001633 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001634 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001635 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001636 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001637 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001638 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001639 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001640 if project.endswith('.git'):
1641 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001642 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1643 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1644 # gitiles/git-over-https protocol. E.g.,
1645 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1646 # as
1647 # https://chromium.googlesource.com/v8/v8
1648 if project.startswith('a/'):
1649 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001650 return project
1651
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001652 def _GerritChangeIdentifier(self):
1653 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1654
1655 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001656 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001657 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001658 project = self._GetGerritProject()
1659 if project:
1660 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1661 # Fall back on still unique, but less efficient change number.
1662 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001663
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001664 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001665 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001666 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001667
tandrii5d48c322016-08-18 16:19:37 -07001668 @classmethod
1669 def PatchsetConfigKey(cls):
1670 return 'gerritpatchset'
1671
1672 @classmethod
1673 def CodereviewServerConfigKey(cls):
1674 return 'gerritserver'
1675
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001676 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001677 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001678 if settings.GetGerritSkipEnsureAuthenticated():
1679 # For projects with unusual authentication schemes.
1680 # See http://crbug.com/603378.
1681 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001682
1683 # Check presence of cookies only if using cookies-based auth method.
1684 cookie_auth = gerrit_util.Authenticator.get()
1685 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001686 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001687
Florian Mayerae510e82020-01-30 21:04:48 +00001688 remote_url = self.GetRemoteUrl()
1689 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001690 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001691 return
1692 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001693 logging.warning('Ignoring branch %(branch)s with non-https remote '
1694 '%(remote)s', {
1695 'branch': self.branch,
1696 'remote': self.GetRemoteUrl()
1697 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001698 return
1699
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001700 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001701 self.GetCodereviewServer()
1702 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001703 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001704
1705 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1706 git_auth = cookie_auth.get_auth_header(git_host)
1707 if gerrit_auth and git_auth:
1708 if gerrit_auth == git_auth:
1709 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001710 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001711 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001712 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001713 ' %s\n'
1714 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001715 ' Consider running the following command:\n'
1716 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001717 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001718 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001719 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001720 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001721 cookie_auth.get_new_password_message(git_host)))
1722 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001723 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001724 return
1725 else:
1726 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001727 ([] if gerrit_auth else [self._gerrit_host]) +
1728 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001729 DieWithError('Credentials for the following hosts are required:\n'
1730 ' %s\n'
1731 'These are read from %s (or legacy %s)\n'
1732 '%s' % (
1733 '\n '.join(missing),
1734 cookie_auth.get_gitcookies_path(),
1735 cookie_auth.get_netrc_path(),
1736 cookie_auth.get_new_password_message(git_host)))
1737
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001738 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001739 if not self.GetIssue():
1740 return
1741
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001742 status = self._GetChangeDetail()['status']
1743 if status in ('MERGED', 'ABANDONED'):
1744 DieWithError('Change %s has been %s, new uploads are not allowed' %
1745 (self.GetIssueURL(),
1746 'submitted' if status == 'MERGED' else 'abandoned'))
1747
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001748 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1749 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1750 # Apparently this check is not very important? Otherwise get_auth_email
1751 # could have been added to other implementations of Authenticator.
1752 cookies_auth = gerrit_util.Authenticator.get()
1753 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001754 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001755
1756 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001757 if self.GetIssueOwner() == cookies_user:
1758 return
1759 logging.debug('change %s owner is %s, cookies user is %s',
1760 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001761 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001762 # so ask what Gerrit thinks of this user.
1763 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1764 if details['email'] == self.GetIssueOwner():
1765 return
1766 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001767 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001768 'as %s.\n'
1769 'Uploading may fail due to lack of permissions.' %
1770 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1771 confirm_or_exit(action='upload')
1772
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001773 def _PostUnsetIssueProperties(self):
1774 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001775 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001776
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001777 def GetGerritObjForPresubmit(self):
1778 return presubmit_support.GerritAccessor(self._GetGerritHost())
1779
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001780 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001781 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001782 or CQ status, assuming adherence to a common workflow.
1783
1784 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001785 * 'error' - error from review tool (including deleted issues)
1786 * 'unsent' - no reviewers added
1787 * 'waiting' - waiting for review
1788 * 'reply' - waiting for uploader to reply to review
1789 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001790 * 'dry-run' - dry-running in the CQ
1791 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001792 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001793 """
1794 if not self.GetIssue():
1795 return None
1796
1797 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001798 data = self._GetChangeDetail([
1799 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001800 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001801 return 'error'
1802
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001803 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001804 return 'closed'
1805
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001806 cq_label = data['labels'].get('Commit-Queue', {})
1807 max_cq_vote = 0
1808 for vote in cq_label.get('all', []):
1809 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1810 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001811 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001812 if max_cq_vote == 1:
1813 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001814
Aaron Gable9ab38c62017-04-06 14:36:33 -07001815 if data['labels'].get('Code-Review', {}).get('approved'):
1816 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001817
1818 if not data.get('reviewers', {}).get('REVIEWER', []):
1819 return 'unsent'
1820
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001821 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001822 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001823 while messages:
1824 m = messages.pop()
1825 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001826 # Ignore replies from CQ.
1827 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001828 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001829 # Most recent message was by owner.
1830 return 'waiting'
1831 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001832 # Some reply from non-owner.
1833 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001834
1835 # Somehow there are no messages even though there are reviewers.
1836 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001837
1838 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001839 if not self.GetIssue():
1840 return None
1841
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001842 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001843 patchset = data['revisions'][data['current_revision']]['_number']
1844 self.SetPatchset(patchset)
1845 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001846
Aaron Gable636b13f2017-07-14 10:42:48 -07001847 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001848 gerrit_util.SetReview(
1849 self._GetGerritHost(), self._GerritChangeIdentifier(),
1850 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001851
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001852 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001853 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001854 # CURRENT_REVISION is included to get the latest patchset so that
1855 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001856 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001857 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1858 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001859 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001860 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001861 robot_file_comments = gerrit_util.GetChangeRobotComments(
1862 self._GetGerritHost(), self._GerritChangeIdentifier())
1863
1864 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001865 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001866 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001867 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001868 line_comments = file_comments.setdefault(path, [])
1869 line_comments.extend(
1870 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001871
1872 # Build dictionary of file comments for easy access and sorting later.
1873 # {author+date: {path: {patchset: {line: url+message}}}}
1874 comments = collections.defaultdict(
1875 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001876 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001877 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001878 tag = comment.get('tag', '')
1879 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001880 continue
1881 key = (comment['author']['email'], comment['updated'])
1882 if comment.get('side', 'REVISION') == 'PARENT':
1883 patchset = 'Base'
1884 else:
1885 patchset = 'PS%d' % comment['patch_set']
1886 line = comment.get('line', 0)
1887 url = ('https://%s/c/%s/%s/%s#%s%s' %
1888 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1889 'b' if comment.get('side') == 'PARENT' else '',
1890 str(line) if line else ''))
1891 comments[key][path][patchset][line] = (url, comment['message'])
1892
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001893 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001894 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001895 summary = self._BuildCommentSummary(msg, comments, readable)
1896 if summary:
1897 summaries.append(summary)
1898 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001899
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001900 @staticmethod
1901 def _BuildCommentSummary(msg, comments, readable):
1902 key = (msg['author']['email'], msg['date'])
1903 # Don't bother showing autogenerated messages that don't have associated
1904 # file or line comments. this will filter out most autogenerated
1905 # messages, but will keep robot comments like those from Tricium.
1906 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1907 if is_autogenerated and not comments.get(key):
1908 return None
1909 message = msg['message']
1910 # Gerrit spits out nanoseconds.
1911 assert len(msg['date'].split('.')[-1]) == 9
1912 date = datetime.datetime.strptime(msg['date'][:-3],
1913 '%Y-%m-%d %H:%M:%S.%f')
1914 if key in comments:
1915 message += '\n'
1916 for path, patchsets in sorted(comments.get(key, {}).items()):
1917 if readable:
1918 message += '\n%s' % path
1919 for patchset, lines in sorted(patchsets.items()):
1920 for line, (url, content) in sorted(lines.items()):
1921 if line:
1922 line_str = 'Line %d' % line
1923 path_str = '%s:%d:' % (path, line)
1924 else:
1925 line_str = 'File comment'
1926 path_str = '%s:0:' % path
1927 if readable:
1928 message += '\n %s, %s: %s' % (patchset, line_str, url)
1929 message += '\n %s\n' % content
1930 else:
1931 message += '\n%s ' % path_str
1932 message += '\n%s\n' % content
1933
1934 return _CommentSummary(
1935 date=date,
1936 message=message,
1937 sender=msg['author']['email'],
1938 autogenerated=is_autogenerated,
1939 # These could be inferred from the text messages and correlated with
1940 # Code-Review label maximum, however this is not reliable.
1941 # Leaving as is until the need arises.
1942 approval=False,
1943 disapproval=False,
1944 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001945
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001946 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001947 gerrit_util.AbandonChange(
1948 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001949
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001950 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001951 gerrit_util.SubmitChange(
1952 self._GetGerritHost(), self._GerritChangeIdentifier(),
1953 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001954
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001955 def _GetChangeDetail(self, options=None):
1956 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001957 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001958 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001959
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001960 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001961 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001962 options.append('CURRENT_COMMIT')
1963
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001964 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001965 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001966 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001967
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001968 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1969 # Assumption: data fetched before with extra options is suitable
1970 # for return for a smaller set of options.
1971 # For example, if we cached data for
1972 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1973 # and request is for options=[CURRENT_REVISION],
1974 # THEN we can return prior cached data.
1975 if options_set.issubset(cached_options_set):
1976 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001977
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001978 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001979 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001980 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001981 except gerrit_util.GerritError as e:
1982 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001983 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001984 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001985
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001986 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001987 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001988
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001989 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001990 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001991 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001992 data = gerrit_util.GetChangeCommit(
1993 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001994 except gerrit_util.GerritError as e:
1995 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001996 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001997 raise
agable32978d92016-11-01 12:55:02 -07001998 return data
1999
Karen Qian40c19422019-03-13 21:28:29 +00002000 def _IsCqConfigured(self):
2001 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002002 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002003
Olivier Robin75ee7252018-04-13 10:02:56 +02002004 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002005 if git_common.is_dirty_git_tree('land'):
2006 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002007
tandriid60367b2016-06-22 05:25:12 -07002008 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002009 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002010 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002011 'which can test and land changes for you. '
2012 'Are you sure you wish to bypass it?\n',
2013 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002014 differs = True
tandriic4344b52016-08-29 06:04:54 -07002015 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002016 # Note: git diff outputs nothing if there is no diff.
2017 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002018 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002019 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002020 if detail['current_revision'] == last_upload:
2021 differs = False
2022 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002023 print('WARNING: Local branch contents differ from latest uploaded '
2024 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002025 if differs:
2026 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002027 confirm_or_exit(
2028 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2029 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002030 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002031 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002032 upstream = self.GetCommonAncestorWithUpstream()
2033 if self.GetIssue():
2034 description = self.FetchDescription()
2035 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002036 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002037 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002038 committing=True,
2039 may_prompt=not force,
2040 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002041 parallel=parallel,
2042 upstream=upstream,
2043 description=description,
2044 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002045
2046 self.SubmitIssue(wait_for_merge=True)
2047 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002048 links = self._GetChangeCommit().get('web_links', [])
2049 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002050 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002051 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002052 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002053 return 0
2054
Edward Lemurf38bc172019-09-03 21:02:13 +00002055 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002056 assert parsed_issue_arg.valid
2057
Edward Lemur125d60a2019-09-13 18:25:41 +00002058 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002059
2060 if parsed_issue_arg.hostname:
2061 self._gerrit_host = parsed_issue_arg.hostname
2062 self._gerrit_server = 'https://%s' % self._gerrit_host
2063
tandriic2405f52016-10-10 08:13:15 -07002064 try:
2065 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002066 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002067 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002068
2069 if not parsed_issue_arg.patchset:
2070 # Use current revision by default.
2071 revision_info = detail['revisions'][detail['current_revision']]
2072 patchset = int(revision_info['_number'])
2073 else:
2074 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002075 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002076 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2077 break
2078 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002079 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002080 (parsed_issue_arg.patchset, self.GetIssue()))
2081
Edward Lemur125d60a2019-09-13 18:25:41 +00002082 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002083 if remote_url.endswith('.git'):
2084 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002085 remote_url = remote_url.rstrip('/')
2086
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002087 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002088 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002089
2090 if remote_url != fetch_info['url']:
2091 DieWithError('Trying to patch a change from %s but this repo appears '
2092 'to be %s.' % (fetch_info['url'], remote_url))
2093
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002094 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002095
Aaron Gable62619a32017-06-16 08:22:09 -07002096 if force:
2097 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2098 print('Checked out commit for change %i patchset %i locally' %
2099 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002100 elif nocommit:
2101 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2102 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002103 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002104 RunGit(['cherry-pick', 'FETCH_HEAD'])
2105 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002106 (parsed_issue_arg.issue, patchset))
2107 print('Note: this created a local commit which does not have '
2108 'the same hash as the one uploaded for review. This will make '
2109 'uploading changes based on top of this branch difficult.\n'
2110 'If you want to do that, use "git cl patch --force" instead.')
2111
Stefan Zagerd08043c2017-10-12 12:07:02 -07002112 if self.GetBranch():
2113 self.SetIssue(parsed_issue_arg.issue)
2114 self.SetPatchset(patchset)
2115 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2116 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2117 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2118 else:
2119 print('WARNING: You are in detached HEAD state.\n'
2120 'The patch has been applied to your checkout, but you will not be '
2121 'able to upload a new patch set to the gerrit issue.\n'
2122 'Try using the \'-b\' option if you would like to work on a '
2123 'branch and/or upload a new patch set.')
2124
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002125 return 0
2126
tandrii16e0b4e2016-06-07 10:34:28 -07002127 def _GerritCommitMsgHookCheck(self, offer_removal):
2128 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2129 if not os.path.exists(hook):
2130 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002131 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2132 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002133 data = gclient_utils.FileRead(hook)
2134 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2135 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002136 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002137 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002138 'and may interfere with it in subtle ways.\n'
2139 'We recommend you remove the commit-msg hook.')
2140 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002141 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002142 gclient_utils.rm_file_or_tree(hook)
2143 print('Gerrit commit-msg hook removed.')
2144 else:
2145 print('OK, will keep Gerrit commit-msg hook in place.')
2146
Edward Lemur1b52d872019-05-09 21:12:12 +00002147 def _CleanUpOldTraces(self):
2148 """Keep only the last |MAX_TRACES| traces."""
2149 try:
2150 traces = sorted([
2151 os.path.join(TRACES_DIR, f)
2152 for f in os.listdir(TRACES_DIR)
2153 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2154 and not f.startswith('tmp'))
2155 ])
2156 traces_to_delete = traces[:-MAX_TRACES]
2157 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002158 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002159 except OSError:
2160 print('WARNING: Failed to remove old git traces from\n'
2161 ' %s'
2162 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002163
Edward Lemur5737f022019-05-17 01:24:00 +00002164 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002165 """Zip and write the git push traces stored in traces_dir."""
2166 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002167 traces_zip = trace_name + '-traces'
2168 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002169 # Create a temporary dir to store git config and gitcookies in. It will be
2170 # compressed and stored next to the traces.
2171 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002172 git_info_zip = trace_name + '-git-info'
2173
Edward Lemur5737f022019-05-17 01:24:00 +00002174 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002175 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002176 git_push_metadata['now'] = git_push_metadata['now'].decode(
2177 sys.stdin.encoding)
2178
Edward Lemur1b52d872019-05-09 21:12:12 +00002179 git_push_metadata['trace_name'] = trace_name
2180 gclient_utils.FileWrite(
2181 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2182
2183 # Keep only the first 6 characters of the git hashes on the packet
2184 # trace. This greatly decreases size after compression.
2185 packet_traces = os.path.join(traces_dir, 'trace-packet')
2186 if os.path.isfile(packet_traces):
2187 contents = gclient_utils.FileRead(packet_traces)
2188 gclient_utils.FileWrite(
2189 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2190 shutil.make_archive(traces_zip, 'zip', traces_dir)
2191
2192 # Collect and compress the git config and gitcookies.
2193 git_config = RunGit(['config', '-l'])
2194 gclient_utils.FileWrite(
2195 os.path.join(git_info_dir, 'git-config'),
2196 git_config)
2197
2198 cookie_auth = gerrit_util.Authenticator.get()
2199 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2200 gitcookies_path = cookie_auth.get_gitcookies_path()
2201 if os.path.isfile(gitcookies_path):
2202 gitcookies = gclient_utils.FileRead(gitcookies_path)
2203 gclient_utils.FileWrite(
2204 os.path.join(git_info_dir, 'gitcookies'),
2205 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2206 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2207
Edward Lemur1b52d872019-05-09 21:12:12 +00002208 gclient_utils.rmtree(git_info_dir)
2209
2210 def _RunGitPushWithTraces(
2211 self, change_desc, refspec, refspec_opts, git_push_metadata):
2212 """Run git push and collect the traces resulting from the execution."""
2213 # Create a temporary directory to store traces in. Traces will be compressed
2214 # and stored in a 'traces' dir inside depot_tools.
2215 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002216 trace_name = os.path.join(
2217 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002218
2219 env = os.environ.copy()
2220 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2221 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002222 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002223 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2224 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2225 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2226
2227 try:
2228 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002229 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002230 before_push = time_time()
2231 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002232 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002233 env=env,
2234 print_stdout=True,
2235 # Flush after every line: useful for seeing progress when running as
2236 # recipe.
2237 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002238 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002239 except subprocess2.CalledProcessError as e:
2240 push_returncode = e.returncode
2241 DieWithError('Failed to create a change. Please examine output above '
2242 'for the reason of the failure.\n'
2243 'Hint: run command below to diagnose common Git/Gerrit '
2244 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002245 ' git cl creds-check\n'
2246 '\n'
2247 'If git-cl is not working correctly, file a bug under the '
2248 'Infra>SDK component including the files below.\n'
2249 'Review the files before upload, since they might contain '
2250 'sensitive information.\n'
2251 'Set the Restrict-View-Google label so that they are not '
2252 'publicly accessible.\n'
2253 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002254 change_desc)
2255 finally:
2256 execution_time = time_time() - before_push
2257 metrics.collector.add_repeated('sub_commands', {
2258 'command': 'git push',
2259 'execution_time': execution_time,
2260 'exit_code': push_returncode,
2261 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2262 })
2263
Edward Lemur1b52d872019-05-09 21:12:12 +00002264 git_push_metadata['execution_time'] = execution_time
2265 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002266 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002267
Edward Lemur1b52d872019-05-09 21:12:12 +00002268 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002269 gclient_utils.rmtree(traces_dir)
2270
2271 return push_stdout
2272
Edward Lemura12175c2020-03-09 16:58:26 +00002273 def CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002274 self, options, git_diff_args, custom_cl_base, change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002275 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002276 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002277 # Load default for user, repo, squash=true, in this order.
2278 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002279
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002280 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002281 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002282
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002283 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002284 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002286 # User requested to change description
2287 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002288 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002289 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002290 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002291 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002292 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002293 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002294 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002295 if len(change_ids) == 1:
2296 change_id = change_ids[0]
2297 else:
2298 change_id = GenerateGerritChangeId(change_desc.description)
2299 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002300
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002301 if options.preserve_tryjobs:
2302 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002303
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002304 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002305 parent = self._ComputeParent(
2306 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002307 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002308 with gclient_utils.temporary_file() as desc_tempfile:
2309 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2310 ref_to_push = RunGit(
2311 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002312 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002313 if not git_footers.get_footer_change_id(change_desc.description):
2314 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002315 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002316 self._AddChangeIdToCommitMessage(
2317 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002318 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002319 # For no-squash mode, we assume the remote called "origin" is the one we
2320 # want. It is not worthwhile to support different workflows for
2321 # no-squash mode.
2322 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002323 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2324
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002325 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002326 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2327 ref_to_push)]).splitlines()
2328 if len(commits) > 1:
2329 print('WARNING: This will upload %d commits. Run the following command '
2330 'to see which commits will be uploaded: ' % len(commits))
2331 print('git log %s..%s' % (parent, ref_to_push))
2332 print('You can also use `git squash-branch` to squash these into a '
2333 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002334 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002335
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002336 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002337 cc = []
2338 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2339 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2340 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002341 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002342 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002343 if options.cc:
2344 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002345 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002346 if change_desc.get_cced():
2347 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002348 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2349 valid_accounts = set(reviewers + cc)
2350 # TODO(crbug/877717): relax this for all hosts.
2351 else:
2352 valid_accounts = gerrit_util.ValidAccounts(
2353 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002354 logging.info('accounts %s are recognized, %s invalid',
2355 sorted(valid_accounts),
2356 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002357
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002358 # Extra options that can be specified at push time. Doc:
2359 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002360 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002361
Aaron Gable844cf292017-06-28 11:32:59 -07002362 # By default, new changes are started in WIP mode, and subsequent patchsets
2363 # don't send email. At any time, passing --send-mail will mark the change
2364 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002365 if options.send_mail:
2366 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002367 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002368 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002369 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002370 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002371 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002372
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002373 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002374 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002375
Edward Lemur5a644f82020-03-18 16:44:57 +00002376 title = self._GetTitleForUpload(options)
Aaron Gable9b713dd2016-12-14 16:04:21 -08002377 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002378 # Punctuation and whitespace in |title| must be percent-encoded.
2379 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002380
agablec6787972016-09-09 16:13:34 -07002381 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002382 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002383
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002384 for r in sorted(reviewers):
2385 if r in valid_accounts:
2386 refspec_opts.append('r=%s' % r)
2387 reviewers.remove(r)
2388 else:
2389 # TODO(tandrii): this should probably be a hard failure.
2390 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2391 % r)
2392 for c in sorted(cc):
2393 # refspec option will be rejected if cc doesn't correspond to an
2394 # account, even though REST call to add such arbitrary cc may succeed.
2395 if c in valid_accounts:
2396 refspec_opts.append('cc=%s' % c)
2397 cc.remove(c)
2398
rmistry9eadede2016-09-19 11:22:43 -07002399 if options.topic:
2400 # Documentation on Gerrit topics is here:
2401 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002402 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002403
Edward Lemur687ca902018-12-05 02:30:30 +00002404 if options.enable_auto_submit:
2405 refspec_opts.append('l=Auto-Submit+1')
2406 if options.use_commit_queue:
2407 refspec_opts.append('l=Commit-Queue+2')
2408 elif options.cq_dry_run:
2409 refspec_opts.append('l=Commit-Queue+1')
2410
2411 if change_desc.get_reviewers(tbr_only=True):
2412 score = gerrit_util.GetCodeReviewTbrScore(
2413 self._GetGerritHost(),
2414 self._GetGerritProject())
2415 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002416
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002417 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002418 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002419 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002420 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002421 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2422
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002423 refspec_suffix = ''
2424 if refspec_opts:
2425 refspec_suffix = '%' + ','.join(refspec_opts)
2426 assert ' ' not in refspec_suffix, (
2427 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2428 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2429
Edward Lemur1b52d872019-05-09 21:12:12 +00002430 git_push_metadata = {
2431 'gerrit_host': self._GetGerritHost(),
2432 'title': title or '<untitled>',
2433 'change_id': change_id,
2434 'description': change_desc.description,
2435 }
2436 push_stdout = self._RunGitPushWithTraces(
2437 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002438
2439 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002440 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002441 change_numbers = [m.group(1)
2442 for m in map(regex.match, push_stdout.splitlines())
2443 if m]
2444 if len(change_numbers) != 1:
2445 DieWithError(
2446 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002447 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002448 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002449 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002450
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002451 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002452 # GetIssue() is not set in case of non-squash uploads according to tests.
2453 # TODO(agable): non-squash uploads in git cl should be removed.
2454 gerrit_util.AddReviewers(
2455 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002456 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002457 reviewers, cc,
2458 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002459
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002460 return 0
2461
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002462 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2463 change_desc):
2464 """Computes parent of the generated commit to be uploaded to Gerrit.
2465
2466 Returns revision or a ref name.
2467 """
2468 if custom_cl_base:
2469 # Try to avoid creating additional unintended CLs when uploading, unless
2470 # user wants to take this risk.
2471 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2472 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2473 local_ref_of_target_remote])
2474 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002475 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002476 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2477 'If you proceed with upload, more than 1 CL may be created by '
2478 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2479 'If you are certain that specified base `%s` has already been '
2480 'uploaded to Gerrit as another CL, you may proceed.\n' %
2481 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2482 if not force:
2483 confirm_or_exit(
2484 'Do you take responsibility for cleaning up potential mess '
2485 'resulting from proceeding with upload?',
2486 action='upload')
2487 return custom_cl_base
2488
Aaron Gablef97e33d2017-03-30 15:44:27 -07002489 if remote != '.':
2490 return self.GetCommonAncestorWithUpstream()
2491
2492 # If our upstream branch is local, we base our squashed commit on its
2493 # squashed version.
2494 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2495
Aaron Gablef97e33d2017-03-30 15:44:27 -07002496 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002497 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002498
2499 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002500 # TODO(tandrii): consider checking parent change in Gerrit and using its
2501 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2502 # the tree hash of the parent branch. The upside is less likely bogus
2503 # requests to reupload parent change just because it's uploadhash is
2504 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002505 parent = RunGit(['config',
2506 'branch.%s.gerritsquashhash' % upstream_branch_name],
2507 error_ok=True).strip()
2508 # Verify that the upstream branch has been uploaded too, otherwise
2509 # Gerrit will create additional CLs when uploading.
2510 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2511 RunGitSilent(['rev-parse', parent + ':'])):
2512 DieWithError(
2513 '\nUpload upstream branch %s first.\n'
2514 'It is likely that this branch has been rebased since its last '
2515 'upload, so you just need to upload it again.\n'
2516 '(If you uploaded it with --no-squash, then branch dependencies '
2517 'are not supported, and you should reupload with --squash.)'
2518 % upstream_branch_name,
2519 change_desc)
2520 return parent
2521
Edward Lemura12175c2020-03-09 16:58:26 +00002522 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002523 """Re-commits using the current message, assumes the commit hook is in
2524 place.
2525 """
Edward Lemura12175c2020-03-09 16:58:26 +00002526 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002527 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002528 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002529 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002530 return new_log_desc
2531 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002532 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002533
tandriie113dfd2016-10-11 10:20:12 -07002534 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002535 try:
2536 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002537 except GerritChangeNotExists:
2538 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002539
2540 if data['status'] in ('ABANDONED', 'MERGED'):
2541 return 'CL %s is closed' % self.GetIssue()
2542
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002543 def GetGerritChange(self, patchset=None):
2544 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002545 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002546 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002547 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002548 data = self._GetChangeDetail(['ALL_REVISIONS'])
2549
2550 assert host and issue and patchset, 'CL must be uploaded first'
2551
2552 has_patchset = any(
2553 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002554 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002555 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002556 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002557 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002558
tandrii8c5a3532016-11-04 07:52:02 -07002559 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002560 'host': host,
2561 'change': issue,
2562 'project': data['project'],
2563 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002564 }
tandriie113dfd2016-10-11 10:20:12 -07002565
tandriide281ae2016-10-12 06:02:30 -07002566 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002567 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002568
Edward Lemur707d70b2018-02-07 00:50:14 +01002569 def GetReviewers(self):
2570 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002571 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002572
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002573
tandriif9aefb72016-07-01 09:06:51 -07002574def _get_bug_line_values(default_project, bugs):
2575 """Given default_project and comma separated list of bugs, yields bug line
2576 values.
2577
2578 Each bug can be either:
2579 * a number, which is combined with default_project
2580 * string, which is left as is.
2581
2582 This function may produce more than one line, because bugdroid expects one
2583 project per line.
2584
2585 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2586 ['v8:123', 'chromium:789']
2587 """
2588 default_bugs = []
2589 others = []
2590 for bug in bugs.split(','):
2591 bug = bug.strip()
2592 if bug:
2593 try:
2594 default_bugs.append(int(bug))
2595 except ValueError:
2596 others.append(bug)
2597
2598 if default_bugs:
2599 default_bugs = ','.join(map(str, default_bugs))
2600 if default_project:
2601 yield '%s:%s' % (default_project, default_bugs)
2602 else:
2603 yield default_bugs
2604 for other in sorted(others):
2605 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2606 yield other
2607
2608
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002609class ChangeDescription(object):
2610 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002611 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002612 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002613 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002614 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002615 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002616 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2617 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002618 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002619 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002620
Dan Beamd8b04ca2019-10-10 21:23:26 +00002621 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002622 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002623 if bug:
2624 regexp = re.compile(self.BUG_LINE)
2625 prefix = settings.GetBugPrefix()
2626 if not any((regexp.match(line) for line in self._description_lines)):
2627 values = list(_get_bug_line_values(prefix, bug))
2628 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002629 if fixed:
2630 regexp = re.compile(self.FIXED_LINE)
2631 prefix = settings.GetBugPrefix()
2632 if not any((regexp.match(line) for line in self._description_lines)):
2633 values = list(_get_bug_line_values(prefix, fixed))
2634 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002635
agable@chromium.org42c20792013-09-12 17:34:49 +00002636 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002637 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002638 return '\n'.join(self._description_lines)
2639
2640 def set_description(self, desc):
2641 if isinstance(desc, basestring):
2642 lines = desc.splitlines()
2643 else:
2644 lines = [line.rstrip() for line in desc]
2645 while lines and not lines[0]:
2646 lines.pop(0)
2647 while lines and not lines[-1]:
2648 lines.pop(-1)
2649 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002650
Edward Lemur5a644f82020-03-18 16:44:57 +00002651 def ensure_change_id(self, change_id):
2652 description = self.description
2653 footer_change_ids = git_footers.get_footer_change_id(description)
2654 # Make sure that the Change-Id in the description matches the given one.
2655 if footer_change_ids != [change_id]:
2656 if footer_change_ids:
2657 # Remove any existing Change-Id footers since they don't match the
2658 # expected change_id footer.
2659 description = git_footers.remove_footer(description, 'Change-Id')
2660 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2661 'if you want to set a new one.')
2662 # Add the expected Change-Id footer.
2663 description = git_footers.add_footer_change_id(description, change_id)
2664 self.set_description(description)
2665
Edward Lemur2c62b332020-03-12 22:12:33 +00002666 def update_reviewers(
2667 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002668 """Rewrites the R=/TBR= line(s) as a single line each.
2669
2670 Args:
2671 reviewers (list(str)) - list of additional emails to use for reviewers.
2672 tbrs (list(str)) - list of additional emails to use for TBRs.
2673 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2674 the change that are missing OWNER coverage. If this is not None, you
2675 must also pass a value for `change`.
2676 change (Change) - The Change that should be used for OWNERS lookups.
2677 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002678 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002679 assert isinstance(tbrs, list), tbrs
2680
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002681 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002682 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002683
2684 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002685 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002686
2687 reviewers = set(reviewers)
2688 tbrs = set(tbrs)
2689 LOOKUP = {
2690 'TBR': tbrs,
2691 'R': reviewers,
2692 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002693
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002694 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002695 regexp = re.compile(self.R_LINE)
2696 matches = [regexp.match(line) for line in self._description_lines]
2697 new_desc = [l for i, l in enumerate(self._description_lines)
2698 if not matches[i]]
2699 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002700
agable@chromium.org42c20792013-09-12 17:34:49 +00002701 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002702
2703 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002704 for match in matches:
2705 if not match:
2706 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002707 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2708
2709 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002710 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002711 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002712 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002713 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002714 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002715 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002716 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002717
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002718 # If any folks ended up in both groups, remove them from tbrs.
2719 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002720
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002721 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2722 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002723
2724 # Put the new lines in the description where the old first R= line was.
2725 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2726 if 0 <= line_loc < len(self._description_lines):
2727 if new_tbr_line:
2728 self._description_lines.insert(line_loc, new_tbr_line)
2729 if new_r_line:
2730 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002731 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002732 if new_r_line:
2733 self.append_footer(new_r_line)
2734 if new_tbr_line:
2735 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002736
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002737 def set_preserve_tryjobs(self):
2738 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2739 footers = git_footers.parse_footers(self.description)
2740 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2741 if v.lower() == 'true':
2742 return
2743 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2744
Anthony Polito8b955342019-09-24 19:01:36 +00002745 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002746 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002747 self.set_description([
2748 '# Enter a description of the change.',
2749 '# This will be displayed on the codereview site.',
2750 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002751 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002752 '--------------------',
2753 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002754 bug_regexp = re.compile(self.BUG_LINE)
2755 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002756 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002757 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2758 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002759 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002760
agable@chromium.org42c20792013-09-12 17:34:49 +00002761 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002762 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002763 if not content:
2764 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002765 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002766
Bruce Dawson2377b012018-01-11 16:46:49 -08002767 # Strip off comments and default inserted "Bug:" line.
2768 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002769 (line.startswith('#') or
2770 line.rstrip() == "Bug:" or
2771 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002772 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002773 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002774 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002775
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002776 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002777 """Adds a footer line to the description.
2778
2779 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2780 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2781 that Gerrit footers are always at the end.
2782 """
2783 parsed_footer_line = git_footers.parse_footer(line)
2784 if parsed_footer_line:
2785 # Line is a gerrit footer in the form: Footer-Key: any value.
2786 # Thus, must be appended observing Gerrit footer rules.
2787 self.set_description(
2788 git_footers.add_footer(self.description,
2789 key=parsed_footer_line[0],
2790 value=parsed_footer_line[1]))
2791 return
2792
2793 if not self._description_lines:
2794 self._description_lines.append(line)
2795 return
2796
2797 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2798 if gerrit_footers:
2799 # git_footers.split_footers ensures that there is an empty line before
2800 # actual (gerrit) footers, if any. We have to keep it that way.
2801 assert top_lines and top_lines[-1] == ''
2802 top_lines, separator = top_lines[:-1], top_lines[-1:]
2803 else:
2804 separator = [] # No need for separator if there are no gerrit_footers.
2805
2806 prev_line = top_lines[-1] if top_lines else ''
2807 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2808 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2809 top_lines.append('')
2810 top_lines.append(line)
2811 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002812
tandrii99a72f22016-08-17 14:33:24 -07002813 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002814 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002815 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002816 reviewers = [match.group(2).strip()
2817 for match in matches
2818 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002819 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002820
bradnelsond975b302016-10-23 12:20:23 -07002821 def get_cced(self):
2822 """Retrieves the list of reviewers."""
2823 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2824 cced = [match.group(2).strip() for match in matches if match]
2825 return cleanup_list(cced)
2826
Nodir Turakulov23b82142017-11-16 11:04:25 -08002827 def get_hash_tags(self):
2828 """Extracts and sanitizes a list of Gerrit hashtags."""
2829 subject = (self._description_lines or ('',))[0]
2830 subject = re.sub(
2831 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2832
2833 tags = []
2834 start = 0
2835 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2836 while True:
2837 m = bracket_exp.match(subject, start)
2838 if not m:
2839 break
2840 tags.append(self.sanitize_hash_tag(m.group(1)))
2841 start = m.end()
2842
2843 if not tags:
2844 # Try "Tag: " prefix.
2845 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2846 if m:
2847 tags.append(self.sanitize_hash_tag(m.group(1)))
2848 return tags
2849
2850 @classmethod
2851 def sanitize_hash_tag(cls, tag):
2852 """Returns a sanitized Gerrit hash tag.
2853
2854 A sanitized hashtag can be used as a git push refspec parameter value.
2855 """
2856 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2857
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002858 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2859 """Updates this commit description given the parent.
2860
2861 This is essentially what Gnumbd used to do.
2862 Consult https://goo.gl/WMmpDe for more details.
2863 """
2864 assert parent_msg # No, orphan branch creation isn't supported.
2865 assert parent_hash
2866 assert dest_ref
2867 parent_footer_map = git_footers.parse_footers(parent_msg)
2868 # This will also happily parse svn-position, which GnumbD is no longer
2869 # supporting. While we'd generate correct footers, the verifier plugin
2870 # installed in Gerrit will block such commit (ie git push below will fail).
2871 parent_position = git_footers.get_position(parent_footer_map)
2872
2873 # Cherry-picks may have last line obscuring their prior footers,
2874 # from git_footers perspective. This is also what Gnumbd did.
2875 cp_line = None
2876 if (self._description_lines and
2877 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2878 cp_line = self._description_lines.pop()
2879
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002880 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002881
2882 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2883 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002884 for i, line in enumerate(footer_lines):
2885 k, v = git_footers.parse_footer(line) or (None, None)
2886 if k and k.startswith('Cr-'):
2887 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002888
2889 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002890 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002891 if parent_position[0] == dest_ref:
2892 # Same branch as parent.
2893 number = int(parent_position[1]) + 1
2894 else:
2895 number = 1 # New branch, and extra lineage.
2896 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2897 int(parent_position[1])))
2898
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002899 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2900 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002901
2902 self._description_lines = top_lines
2903 if cp_line:
2904 self._description_lines.append(cp_line)
2905 if self._description_lines[-1] != '':
2906 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002907 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002908
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002909
Aaron Gablea1bab272017-04-11 16:38:18 -07002910def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002911 """Retrieves the reviewers that approved a CL from the issue properties with
2912 messages.
2913
2914 Note that the list may contain reviewers that are not committer, thus are not
2915 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002916
2917 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002918 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002919 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002920 return sorted(
2921 set(
2922 message['sender']
2923 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07002924 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002925 )
2926 )
2927
2928
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002929def FindCodereviewSettingsFile(filename='codereview.settings'):
2930 """Finds the given file starting in the cwd and going up.
2931
2932 Only looks up to the top of the repository unless an
2933 'inherit-review-settings-ok' file exists in the root of the repository.
2934 """
2935 inherit_ok_file = 'inherit-review-settings-ok'
2936 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002937 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002938 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2939 root = '/'
2940 while True:
2941 if filename in os.listdir(cwd):
2942 if os.path.isfile(os.path.join(cwd, filename)):
2943 return open(os.path.join(cwd, filename))
2944 if cwd == root:
2945 break
2946 cwd = os.path.dirname(cwd)
2947
2948
2949def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002950 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002951 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002952
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002953 def SetProperty(name, setting, unset_error_ok=False):
2954 fullname = 'rietveld.' + name
2955 if setting in keyvals:
2956 RunGit(['config', fullname, keyvals[setting]])
2957 else:
2958 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2959
tandrii48df5812016-10-17 03:55:37 -07002960 if not keyvals.get('GERRIT_HOST', False):
2961 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002962 # Only server setting is required. Other settings can be absent.
2963 # In that case, we ignore errors raised during option deletion attempt.
2964 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2965 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2966 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002967 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002968 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2969 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002970 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2971 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002972 SetProperty(
2973 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002974
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002975 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002976 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002977
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002978 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07002979 RunGit(['config', 'gerrit.squash-uploads',
2980 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002981
tandrii@chromium.org28253532016-04-14 13:46:56 +00002982 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002983 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002984 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2985
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002986 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002987 # should be of the form
2988 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2989 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002990 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2991 keyvals['ORIGIN_URL_CONFIG']])
2992
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002993
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002994def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002995 """Downloads a network object to a local file, like urllib.urlretrieve.
2996
2997 This is necessary because urllib is broken for SSL connections via a proxy.
2998 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002999 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003000 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003001
3002
ukai@chromium.org712d6102013-11-27 00:52:58 +00003003def hasSheBang(fname):
3004 """Checks fname is a #! script."""
3005 with open(fname) as f:
3006 return f.read(2).startswith('#!')
3007
3008
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003009# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3010def DownloadHooks(*args, **kwargs):
3011 pass
3012
3013
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003014def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003015 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003016
3017 Args:
3018 force: True to update hooks. False to install hooks if not present.
3019 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003020 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003021 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3022 if not os.access(dst, os.X_OK):
3023 if os.path.exists(dst):
3024 if not force:
3025 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003026 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003027 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003028 if not hasSheBang(dst):
3029 DieWithError('Not a script: %s\n'
3030 'You need to download from\n%s\n'
3031 'into .git/hooks/commit-msg and '
3032 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003033 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3034 except Exception:
3035 if os.path.exists(dst):
3036 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003037 DieWithError('\nFailed to download hooks.\n'
3038 'You need to download from\n%s\n'
3039 'into .git/hooks/commit-msg and '
3040 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003041
3042
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003043class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003044 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003045
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003046 _GOOGLESOURCE = 'googlesource.com'
3047
3048 def __init__(self):
3049 # Cached list of [host, identity, source], where source is either
3050 # .gitcookies or .netrc.
3051 self._all_hosts = None
3052
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003053 def ensure_configured_gitcookies(self):
3054 """Runs checks and suggests fixes to make git use .gitcookies from default
3055 path."""
3056 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3057 configured_path = RunGitSilent(
3058 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003059 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003060 if configured_path:
3061 self._ensure_default_gitcookies_path(configured_path, default)
3062 else:
3063 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003064
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003065 @staticmethod
3066 def _ensure_default_gitcookies_path(configured_path, default_path):
3067 assert configured_path
3068 if configured_path == default_path:
3069 print('git is already configured to use your .gitcookies from %s' %
3070 configured_path)
3071 return
3072
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003073 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003074 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3075 (configured_path, default_path))
3076
3077 if not os.path.exists(configured_path):
3078 print('However, your configured .gitcookies file is missing.')
3079 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3080 action='reconfigure')
3081 RunGit(['config', '--global', 'http.cookiefile', default_path])
3082 return
3083
3084 if os.path.exists(default_path):
3085 print('WARNING: default .gitcookies file already exists %s' %
3086 default_path)
3087 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3088 default_path)
3089
3090 confirm_or_exit('Move existing .gitcookies to default location?',
3091 action='move')
3092 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003093 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003094 print('Moved and reconfigured git to use .gitcookies from %s' %
3095 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003096
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003097 @staticmethod
3098 def _configure_gitcookies_path(default_path):
3099 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3100 if os.path.exists(netrc_path):
3101 print('You seem to be using outdated .netrc for git credentials: %s' %
3102 netrc_path)
3103 print('This tool will guide you through setting up recommended '
3104 '.gitcookies store for git credentials.\n'
3105 '\n'
3106 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3107 ' git config --global --unset http.cookiefile\n'
3108 ' mv %s %s.backup\n\n' % (default_path, default_path))
3109 confirm_or_exit(action='setup .gitcookies')
3110 RunGit(['config', '--global', 'http.cookiefile', default_path])
3111 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003112
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003113 def get_hosts_with_creds(self, include_netrc=False):
3114 if self._all_hosts is None:
3115 a = gerrit_util.CookiesAuthenticator()
3116 self._all_hosts = [
3117 (h, u, s)
3118 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003119 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3120 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003121 )
3122 if h.endswith(self._GOOGLESOURCE)
3123 ]
3124
3125 if include_netrc:
3126 return self._all_hosts
3127 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3128
3129 def print_current_creds(self, include_netrc=False):
3130 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3131 if not hosts:
3132 print('No Git/Gerrit credentials found')
3133 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003134 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003135 header = [('Host', 'User', 'Which file'),
3136 ['=' * l for l in lengths]]
3137 for row in (header + hosts):
3138 print('\t'.join((('%%+%ds' % l) % s)
3139 for l, s in zip(lengths, row)))
3140
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003141 @staticmethod
3142 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003143 """Parses identity "git-<username>.domain" into <username> and domain."""
3144 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003145 # distinguishable from sub-domains. But we do know typical domains:
3146 if identity.endswith('.chromium.org'):
3147 domain = 'chromium.org'
3148 username = identity[:-len('.chromium.org')]
3149 else:
3150 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003151 if username.startswith('git-'):
3152 username = username[len('git-'):]
3153 return username, domain
3154
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003155 def _canonical_git_googlesource_host(self, host):
3156 """Normalizes Gerrit hosts (with '-review') to Git host."""
3157 assert host.endswith(self._GOOGLESOURCE)
3158 # Prefix doesn't include '.' at the end.
3159 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3160 if prefix.endswith('-review'):
3161 prefix = prefix[:-len('-review')]
3162 return prefix + '.' + self._GOOGLESOURCE
3163
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003164 def _canonical_gerrit_googlesource_host(self, host):
3165 git_host = self._canonical_git_googlesource_host(host)
3166 prefix = git_host.split('.', 1)[0]
3167 return prefix + '-review.' + self._GOOGLESOURCE
3168
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003169 def _get_counterpart_host(self, host):
3170 assert host.endswith(self._GOOGLESOURCE)
3171 git = self._canonical_git_googlesource_host(host)
3172 gerrit = self._canonical_gerrit_googlesource_host(git)
3173 return git if gerrit == host else gerrit
3174
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003175 def has_generic_host(self):
3176 """Returns whether generic .googlesource.com has been configured.
3177
3178 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3179 """
3180 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3181 if host == '.' + self._GOOGLESOURCE:
3182 return True
3183 return False
3184
3185 def _get_git_gerrit_identity_pairs(self):
3186 """Returns map from canonic host to pair of identities (Git, Gerrit).
3187
3188 One of identities might be None, meaning not configured.
3189 """
3190 host_to_identity_pairs = {}
3191 for host, identity, _ in self.get_hosts_with_creds():
3192 canonical = self._canonical_git_googlesource_host(host)
3193 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3194 idx = 0 if canonical == host else 1
3195 pair[idx] = identity
3196 return host_to_identity_pairs
3197
3198 def get_partially_configured_hosts(self):
3199 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003200 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003201 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003202 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003203
3204 def get_conflicting_hosts(self):
3205 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003206 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003207 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003208 if None not in (i1, i2) and i1 != i2)
3209
3210 def get_duplicated_hosts(self):
3211 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003212 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003213
3214 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3215 'chromium.googlesource.com': 'chromium.org',
3216 'chrome-internal.googlesource.com': 'google.com',
3217 }
3218
3219 def get_hosts_with_wrong_identities(self):
3220 """Finds hosts which **likely** reference wrong identities.
3221
3222 Note: skips hosts which have conflicting identities for Git and Gerrit.
3223 """
3224 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003225 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003226 pair = self._get_git_gerrit_identity_pairs().get(host)
3227 if pair and pair[0] == pair[1]:
3228 _, domain = self._parse_identity(pair[0])
3229 if domain != expected:
3230 hosts.add(host)
3231 return hosts
3232
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003233 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003234 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003235 hosts = sorted(hosts)
3236 assert hosts
3237 if extra_column_func is None:
3238 extras = [''] * len(hosts)
3239 else:
3240 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003241 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3242 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003243 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003244 lines.append(tmpl % he)
3245 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003246
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003247 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003248 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003249 yield ('.googlesource.com wildcard record detected',
3250 ['Chrome Infrastructure team recommends to list full host names '
3251 'explicitly.'],
3252 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003253
3254 dups = self.get_duplicated_hosts()
3255 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003256 yield ('The following hosts were defined twice',
3257 self._format_hosts(dups),
3258 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003259
3260 partial = self.get_partially_configured_hosts()
3261 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003262 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3263 'These hosts are missing',
3264 self._format_hosts(partial, lambda host: 'but %s defined' %
3265 self._get_counterpart_host(host)),
3266 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003267
3268 conflicting = self.get_conflicting_hosts()
3269 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003270 yield ('The following Git hosts have differing credentials from their '
3271 'Gerrit counterparts',
3272 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3273 tuple(self._get_git_gerrit_identity_pairs()[host])),
3274 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003275
3276 wrong = self.get_hosts_with_wrong_identities()
3277 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003278 yield ('These hosts likely use wrong identity',
3279 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3280 (self._get_git_gerrit_identity_pairs()[host][0],
3281 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3282 wrong)
3283
3284 def find_and_report_problems(self):
3285 """Returns True if there was at least one problem, else False."""
3286 found = False
3287 bad_hosts = set()
3288 for title, sublines, hosts in self._find_problems():
3289 if not found:
3290 found = True
3291 print('\n\n.gitcookies problem report:\n')
3292 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003293 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003294 if sublines:
3295 print()
3296 print(' %s' % '\n '.join(sublines))
3297 print()
3298
3299 if bad_hosts:
3300 assert found
3301 print(' You can manually remove corresponding lines in your %s file and '
3302 'visit the following URLs with correct account to generate '
3303 'correct credential lines:\n' %
3304 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3305 print(' %s' % '\n '.join(sorted(set(
3306 gerrit_util.CookiesAuthenticator().get_new_password_url(
3307 self._canonical_git_googlesource_host(host))
3308 for host in bad_hosts
3309 ))))
3310 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003311
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003312
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003313@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003314def CMDcreds_check(parser, args):
3315 """Checks credentials and suggests changes."""
3316 _, _ = parser.parse_args(args)
3317
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003318 # Code below checks .gitcookies. Abort if using something else.
3319 authn = gerrit_util.Authenticator.get()
3320 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003321 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003322 'This command is not designed for bot environment. It checks '
3323 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003324 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3325 if isinstance(authn, gerrit_util.GceAuthenticator):
3326 message += (
3327 '\n'
3328 'If you need to run this on GCE or a cloudtop instance, '
3329 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3330 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003331
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003332 checker = _GitCookiesChecker()
3333 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003334
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003335 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003336 checker.print_current_creds(include_netrc=True)
3337
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003338 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003339 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003340 return 0
3341 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003342
3343
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003344@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003345def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003346 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003347 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003348 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003349 _, args = parser.parse_args(args)
3350 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003351 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003352 return RunGit(['config', 'branch.%s.base-url' % branch],
3353 error_ok=False).strip()
3354 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003355 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003356 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3357 error_ok=False).strip()
3358
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003359
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003360def color_for_status(status):
3361 """Maps a Changelist status to color, for CMDstatus and other tools."""
3362 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003363 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003364 'waiting': Fore.BLUE,
3365 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003366 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003367 'lgtm': Fore.GREEN,
3368 'commit': Fore.MAGENTA,
3369 'closed': Fore.CYAN,
3370 'error': Fore.WHITE,
3371 }.get(status, Fore.WHITE)
3372
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003373
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003374def get_cl_statuses(changes, fine_grained, max_processes=None):
3375 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003376
3377 If fine_grained is true, this will fetch CL statuses from the server.
3378 Otherwise, simply indicate if there's a matching url for the given branches.
3379
3380 If max_processes is specified, it is used as the maximum number of processes
3381 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3382 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003383
3384 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003385 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003386 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003387 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003388
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003389 if not fine_grained:
3390 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003391 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003392 for cl in changes:
3393 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003394 return
3395
3396 # First, sort out authentication issues.
3397 logging.debug('ensuring credentials exist')
3398 for cl in changes:
3399 cl.EnsureAuthenticated(force=False, refresh=True)
3400
3401 def fetch(cl):
3402 try:
3403 return (cl, cl.GetStatus())
3404 except:
3405 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003406 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003407 raise
3408
3409 threads_count = len(changes)
3410 if max_processes:
3411 threads_count = max(1, min(threads_count, max_processes))
3412 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3413
Edward Lemur61bf4172020-02-24 23:22:37 +00003414 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003415 fetched_cls = set()
3416 try:
3417 it = pool.imap_unordered(fetch, changes).__iter__()
3418 while True:
3419 try:
3420 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003421 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003422 break
3423 fetched_cls.add(cl)
3424 yield cl, status
3425 finally:
3426 pool.close()
3427
3428 # Add any branches that failed to fetch.
3429 for cl in set(changes) - fetched_cls:
3430 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003431
rmistry@google.com2dd99862015-06-22 12:22:18 +00003432
3433def upload_branch_deps(cl, args):
3434 """Uploads CLs of local branches that are dependents of the current branch.
3435
3436 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003437
3438 test1 -> test2.1 -> test3.1
3439 -> test3.2
3440 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003441
3442 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3443 run on the dependent branches in this order:
3444 test2.1, test3.1, test3.2, test2.2, test3.3
3445
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003446 Note: This function does not rebase your local dependent branches. Use it
3447 when you make a change to the parent branch that will not conflict
3448 with its dependent branches, and you would like their dependencies
3449 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003450 """
3451 if git_common.is_dirty_git_tree('upload-branch-deps'):
3452 return 1
3453
3454 root_branch = cl.GetBranch()
3455 if root_branch is None:
3456 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3457 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003458 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003459 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3460 'patchset dependencies without an uploaded CL.')
3461
3462 branches = RunGit(['for-each-ref',
3463 '--format=%(refname:short) %(upstream:short)',
3464 'refs/heads'])
3465 if not branches:
3466 print('No local branches found.')
3467 return 0
3468
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003469 # Create a dictionary of all local branches to the branches that are
3470 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003471 tracked_to_dependents = collections.defaultdict(list)
3472 for b in branches.splitlines():
3473 tokens = b.split()
3474 if len(tokens) == 2:
3475 branch_name, tracked = tokens
3476 tracked_to_dependents[tracked].append(branch_name)
3477
vapiera7fbd5a2016-06-16 09:17:49 -07003478 print()
3479 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003480 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003481
rmistry@google.com2dd99862015-06-22 12:22:18 +00003482 def traverse_dependents_preorder(branch, padding=''):
3483 dependents_to_process = tracked_to_dependents.get(branch, [])
3484 padding += ' '
3485 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003486 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003487 dependents.append(dependent)
3488 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003489
rmistry@google.com2dd99862015-06-22 12:22:18 +00003490 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003491 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003492
3493 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003494 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003495 return 0
3496
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003497 confirm_or_exit('This command will checkout all dependent branches and run '
3498 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003499
rmistry@google.com2dd99862015-06-22 12:22:18 +00003500 # Record all dependents that failed to upload.
3501 failures = {}
3502 # Go through all dependents, checkout the branch and upload.
3503 try:
3504 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003505 print()
3506 print('--------------------------------------')
3507 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003508 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003509 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003510 try:
3511 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003512 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003513 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003514 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003515 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003516 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003517 finally:
3518 # Swap back to the original root branch.
3519 RunGit(['checkout', '-q', root_branch])
3520
vapiera7fbd5a2016-06-16 09:17:49 -07003521 print()
3522 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003523 for dependent_branch in dependents:
3524 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003525 print(' %s : %s' % (dependent_branch, upload_status))
3526 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003527
3528 return 0
3529
3530
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003531def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3532 """Given a proposed tag name, returns a tag name that is guaranteed to be
3533 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3534 or 'foo-3', and so on."""
3535
3536 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3537 for suffix_num in itertools.count(1):
3538 if suffix_num == 1:
3539 to_check = proposed_tag
3540 else:
3541 to_check = '%s-%d' % (proposed_tag, suffix_num)
3542
3543 if to_check not in existing_tags:
3544 return to_check
3545
3546
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003547@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003548def CMDarchive(parser, args):
3549 """Archives and deletes branches associated with closed changelists."""
3550 parser.add_option(
3551 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003552 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003553 parser.add_option(
3554 '-f', '--force', action='store_true',
3555 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003556 parser.add_option(
3557 '-d', '--dry-run', action='store_true',
3558 help='Skip the branch tagging and removal steps.')
3559 parser.add_option(
3560 '-t', '--notags', action='store_true',
3561 help='Do not tag archived branches. '
3562 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003563
kmarshall3bff56b2016-06-06 18:31:47 -07003564 options, args = parser.parse_args(args)
3565 if args:
3566 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003567
3568 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3569 if not branches:
3570 return 0
3571
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003572 tags = RunGit(['for-each-ref', '--format=%(refname)',
3573 'refs/tags']).splitlines() or []
3574 tags = [t.split('/')[-1] for t in tags]
3575
vapiera7fbd5a2016-06-16 09:17:49 -07003576 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003577 changes = [Changelist(branchref=b)
3578 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003579 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3580 statuses = get_cl_statuses(changes,
3581 fine_grained=True,
3582 max_processes=options.maxjobs)
3583 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003584 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3585 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003586 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003587 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003588 proposal.sort()
3589
3590 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003591 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003592 return 0
3593
Edward Lemur85153282020-02-14 22:06:29 +00003594 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003595
vapiera7fbd5a2016-06-16 09:17:49 -07003596 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003597 if options.notags:
3598 for next_item in proposal:
3599 print(' ' + next_item[0])
3600 else:
3601 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3602 for next_item in proposal:
3603 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003604
kmarshall9249e012016-08-23 12:02:16 -07003605 # Quit now on precondition failure or if instructed by the user, either
3606 # via an interactive prompt or by command line flags.
3607 if options.dry_run:
3608 print('\nNo changes were made (dry run).\n')
3609 return 0
3610 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003611 print('You are currently on a branch \'%s\' which is associated with a '
3612 'closed codereview issue, so archive cannot proceed. Please '
3613 'checkout another branch and run this command again.' %
3614 current_branch)
3615 return 1
kmarshall9249e012016-08-23 12:02:16 -07003616 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003617 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3618 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003619 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003620 return 1
3621
3622 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003623 if not options.notags:
3624 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003625
3626 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3627 # Clean up the tag if we failed to delete the branch.
3628 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003629
vapiera7fbd5a2016-06-16 09:17:49 -07003630 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003631
3632 return 0
3633
3634
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003635@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003636def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003637 """Show status of changelists.
3638
3639 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003640 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003641 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003642 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003643 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003644 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003645 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003646 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003647
3648 Also see 'git cl comments'.
3649 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003650 parser.add_option(
3651 '--no-branch-color',
3652 action='store_true',
3653 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003654 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003655 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003656 parser.add_option('-f', '--fast', action='store_true',
3657 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003658 parser.add_option(
3659 '-j', '--maxjobs', action='store', type=int,
3660 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003661 parser.add_option(
3662 '-i', '--issue', type=int,
3663 help='Operate on this issue instead of the current branch\'s implicit '
3664 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003665 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003666 if args:
3667 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003668
iannuccie53c9352016-08-17 14:40:40 -07003669 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003670 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003671
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003672 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003673 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003674 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003675 if cl.GetIssue():
3676 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003677 elif options.field == 'id':
3678 issueid = cl.GetIssue()
3679 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003680 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003681 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003682 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003683 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003684 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003685 elif options.field == 'status':
3686 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003687 elif options.field == 'url':
3688 url = cl.GetIssueURL()
3689 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003690 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003691 return 0
3692
3693 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3694 if not branches:
3695 print('No local branch found.')
3696 return 0
3697
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003698 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003699 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003700 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003701 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003702 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003703 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003704 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003705
Edward Lemur85153282020-02-14 22:06:29 +00003706 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003707
3708 def FormatBranchName(branch, colorize=False):
3709 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3710 an asterisk when it is the current branch."""
3711
3712 asterisk = ""
3713 color = Fore.RESET
3714 if branch == current_branch:
3715 asterisk = "* "
3716 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003717 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003718
3719 if colorize:
3720 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003721 return asterisk + branch_name
3722
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003723 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003724
3725 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003726 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3727 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003728 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003729 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003730 branch_statuses[c.GetBranch()] = status
3731 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003732 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003733 if url and (not status or status == 'error'):
3734 # The issue probably doesn't exist anymore.
3735 url += ' (broken)'
3736
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003737 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003738 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003739 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003740 color = ''
3741 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003742 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003743
Alan Cuttera3be9a52019-03-04 18:50:33 +00003744 branch_display = FormatBranchName(branch)
3745 padding = ' ' * (alignment - len(branch_display))
3746 if not options.no_branch_color:
3747 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003748
Alan Cuttera3be9a52019-03-04 18:50:33 +00003749 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3750 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003751
vapiera7fbd5a2016-06-16 09:17:49 -07003752 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003753 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003754 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003755 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003756 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003757 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003758 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003759 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003760 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003761 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003762 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003763 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003764 return 0
3765
3766
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003767def colorize_CMDstatus_doc():
3768 """To be called once in main() to add colors to git cl status help."""
3769 colors = [i for i in dir(Fore) if i[0].isupper()]
3770
3771 def colorize_line(line):
3772 for color in colors:
3773 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003774 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003775 indent = len(line) - len(line.lstrip(' ')) + 1
3776 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3777 return line
3778
3779 lines = CMDstatus.__doc__.splitlines()
3780 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3781
3782
phajdan.jre328cf92016-08-22 04:12:17 -07003783def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003784 if path == '-':
3785 json.dump(contents, sys.stdout)
3786 else:
3787 with open(path, 'w') as f:
3788 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003789
3790
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003791@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003792@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003793def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003794 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003795
3796 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003797 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003798 parser.add_option('-r', '--reverse', action='store_true',
3799 help='Lookup the branch(es) for the specified issues. If '
3800 'no issues are specified, all branches with mapped '
3801 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003802 parser.add_option('--json',
3803 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003804 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003805
dnj@chromium.org406c4402015-03-03 17:22:28 +00003806 if options.reverse:
3807 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003808 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003809 # Reverse issue lookup.
3810 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003811
3812 git_config = {}
3813 for config in RunGit(['config', '--get-regexp',
3814 r'branch\..*issue']).splitlines():
3815 name, _space, val = config.partition(' ')
3816 git_config[name] = val
3817
dnj@chromium.org406c4402015-03-03 17:22:28 +00003818 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003819 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003820 Changelist.IssueConfigKey())
3821 issue = git_config.get(config_key)
3822 if issue:
3823 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003824 if not args:
3825 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003826 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003827 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003828 try:
3829 issue_num = int(issue)
3830 except ValueError:
3831 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003832 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003833 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003834 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003835 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003836 if options.json:
3837 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003838 return 0
3839
3840 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003841 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003842 if not issue.valid:
3843 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3844 'or no argument to list it.\n'
3845 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003846 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003847 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003848 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003849 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003850 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3851 if options.json:
3852 write_json(options.json, {
3853 'issue': cl.GetIssue(),
3854 'issue_url': cl.GetIssueURL(),
3855 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003856 return 0
3857
3858
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003859@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003860def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003861 """Shows or posts review comments for any changelist."""
3862 parser.add_option('-a', '--add-comment', dest='comment',
3863 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003864 parser.add_option('-p', '--publish', action='store_true',
3865 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003866 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003867 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003868 parser.add_option('-m', '--machine-readable', dest='readable',
3869 action='store_false', default=True,
3870 help='output comments in a format compatible with '
3871 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003872 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003873 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003874 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003875
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003876 issue = None
3877 if options.issue:
3878 try:
3879 issue = int(options.issue)
3880 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003881 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003882
Edward Lemur934836a2019-09-09 20:16:54 +00003883 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003884
3885 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003886 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003887 return 0
3888
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003889 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3890 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003891 for comment in summary:
3892 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003893 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003894 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003895 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003896 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003897 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003898 elif comment.autogenerated:
3899 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003900 else:
3901 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003902 print('\n%s%s %s%s\n%s' % (
3903 color,
3904 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3905 comment.sender,
3906 Fore.RESET,
3907 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3908
smut@google.comc85ac942015-09-15 16:34:43 +00003909 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003910 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003911 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003912 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3913 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003914 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003915 return 0
3916
3917
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003918@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003919@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003920def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003921 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003922 parser.add_option('-d', '--display', action='store_true',
3923 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003924 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003925 help='New description to set for this issue (- for stdin, '
3926 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003927 parser.add_option('-f', '--force', action='store_true',
3928 help='Delete any unpublished Gerrit edits for this issue '
3929 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003930
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003931 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003932
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003933 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003934 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003935 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003936 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003937 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003938
Edward Lemur934836a2019-09-09 20:16:54 +00003939 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003940 if target_issue_arg:
3941 kwargs['issue'] = target_issue_arg.issue
3942 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003943
3944 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003945 if not cl.GetIssue():
3946 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003947
Edward Lemur678a6842019-10-03 22:25:05 +00003948 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003949 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003950
Edward Lemur6c6827c2020-02-06 21:15:18 +00003951 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003952
smut@google.com34fb6b12015-07-13 20:03:26 +00003953 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003954 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003955 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003956
3957 if options.new_description:
3958 text = options.new_description
3959 if text == '-':
3960 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003961 elif text == '+':
3962 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003963 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003964
3965 description.set_description(text)
3966 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003967 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003968 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003969 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003970 return 0
3971
3972
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003973@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003974def CMDlint(parser, args):
3975 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003976 parser.add_option('--filter', action='append', metavar='-x,+y',
3977 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003978 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003979
3980 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003981 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003982 try:
3983 import cpplint
3984 import cpplint_chromium
3985 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003986 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003987 return 1
3988
3989 # Change the current working directory before calling lint so that it
3990 # shows the correct base.
3991 previous_cwd = os.getcwd()
3992 os.chdir(settings.GetRoot())
3993 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003994 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003995 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003996 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003997 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003998 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003999
4000 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004001 command = args + files
4002 if options.filter:
4003 command = ['--filter=' + ','.join(options.filter)] + command
4004 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004005
4006 white_regex = re.compile(settings.GetLintRegex())
4007 black_regex = re.compile(settings.GetLintIgnoreRegex())
4008 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4009 for filename in filenames:
4010 if white_regex.match(filename):
4011 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004012 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004013 else:
4014 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4015 extra_check_functions)
4016 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004017 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004018 finally:
4019 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004020 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004021 if cpplint._cpplint_state.error_count != 0:
4022 return 1
4023 return 0
4024
4025
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004026@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004027def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004028 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004029 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004030 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004031 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004032 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004033 parser.add_option('--all', action='store_true',
4034 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004035 parser.add_option('--parallel', action='store_true',
4036 help='Run all tests specified by input_api.RunTests in all '
4037 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004038 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004039
sbc@chromium.org71437c02015-04-09 19:29:40 +00004040 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004041 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004042 return 1
4043
Edward Lemur934836a2019-09-09 20:16:54 +00004044 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004045 if args:
4046 base_branch = args[0]
4047 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004048 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004049 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004050
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004051 if cl.GetIssue():
4052 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004053 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004054 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004055
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004056 cl.RunHook(
4057 committing=not options.upload,
4058 may_prompt=False,
4059 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004060 parallel=options.parallel,
4061 upstream=base_branch,
4062 description=description,
4063 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004064 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004065
4066
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004067def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004068 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004069
4070 Works the same way as
4071 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4072 but can be called on demand on all platforms.
4073
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004074 The basic idea is to generate git hash of a state of the tree, original
4075 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004076 """
4077 lines = []
4078 tree_hash = RunGitSilent(['write-tree'])
4079 lines.append('tree %s' % tree_hash.strip())
4080 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4081 if code == 0:
4082 lines.append('parent %s' % parent.strip())
4083 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4084 lines.append('author %s' % author.strip())
4085 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4086 lines.append('committer %s' % committer.strip())
4087 lines.append('')
4088 # Note: Gerrit's commit-hook actually cleans message of some lines and
4089 # whitespace. This code is not doing this, but it clearly won't decrease
4090 # entropy.
4091 lines.append(message)
4092 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004093 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004094 return 'I%s' % change_hash.strip()
4095
4096
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004097def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004098 """Computes the remote branch ref to use for the CL.
4099
4100 Args:
4101 remote (str): The git remote for the CL.
4102 remote_branch (str): The git remote branch for the CL.
4103 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004104 """
4105 if not (remote and remote_branch):
4106 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004107
wittman@chromium.org455dc922015-01-26 20:15:50 +00004108 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004109 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004110 # refs, which are then translated into the remote full symbolic refs
4111 # below.
4112 if '/' not in target_branch:
4113 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4114 else:
4115 prefix_replacements = (
4116 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4117 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4118 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4119 )
4120 match = None
4121 for regex, replacement in prefix_replacements:
4122 match = re.search(regex, target_branch)
4123 if match:
4124 remote_branch = target_branch.replace(match.group(0), replacement)
4125 break
4126 if not match:
4127 # This is a branch path but not one we recognize; use as-is.
4128 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004129 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4130 # Handle the refs that need to land in different refs.
4131 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004132
wittman@chromium.org455dc922015-01-26 20:15:50 +00004133 # Create the true path to the remote branch.
4134 # Does the following translation:
4135 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4136 # * refs/remotes/origin/master -> refs/heads/master
4137 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4138 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4139 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4140 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4141 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4142 'refs/heads/')
4143 elif remote_branch.startswith('refs/remotes/branch-heads'):
4144 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004145
wittman@chromium.org455dc922015-01-26 20:15:50 +00004146 return remote_branch
4147
4148
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004149def cleanup_list(l):
4150 """Fixes a list so that comma separated items are put as individual items.
4151
4152 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4153 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4154 """
4155 items = sum((i.split(',') for i in l), [])
4156 stripped_items = (i.strip() for i in items)
4157 return sorted(filter(None, stripped_items))
4158
4159
Aaron Gable4db38df2017-11-03 14:59:07 -07004160@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004161@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004162def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004163 """Uploads the current changelist to codereview.
4164
4165 Can skip dependency patchset uploads for a branch by running:
4166 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004167 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004168 git config --unset branch.branch_name.skip-deps-uploads
4169 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004170
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004171 If the name of the checked out branch starts with "bug-" or "fix-" followed
4172 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004173 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004174
4175 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004176 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004177 [git-cl] add support for hashtags
4178 Foo bar: implement foo
4179 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004180 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004181 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4182 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004183 parser.add_option('--bypass-watchlists', action='store_true',
4184 dest='bypass_watchlists',
4185 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004186 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004187 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004188 parser.add_option('--message', '-m', dest='message',
4189 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004190 parser.add_option('-b', '--bug',
4191 help='pre-populate the bug number(s) for this issue. '
4192 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004193 parser.add_option('--message-file', dest='message_file',
4194 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004195 parser.add_option('--title', '-t', dest='title',
4196 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004197 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004198 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004199 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004200 parser.add_option('--tbrs',
4201 action='append', default=[],
4202 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004203 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004204 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004205 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004206 parser.add_option('--hashtag', dest='hashtags',
4207 action='append', default=[],
4208 help=('Gerrit hashtag for new CL; '
4209 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004210 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004211 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004212 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004213 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004214 metavar='TARGET',
4215 help='Apply CL to remote ref TARGET. ' +
4216 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004217 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004218 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004219 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004220 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004221 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004222 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004223 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4224 const='TBR', help='add a set of OWNERS to TBR')
4225 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4226 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004227 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004228 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004229 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004230 'implies --send-mail')
4231 parser.add_option('-d', '--cq-dry-run',
4232 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004233 help='Send the patchset to do a CQ dry run right after '
4234 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004235 parser.add_option('--preserve-tryjobs', action='store_true',
4236 help='instruct the CQ to let tryjobs running even after '
4237 'new patchsets are uploaded instead of canceling '
4238 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004239 parser.add_option('--dependencies', action='store_true',
4240 help='Uploads CLs of all the local branches that depend on '
4241 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004242 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4243 help='Sends your change to the CQ after an approval. Only '
4244 'works on repos that have the Auto-Submit label '
4245 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004246 parser.add_option('--parallel', action='store_true',
4247 help='Run all tests specified by input_api.RunTests in all '
4248 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004249 parser.add_option('--no-autocc', action='store_true',
4250 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004251 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004252 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004253 parser.add_option('-R', '--retry-failed', action='store_true',
4254 help='Retry failed tryjobs from old patchset immediately '
4255 'after uploading new patchset. Cannot be used with '
4256 '--use-commit-queue or --cq-dry-run.')
4257 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4258 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004259 parser.add_option('--fixed', '-x',
4260 help='List of bugs that will be commented on and marked '
4261 'fixed (pre-populates "Fixed:" tag). Same format as '
4262 '-b option / "Bug:" tag. If fixing several issues, '
4263 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004264 parser.add_option('--edit-description', action='store_true', default=False,
4265 help='Modify description before upload. Cannot be used '
4266 'with --force. It is a noop when --no-squash is set '
4267 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004268
rmistry@google.com2dd99862015-06-22 12:22:18 +00004269 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004270 (options, args) = parser.parse_args(args)
4271
sbc@chromium.org71437c02015-04-09 19:29:40 +00004272 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004273 return 1
4274
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004275 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004276 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004277 options.cc = cleanup_list(options.cc)
4278
Josipe827b0f2020-01-30 00:07:20 +00004279 if options.edit_description and options.force:
4280 parser.error('Only one of --force and --edit-description allowed')
4281
tandriib80458a2016-06-23 12:20:07 -07004282 if options.message_file:
4283 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004284 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004285 options.message = gclient_utils.FileRead(options.message_file)
4286 options.message_file = None
4287
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004288 if ([options.cq_dry_run,
4289 options.use_commit_queue,
4290 options.retry_failed].count(True) > 1):
4291 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4292 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004293
Aaron Gableedbc4132017-09-11 13:22:28 -07004294 if options.use_commit_queue:
4295 options.send_mail = True
4296
Edward Lemur934836a2019-09-09 20:16:54 +00004297 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004298 # Warm change details cache now to avoid RPCs later, reducing latency for
4299 # developers.
4300 if cl.GetIssue():
4301 cl._GetChangeDetail(
4302 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4303
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004304 if options.retry_failed and not cl.GetIssue():
4305 print('No previous patchsets, so --retry-failed has no effect.')
4306 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004307
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004308 # cl.GetMostRecentPatchset uses cached information, and can return the last
4309 # patchset before upload. Calling it here makes it clear that it's the
4310 # last patchset before upload. Note that GetMostRecentPatchset will fail
4311 # if no CL has been uploaded yet.
4312 if options.retry_failed:
4313 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004314
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004315 ret = cl.CMDUpload(options, args, orig_args)
4316
4317 if options.retry_failed:
4318 if ret != 0:
4319 print('Upload failed, so --retry-failed has no effect.')
4320 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004321 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004322 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004323 jobs = _filter_failed_for_retry(builds)
4324 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004325 print('No failed tryjobs, so --retry-failed has no effect.')
4326 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004327 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004328
4329 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004330
4331
Francois Dorayd42c6812017-05-30 15:10:20 -04004332@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004333@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004334def CMDsplit(parser, args):
4335 """Splits a branch into smaller branches and uploads CLs.
4336
4337 Creates a branch and uploads a CL for each group of files modified in the
4338 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004339 comment, the string '$directory', is replaced with the directory containing
4340 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004341 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004342 parser.add_option('-d', '--description', dest='description_file',
4343 help='A text file containing a CL description in which '
4344 '$directory will be replaced by each CL\'s directory.')
4345 parser.add_option('-c', '--comment', dest='comment_file',
4346 help='A text file containing a CL comment.')
4347 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004348 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004349 help='List the files and reviewers for each CL that would '
4350 'be created, but don\'t create branches or CLs.')
4351 parser.add_option('--cq-dry-run', action='store_true',
4352 help='If set, will do a cq dry run for each uploaded CL. '
4353 'Please be careful when doing this; more than ~10 CLs '
4354 'has the potential to overload our build '
4355 'infrastructure. Try to upload these not during high '
4356 'load times (usually 11-3 Mountain View time). Email '
4357 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004358 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4359 default=True,
4360 help='Sends your change to the CQ after an approval. Only '
4361 'works on repos that have the Auto-Submit label '
4362 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004363 options, _ = parser.parse_args(args)
4364
4365 if not options.description_file:
4366 parser.error('No --description flag specified.')
4367
4368 def WrappedCMDupload(args):
4369 return CMDupload(OptionParser(), args)
4370
Edward Lemur2c62b332020-03-12 22:12:33 +00004371 return split_cl.SplitCl(
4372 options.description_file, options.comment_file, Changelist,
4373 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4374 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004375
4376
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004377@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004378@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004379def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004380 """DEPRECATED: Used to commit the current changelist via git-svn."""
4381 message = ('git-cl no longer supports committing to SVN repositories via '
4382 'git-svn. You probably want to use `git cl land` instead.')
4383 print(message)
4384 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004385
4386
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004387@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004388@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004389def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004390 """Commits the current changelist via git.
4391
4392 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4393 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004394 """
4395 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4396 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004397 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004398 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004399 parser.add_option('--parallel', action='store_true',
4400 help='Run all tests specified by input_api.RunTests in all '
4401 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004402 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004403
Edward Lemur934836a2019-09-09 20:16:54 +00004404 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004405
Robert Iannucci2e73d432018-03-14 01:10:47 -07004406 if not cl.GetIssue():
4407 DieWithError('You must upload the change first to Gerrit.\n'
4408 ' If you would rather have `git cl land` upload '
4409 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004410 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004411 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004412
4413
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004414@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004415@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004416def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004417 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004418 parser.add_option('-b', dest='newbranch',
4419 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004420 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004421 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004422 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004423 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004424
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004425 group = optparse.OptionGroup(
4426 parser,
4427 'Options for continuing work on the current issue uploaded from a '
4428 'different clone (e.g. different machine). Must be used independently '
4429 'from the other options. No issue number should be specified, and the '
4430 'branch must have an issue number associated with it')
4431 group.add_option('--reapply', action='store_true', dest='reapply',
4432 help='Reset the branch and reapply the issue.\n'
4433 'CAUTION: This will undo any local changes in this '
4434 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004435
4436 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004437 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004438 parser.add_option_group(group)
4439
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004440 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004441
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004442 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004443 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004444 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004445 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004446 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004447
Edward Lemur934836a2019-09-09 20:16:54 +00004448 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004449 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004450 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004451
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004452 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004453 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004454 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004455
4456 RunGit(['reset', '--hard', upstream])
4457 if options.pull:
4458 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004459
Edward Lemur678a6842019-10-03 22:25:05 +00004460 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4461 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004462
4463 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004464 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004465
Edward Lemurf38bc172019-09-03 21:02:13 +00004466 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004467 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004468 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004469
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004470 # We don't want uncommitted changes mixed up with the patch.
4471 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004472 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004473
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004474 if options.newbranch:
4475 if options.force:
4476 RunGit(['branch', '-D', options.newbranch],
4477 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004478 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004479
Edward Lemur678a6842019-10-03 22:25:05 +00004480 cl = Changelist(
4481 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004482
Edward Lemur678a6842019-10-03 22:25:05 +00004483 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004484 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004485
Edward Lemurf38bc172019-09-03 21:02:13 +00004486 return cl.CMDPatchWithParsedIssue(
4487 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004488
4489
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004490def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004491 """Fetches the tree status and returns either 'open', 'closed',
4492 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004493 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004494 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004495 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004496 if status.find('closed') != -1 or status == '0':
4497 return 'closed'
4498 elif status.find('open') != -1 or status == '1':
4499 return 'open'
4500 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004501 return 'unset'
4502
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004503
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004504def GetTreeStatusReason():
4505 """Fetches the tree status from a json url and returns the message
4506 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004507 url = settings.GetTreeStatusUrl()
4508 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004509 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004510 status = json.loads(connection.read())
4511 connection.close()
4512 return status['message']
4513
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004514
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004515@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004516def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004517 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004518 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004519 status = GetTreeStatus()
4520 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004521 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004522 return 2
4523
vapiera7fbd5a2016-06-16 09:17:49 -07004524 print('The tree is %s' % status)
4525 print()
4526 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004527 if status != 'open':
4528 return 1
4529 return 0
4530
4531
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004532@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004533def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004534 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4535 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004536 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004537 '-b', '--bot', action='append',
4538 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4539 'times to specify multiple builders. ex: '
4540 '"-b win_rel -b win_layout". See '
4541 'the try server waterfall for the builders name and the tests '
4542 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004543 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004544 '-B', '--bucket', default='',
4545 help=('Buildbucket bucket to send the try requests.'))
4546 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004547 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004548 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004549 'be determined by the try recipe that builder runs, which usually '
4550 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004551 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004552 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004553 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004554 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004555 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004556 '--category', default='git_cl_try', help='Specify custom build category.')
4557 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004558 '--project',
4559 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004560 'in recipe to determine to which repository or directory to '
4561 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004562 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004563 '-p', '--property', dest='properties', action='append', default=[],
4564 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004565 'key2=value2 etc. The value will be treated as '
4566 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004567 'NOTE: using this may make your tryjob not usable for CQ, '
4568 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004569 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004570 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4571 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004572 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004573 parser.add_option(
4574 '-R', '--retry-failed', action='store_true', default=False,
4575 help='Retry failed jobs from the latest set of tryjobs. '
4576 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004577 parser.add_option(
4578 '-i', '--issue', type=int,
4579 help='Operate on this issue instead of the current branch\'s implicit '
4580 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004581 options, args = parser.parse_args(args)
4582
machenbach@chromium.org45453142015-09-15 08:45:22 +00004583 # Make sure that all properties are prop=value pairs.
4584 bad_params = [x for x in options.properties if '=' not in x]
4585 if bad_params:
4586 parser.error('Got properties with missing "=": %s' % bad_params)
4587
maruel@chromium.org15192402012-09-06 12:38:29 +00004588 if args:
4589 parser.error('Unknown arguments: %s' % args)
4590
Edward Lemur934836a2019-09-09 20:16:54 +00004591 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004592 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004593 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004594
Edward Lemurf38bc172019-09-03 21:02:13 +00004595 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004596 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004597
tandriie113dfd2016-10-11 10:20:12 -07004598 error_message = cl.CannotTriggerTryJobReason()
4599 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004600 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004601
Edward Lemur45768512020-03-02 19:03:14 +00004602 if options.bot:
4603 if options.retry_failed:
4604 parser.error('--bot is not compatible with --retry-failed.')
4605 if not options.bucket:
4606 parser.error('A bucket (e.g. "chromium/try") is required.')
4607
4608 triggered = [b for b in options.bot if 'triggered' in b]
4609 if triggered:
4610 parser.error(
4611 'Cannot schedule builds on triggered bots: %s.\n'
4612 'This type of bot requires an initial job from a parent (usually a '
4613 'builder). Schedule a job on the parent instead.\n' % triggered)
4614
4615 if options.bucket.startswith('.master'):
4616 parser.error('Buildbot masters are not supported.')
4617
4618 project, bucket = _parse_bucket(options.bucket)
4619 if project is None or bucket is None:
4620 parser.error('Invalid bucket: %s.' % options.bucket)
4621 jobs = sorted((project, bucket, bot) for bot in options.bot)
4622 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004623 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004624 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004625 if options.verbose:
4626 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004627 jobs = _filter_failed_for_retry(builds)
4628 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004629 print('There are no failed jobs in the latest set of jobs '
4630 '(patchset #%d), doing nothing.' % patchset)
4631 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004632 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004633 if num_builders > 10:
4634 confirm_or_exit('There are %d builders with failed builds.'
4635 % num_builders, action='continue')
4636 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004637 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004638 print('git cl try with no bots now defaults to CQ dry run.')
4639 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4640 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004641
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004642 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004643 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004644 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004645 except BuildbucketResponseException as ex:
4646 print('ERROR: %s' % ex)
4647 return 1
4648 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004649
4650
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004651@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004652def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004653 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004654 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004655 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004656 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004657 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004658 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004659 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004660 '--color', action='store_true', default=setup_color.IS_TTY,
4661 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004662 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004663 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4664 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004665 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004666 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004667 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004668 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004669 parser.add_option(
4670 '-i', '--issue', type=int,
4671 help='Operate on this issue instead of the current branch\'s implicit '
4672 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004673 options, args = parser.parse_args(args)
4674 if args:
4675 parser.error('Unrecognized args: %s' % ' '.join(args))
4676
Edward Lemur934836a2019-09-09 20:16:54 +00004677 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004678 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004679 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004680
tandrii221ab252016-10-06 08:12:04 -07004681 patchset = options.patchset
4682 if not patchset:
4683 patchset = cl.GetMostRecentPatchset()
4684 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004685 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004686 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004687 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004688 cl.GetIssue())
4689
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004690 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004691 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004692 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004693 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004694 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004695 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004696 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004697 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004698 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004699 return 0
4700
4701
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004702@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004703@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004704def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004705 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004706 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004707 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004708 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004709
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004710 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004711 if args:
4712 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004713 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004714 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004715 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004716 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004717
4718 # Clear configured merge-base, if there is one.
4719 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004720 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004721 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004722 return 0
4723
4724
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004725@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004726def CMDweb(parser, args):
4727 """Opens the current CL in the web browser."""
4728 _, args = parser.parse_args(args)
4729 if args:
4730 parser.error('Unrecognized args: %s' % ' '.join(args))
4731
4732 issue_url = Changelist().GetIssueURL()
4733 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004734 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004735 return 1
4736
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004737 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004738 # allows us to hide the "Created new window in existing browser session."
4739 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004740 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004741 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004742 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004743 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004744 os.open(os.devnull, os.O_RDWR)
4745 try:
4746 webbrowser.open(issue_url)
4747 finally:
4748 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004749 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004750 return 0
4751
4752
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004753@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004754def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004755 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004756 parser.add_option('-d', '--dry-run', action='store_true',
4757 help='trigger in dry run mode')
4758 parser.add_option('-c', '--clear', action='store_true',
4759 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004760 parser.add_option(
4761 '-i', '--issue', type=int,
4762 help='Operate on this issue instead of the current branch\'s implicit '
4763 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004764 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004765 if args:
4766 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004767 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004768 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004769
Edward Lemur934836a2019-09-09 20:16:54 +00004770 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004771 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004772 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004773 elif options.dry_run:
4774 state = _CQState.DRY_RUN
4775 else:
4776 state = _CQState.COMMIT
4777 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004778 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004779 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004780 return 0
4781
4782
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004783@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004784def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004785 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004786 parser.add_option(
4787 '-i', '--issue', type=int,
4788 help='Operate on this issue instead of the current branch\'s implicit '
4789 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004790 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004791 if args:
4792 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004793 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004794 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004795 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004796 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004797 cl.CloseIssue()
4798 return 0
4799
4800
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004801@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004802def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004803 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004804 parser.add_option(
4805 '--stat',
4806 action='store_true',
4807 dest='stat',
4808 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004809 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004810 if args:
4811 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004812
Edward Lemur934836a2019-09-09 20:16:54 +00004813 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004814 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004815 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004816 if not issue:
4817 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004818
Aaron Gablea718c3e2017-08-28 17:47:28 -07004819 base = cl._GitGetBranchConfigValue('last-upload-hash')
4820 if not base:
4821 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4822 if not base:
4823 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4824 revision_info = detail['revisions'][detail['current_revision']]
4825 fetch_info = revision_info['fetch']['http']
4826 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4827 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004828
Aaron Gablea718c3e2017-08-28 17:47:28 -07004829 cmd = ['git', 'diff']
4830 if options.stat:
4831 cmd.append('--stat')
4832 cmd.append(base)
4833 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004834
4835 return 0
4836
4837
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004838@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004839def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004840 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004841 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004842 '--ignore-current',
4843 action='store_true',
4844 help='Ignore the CL\'s current reviewers and start from scratch.')
4845 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004846 '--ignore-self',
4847 action='store_true',
4848 help='Do not consider CL\'s author as an owners.')
4849 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004850 '--no-color',
4851 action='store_true',
4852 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004853 parser.add_option(
4854 '--batch',
4855 action='store_true',
4856 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004857 # TODO: Consider moving this to another command, since other
4858 # git-cl owners commands deal with owners for a given CL.
4859 parser.add_option(
4860 '--show-all',
4861 action='store_true',
4862 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004863 options, args = parser.parse_args(args)
4864
4865 author = RunGit(['config', 'user.email']).strip() or None
4866
Edward Lemur934836a2019-09-09 20:16:54 +00004867 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004868
Yang Guo6e269a02019-06-26 11:17:02 +00004869 if options.show_all:
4870 for arg in args:
4871 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004872 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004873 database.load_data_needed_for([arg])
4874 print('Owners for %s:' % arg)
4875 for owner in sorted(database.all_possible_owners([arg], None)):
4876 print(' - %s' % owner)
4877 return 0
4878
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004879 if args:
4880 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004881 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004882 base_branch = args[0]
4883 else:
4884 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004885 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004886
Edward Lemur2c62b332020-03-12 22:12:33 +00004887 root = settings.GetRoot()
4888 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004889
4890 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004891 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004892 print('\n'.join(db.reviewers_for(affected_files, author)))
4893 return 0
4894
Edward Lemur2c62b332020-03-12 22:12:33 +00004895 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4896 original_owner_files = {
4897 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4898 for f in owner_files}
4899
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004900 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004901 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004902 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004903 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004904 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004905 fopen=open,
4906 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004907 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004908 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004909 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004910
4911
Aiden Bennerc08566e2018-10-03 17:52:42 +00004912def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004913 """Generates a diff command."""
4914 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004915 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4916
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004917 if allow_prefix:
4918 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4919 # case that diff.noprefix is set in the user's git config.
4920 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4921 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004922 diff_cmd += ['--no-prefix']
4923
4924 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004925
4926 if args:
4927 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004928 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004929 diff_cmd.append(arg)
4930 else:
4931 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004932
4933 return diff_cmd
4934
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004935
Jamie Madill5e96ad12020-01-13 16:08:35 +00004936def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4937 """Runs clang-format-diff and sets a return value if necessary."""
4938
4939 if not clang_diff_files:
4940 return 0
4941
4942 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4943 # formatted. This is used to block during the presubmit.
4944 return_value = 0
4945
4946 # Locate the clang-format binary in the checkout
4947 try:
4948 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4949 except clang_format.NotFoundError as e:
4950 DieWithError(e)
4951
4952 if opts.full or settings.GetFormatFullByDefault():
4953 cmd = [clang_format_tool]
4954 if not opts.dry_run and not opts.diff:
4955 cmd.append('-i')
4956 if opts.dry_run:
4957 for diff_file in clang_diff_files:
4958 with open(diff_file, 'r') as myfile:
4959 code = myfile.read().replace('\r\n', '\n')
4960 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4961 stdout = stdout.replace('\r\n', '\n')
4962 if opts.diff:
4963 sys.stdout.write(stdout)
4964 if code != stdout:
4965 return_value = 2
4966 else:
4967 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4968 if opts.diff:
4969 sys.stdout.write(stdout)
4970 else:
4971 env = os.environ.copy()
4972 env['PATH'] = str(os.path.dirname(clang_format_tool))
4973 try:
4974 script = clang_format.FindClangFormatScriptInChromiumTree(
4975 'clang-format-diff.py')
4976 except clang_format.NotFoundError as e:
4977 DieWithError(e)
4978
4979 cmd = [sys.executable, script, '-p0']
4980 if not opts.dry_run and not opts.diff:
4981 cmd.append('-i')
4982
4983 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004984 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004985
4986 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
4987 if opts.diff:
4988 sys.stdout.write(stdout)
4989 if opts.dry_run and len(stdout) > 0:
4990 return_value = 2
4991
4992 return return_value
4993
4994
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004995def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004996 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004997 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004998
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004999
enne@chromium.org555cfe42014-01-29 18:21:39 +00005000@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005001@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005002def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005003 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005004 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005005 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005006 parser.add_option('--full', action='store_true',
5007 help='Reformat the full content of all touched files')
5008 parser.add_option('--dry-run', action='store_true',
5009 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005010 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005011 '--no-clang-format',
5012 dest='clang_format',
5013 action='store_false',
5014 default=True,
5015 help='Disables formatting of various file types using clang-format.')
5016 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005017 '--python',
5018 action='store_true',
5019 default=None,
5020 help='Enables python formatting on all python files.')
5021 parser.add_option(
5022 '--no-python',
5023 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005024 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005025 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005026 'If neither --python or --no-python are set, python files that have a '
5027 '.style.yapf file in an ancestor directory will be formatted. '
5028 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005029 parser.add_option(
5030 '--js',
5031 action='store_true',
5032 help='Format javascript code with clang-format. '
5033 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005034 parser.add_option('--diff', action='store_true',
5035 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005036 parser.add_option('--presubmit', action='store_true',
5037 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005038 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005039
Garrett Beaty91a6f332020-01-06 16:57:24 +00005040 if opts.python is not None and opts.no_python:
5041 raise parser.error('Cannot set both --python and --no-python')
5042 if opts.no_python:
5043 opts.python = False
5044
Daniel Chengc55eecf2016-12-30 03:11:02 -08005045 # Normalize any remaining args against the current path, so paths relative to
5046 # the current directory are still resolved as expected.
5047 args = [os.path.join(os.getcwd(), arg) for arg in args]
5048
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005049 # git diff generates paths against the root of the repository. Change
5050 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005051 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005052 if rel_base_path:
5053 os.chdir(rel_base_path)
5054
digit@chromium.org29e47272013-05-17 17:01:46 +00005055 # Grab the merge-base commit, i.e. the upstream commit of the current
5056 # branch when it was created or the last time it was rebased. This is
5057 # to cover the case where the user may have called "git fetch origin",
5058 # moving the origin branch to a newer commit, but hasn't rebased yet.
5059 upstream_commit = None
5060 cl = Changelist()
5061 upstream_branch = cl.GetUpstreamBranch()
5062 if upstream_branch:
5063 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5064 upstream_commit = upstream_commit.strip()
5065
5066 if not upstream_commit:
5067 DieWithError('Could not find base commit for this branch. '
5068 'Are you in detached state?')
5069
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005070 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5071 diff_output = RunGit(changed_files_cmd)
5072 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005073 # Filter out files deleted by this CL
5074 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005075
Andreas Haas417d89c2020-02-06 10:24:27 +00005076 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005077 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005078
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005079 clang_diff_files = []
5080 if opts.clang_format:
5081 clang_diff_files = [
5082 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5083 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005084 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5085 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005086 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005087
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005088 top_dir = os.path.normpath(
5089 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5090
Jamie Madill5e96ad12020-01-13 16:08:35 +00005091 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5092 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005093
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005094 # Similar code to above, but using yapf on .py files rather than clang-format
5095 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005096 py_explicitly_disabled = opts.python is not None and not opts.python
5097 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005098 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5099 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5100 if sys.platform.startswith('win'):
5101 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005102
Aiden Bennerc08566e2018-10-03 17:52:42 +00005103 # Used for caching.
5104 yapf_configs = {}
5105 for f in python_diff_files:
5106 # Find the yapf style config for the current file, defaults to depot
5107 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005108 _FindYapfConfigFile(f, yapf_configs, top_dir)
5109
5110 # Turn on python formatting by default if a yapf config is specified.
5111 # This breaks in the case of this repo though since the specified
5112 # style file is also the global default.
5113 if opts.python is None:
5114 filtered_py_files = []
5115 for f in python_diff_files:
5116 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5117 filtered_py_files.append(f)
5118 else:
5119 filtered_py_files = python_diff_files
5120
5121 # Note: yapf still seems to fix indentation of the entire file
5122 # even if line ranges are specified.
5123 # See https://github.com/google/yapf/issues/499
5124 if not opts.full and filtered_py_files:
5125 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5126
Brian Sheedyb4307d52019-12-02 19:18:17 +00005127 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5128 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5129 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005130
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005131 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005132 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5133 # Default to pep8 if not .style.yapf is found.
5134 if not yapf_style:
5135 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005136
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005137 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005138
5139 has_formattable_lines = False
5140 if not opts.full:
5141 # Only run yapf over changed line ranges.
5142 for diff_start, diff_len in py_line_diffs[f]:
5143 diff_end = diff_start + diff_len - 1
5144 # Yapf errors out if diff_end < diff_start but this
5145 # is a valid line range diff for a removal.
5146 if diff_end >= diff_start:
5147 has_formattable_lines = True
5148 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5149 # If all line diffs were removals we have nothing to format.
5150 if not has_formattable_lines:
5151 continue
5152
5153 if opts.diff or opts.dry_run:
5154 cmd += ['--diff']
5155 # Will return non-zero exit code if non-empty diff.
5156 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5157 if opts.diff:
5158 sys.stdout.write(stdout)
5159 elif len(stdout) > 0:
5160 return_value = 2
5161 else:
5162 cmd += ['-i']
5163 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005164
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005165 # Dart's formatter does not have the nice property of only operating on
5166 # modified chunks, so hard code full.
5167 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005168 try:
5169 command = [dart_format.FindDartFmtToolInChromiumTree()]
5170 if not opts.dry_run and not opts.diff:
5171 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005172 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005173
ppi@chromium.org6593d932016-03-03 15:41:15 +00005174 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005175 if opts.dry_run and stdout:
5176 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005177 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005178 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5179 'found in this checkout. Files in other languages are still '
5180 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005181
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005182 # Format GN build files. Always run on full build files for canonical form.
5183 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005184 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005185 if opts.dry_run or opts.diff:
5186 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005187 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005188 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5189 shell=sys.platform == 'win32',
5190 cwd=top_dir)
5191 if opts.dry_run and gn_ret == 2:
5192 return_value = 2 # Not formatted.
5193 elif opts.diff and gn_ret == 2:
5194 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005195 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005196 elif gn_ret != 0:
5197 # For non-dry run cases (and non-2 return values for dry-run), a
5198 # nonzero error code indicates a failure, probably because the file
5199 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005200 DieWithError('gn format failed on ' + gn_diff_file +
5201 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005202
Ilya Shermane081cbe2017-08-15 17:51:04 -07005203 # Skip the metrics formatting from the global presubmit hook. These files have
5204 # a separate presubmit hook that issues an error if the files need formatting,
5205 # whereas the top-level presubmit script merely issues a warning. Formatting
5206 # these files is somewhat slow, so it's important not to duplicate the work.
5207 if not opts.presubmit:
5208 for xml_dir in GetDirtyMetricsDirs(diff_files):
5209 tool_dir = os.path.join(top_dir, xml_dir)
5210 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5211 if opts.dry_run or opts.diff:
5212 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005213 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005214 if opts.diff:
5215 sys.stdout.write(stdout)
5216 if opts.dry_run and stdout:
5217 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005218
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005219 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005220
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005221
Steven Holte2e664bf2017-04-21 13:10:47 -07005222def GetDirtyMetricsDirs(diff_files):
5223 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5224 metrics_xml_dirs = [
5225 os.path.join('tools', 'metrics', 'actions'),
5226 os.path.join('tools', 'metrics', 'histograms'),
5227 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005228 os.path.join('tools', 'metrics', 'ukm'),
5229 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005230 for xml_dir in metrics_xml_dirs:
5231 if any(file.startswith(xml_dir) for file in xml_diff_files):
5232 yield xml_dir
5233
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005234
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005235@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005236@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005237def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005238 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005239 _, args = parser.parse_args(args)
5240
5241 if len(args) != 1:
5242 parser.print_help()
5243 return 1
5244
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005245 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005246 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005247 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005248
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005249 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005250
Edward Lemur52969c92020-02-06 18:15:28 +00005251 issueprefix = Changelist.IssueConfigKey()
5252 output = RunGit(['config', '--local', '--get-regexp',
5253 r'branch\..*\.%s' % issueprefix],
5254 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005255
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005256 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005257 for key, issue in [x.split() for x in output.splitlines()]:
5258 if issue == target_issue:
5259 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5260
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005261 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005262 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005263 return 1
5264 if len(branches) == 1:
5265 RunGit(['checkout', branches[0]])
5266 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005267 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005268 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005269 print('%d: %s' % (i, branches[i]))
Edward Lemur1a83da12020-03-04 21:18:36 +00005270 which = ask_for_data('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005271 try:
5272 RunGit(['checkout', branches[int(which)]])
5273 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005274 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005275 return 1
5276
5277 return 0
5278
5279
maruel@chromium.org29404b52014-09-08 22:58:00 +00005280def CMDlol(parser, args):
5281 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005282 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005283 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5284 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5285 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005286 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005287 return 0
5288
5289
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005290class OptionParser(optparse.OptionParser):
5291 """Creates the option parse and add --verbose support."""
5292 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005293 optparse.OptionParser.__init__(
5294 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005295 self.add_option(
5296 '-v', '--verbose', action='count', default=0,
5297 help='Use 2 times for more debugging info')
5298
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005299 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005300 try:
5301 return self._parse_args(args)
5302 finally:
5303 # Regardless of success or failure of args parsing, we want to report
5304 # metrics, but only after logging has been initialized (if parsing
5305 # succeeded).
5306 global settings
5307 settings = Settings()
5308
5309 if not metrics.DISABLE_METRICS_COLLECTION:
5310 # GetViewVCUrl ultimately calls logging method.
5311 project_url = settings.GetViewVCUrl().strip('/+')
5312 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5313 metrics.collector.add('project_urls', [project_url])
5314
5315 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005316 # Create an optparse.Values object that will store only the actual passed
5317 # options, without the defaults.
5318 actual_options = optparse.Values()
5319 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5320 # Create an optparse.Values object with the default options.
5321 options = optparse.Values(self.get_default_values().__dict__)
5322 # Update it with the options passed by the user.
5323 options._update_careful(actual_options.__dict__)
5324 # Store the options passed by the user in an _actual_options attribute.
5325 # We store only the keys, and not the values, since the values can contain
5326 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005327 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005328
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005329 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005330 logging.basicConfig(
5331 level=levels[min(options.verbose, len(levels) - 1)],
5332 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5333 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005334
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005335 return options, args
5336
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005337
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005338def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005339 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005340 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005341 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005342 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005343
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005344 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005345 dispatcher = subcommand.CommandDispatcher(__name__)
5346 try:
5347 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005348 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005349 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005350 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005351 if e.code != 500:
5352 raise
5353 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005354 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005355 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005356 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005357
5358
5359if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005360 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5361 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005362 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005363 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005364 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005365 sys.exit(main(sys.argv[1:]))