blob: e7e3253d5563b535103020ff5125d45cc884d5c1 [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
thakis@chromium.org3421c992014-11-02 02:20:32 +000013import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000014import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010015import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000016import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000017import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010018import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000019import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000021import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import optparse
23import os
24import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010025import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000026import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000027import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070028import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000030import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000032import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000033import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000034
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000035from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000036import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000037import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000038import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000039import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000040import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000041import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000042import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000043import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000044import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000045import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000046import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000047import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000048import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000049import presubmit_support
50import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000055import watchlists
56
Edward Lemur79d4f992019-11-11 23:49:02 +000057from third_party import six
58from six.moves import urllib
59
60
61if sys.version_info.major == 3:
62 basestring = (str,) # pylint: disable=redefined-builtin
63
Edward Lemurb9830242019-10-30 22:19:20 +000064
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
Edward Lemur0f58ae42019-04-30 17:24:12 +000067# Traces for git push will be stored in a traces directory inside the
68# depot_tools checkout.
69DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
70TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000071PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000072
73# When collecting traces, Git hashes will be reduced to 6 characters to reduce
74# the size after compression.
75GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
76# Used to redact the cookies from the gitcookies file.
77GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
78
Edward Lemurd4d1ba42019-09-20 21:46:37 +000079MAX_ATTEMPTS = 3
80
Edward Lemur1b52d872019-05-09 21:12:12 +000081# The maximum number of traces we will keep. Multiplied by 3 since we store
82# 3 files per trace.
83MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000084# Message to be displayed to the user to inform where to find the traces for a
85# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000086TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000087'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000088'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000089' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'Copies of your gitcookies file and git config have been recorded at:\n'
91' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000092# Format of the message to be stored as part of the traces to give developers a
93# better context when they go through traces.
94TRACES_README_FORMAT = (
95'Date: %(now)s\n'
96'\n'
97'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
98'Title: %(title)s\n'
99'\n'
100'%(description)s\n'
101'\n'
102'Execution time: %(execution_time)s\n'
103'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000104
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
thestig@chromium.org44202a22014-03-11 19:22:18 +0000112# Valid extensions for files we want to lint.
113DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
114DEFAULT_LINT_IGNORE_REGEX = r"$^"
115
Aiden Bennerc08566e2018-10-03 17:52:42 +0000116# File name for yapf style config files.
117YAPF_CONFIG_FILENAME = '.style.yapf'
118
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000119# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000120Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000121
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000122# Initialized in main()
123settings = None
124
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100125# Used by tests/git_cl_test.py to add extra logging.
126# Inside the weirdly failing test, add this:
127# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700128# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100129_IS_BEING_TESTED = False
130
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000131
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000132_KNOWN_GERRIT_TO_SHORT_URLS = {
133 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
134 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
135}
136
137
Christopher Lamf732cd52017-01-24 12:40:11 +1100138def DieWithError(message, change_desc=None):
139 if change_desc:
140 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000141 print('\n ** Content of CL description **\n' +
142 '='*72 + '\n' +
143 change_desc.description + '\n' +
144 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100145
vapiera7fbd5a2016-06-16 09:17:49 -0700146 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000147 sys.exit(1)
148
149
Christopher Lamf732cd52017-01-24 12:40:11 +1100150def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000151 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000152 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000153 with open(backup_path, 'w') as backup_file:
154 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100155
156
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000157def GetNoGitPagerEnv():
158 env = os.environ.copy()
159 # 'cat' is a magical git string that disables pagers on all platforms.
160 env['GIT_PAGER'] = 'cat'
161 return env
162
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000163
bsep@chromium.org627d9002016-04-29 00:00:52 +0000164def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000166 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
167 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000168 except subprocess2.CalledProcessError as e:
169 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000170 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000171 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000172 'Command "%s" failed.\n%s' % (
173 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000174 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000175
176
177def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000178 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000179 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000180
181
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000182def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000183 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700184 if suppress_stderr:
185 stderr = subprocess2.VOID
186 else:
187 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000188 try:
tandrii5d48c322016-08-18 16:19:37 -0700189 (out, _), code = subprocess2.communicate(['git'] + args,
190 env=GetNoGitPagerEnv(),
191 stdout=subprocess2.PIPE,
192 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000193 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700194 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900195 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000196 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000197
198
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000199def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000200 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000201 return RunGitWithCode(args, suppress_stderr=True)[1]
202
203
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000204def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000205 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000206 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000207 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000208 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000209
210
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000211def BranchExists(branch):
212 """Return True if specified branch exists."""
213 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
214 suppress_stderr=True)
215 return not code
216
217
tandrii2a16b952016-10-19 07:09:44 -0700218def time_sleep(seconds):
219 # Use this so that it can be mocked in tests without interfering with python
220 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700221 return time.sleep(seconds)
222
223
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000224def time_time():
225 # Use this so that it can be mocked in tests without interfering with python
226 # system machinery.
227 return time.time()
228
229
Edward Lemur1b52d872019-05-09 21:12:12 +0000230def datetime_now():
231 # Use this so that it can be mocked in tests without interfering with python
232 # system machinery.
233 return datetime.datetime.now()
234
235
Edward Lemur1a83da12020-03-04 21:18:36 +0000236def _raw_input(message):
237 # Use this so that it can be mocked in tests on Python 2 and 3.
238 if sys.version_info.major == 2:
239 return raw_input(message)
240 return input(message)
241
242
maruel@chromium.org90541732011-04-01 17:54:18 +0000243def ask_for_data(prompt):
244 try:
Edward Lemur1a83da12020-03-04 21:18:36 +0000245 return _raw_input(prompt)
maruel@chromium.org90541732011-04-01 17:54:18 +0000246 except KeyboardInterrupt:
247 # Hide the exception.
248 sys.exit(1)
249
250
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100251def confirm_or_exit(prefix='', action='confirm'):
252 """Asks user to press enter to continue or press Ctrl+C to abort."""
253 if not prefix or prefix.endswith('\n'):
254 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100255 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100256 mid = ' Press'
257 elif prefix.endswith(' '):
258 mid = 'press'
259 else:
260 mid = ' press'
261 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
262
263
264def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000265 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100266 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
267 while True:
268 if 'yes'.startswith(result):
269 return True
270 if 'no'.startswith(result):
271 return False
272 result = ask_for_data('Please, type yes or no: ').lower()
273
274
tandrii5d48c322016-08-18 16:19:37 -0700275def _git_branch_config_key(branch, key):
276 """Helper method to return Git config key for a branch."""
277 assert branch, 'branch name is required to set git config for it'
278 return 'branch.%s.%s' % (branch, key)
279
280
machenbach@chromium.org45453142015-09-15 08:45:22 +0000281def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000282 prop_list = getattr(options, 'properties', [])
283 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000284 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000285 try:
286 properties[key] = json.loads(val)
287 except ValueError:
288 pass # If a value couldn't be evaluated, treat it as a string.
289 return properties
290
291
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000292# TODO(crbug.com/976104): Remove this function once git-cl try-results has
293# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000294def _buildbucket_retry(operation_name, http, *args, **kwargs):
295 """Retries requests to buildbucket service and returns parsed json content."""
296 try_count = 0
297 while True:
298 response, content = http.request(*args, **kwargs)
299 try:
300 content_json = json.loads(content)
301 except ValueError:
302 content_json = None
303
304 # Buildbucket could return an error even if status==200.
305 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000306 error = content_json.get('error')
307 if error.get('code') == 403:
308 raise BuildbucketResponseException(
309 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000310 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000311 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000312 raise BuildbucketResponseException(msg)
313
314 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700315 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000316 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000317 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700318 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000319 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000320 content)
321 return content_json
322 if response.status < 500 or try_count >= 2:
323 raise httplib2.HttpLib2Error(content)
324
325 # status >= 500 means transient failures.
326 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000327 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000328 try_count += 1
329 assert False, 'unreachable'
330
331
Edward Lemur4c707a22019-09-24 21:13:43 +0000332def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333 """Calls a buildbucket v2 method and returns the parsed json response."""
334 headers = {
335 'Accept': 'application/json',
336 'Content-Type': 'application/json',
337 }
338 request = json.dumps(request)
339 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
340
341 logging.info('POST %s with %s' % (url, request))
342
343 attempts = 1
344 time_to_sleep = 1
345 while True:
346 response, content = http.request(url, 'POST', body=request, headers=headers)
347 if response.status == 200:
348 return json.loads(content[4:])
349 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
350 msg = '%s error when calling POST %s with %s: %s' % (
351 response.status, url, request, content)
352 raise BuildbucketResponseException(msg)
353 logging.debug(
354 '%s error when calling POST %s with %s. '
355 'Sleeping for %d seconds and retrying...' % (
356 response.status, url, request, time_to_sleep))
357 time.sleep(time_to_sleep)
358 time_to_sleep *= 2
359 attempts += 1
360
361 assert False, 'unreachable'
362
363
Edward Lemur6215c792019-10-03 21:59:05 +0000364def _parse_bucket(raw_bucket):
365 legacy = True
366 project = bucket = None
367 if '/' in raw_bucket:
368 legacy = False
369 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000370 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000371 elif raw_bucket.startswith('luci.'):
372 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000374 elif '.' in raw_bucket:
375 project = raw_bucket.split('.')[0]
376 bucket = raw_bucket
377 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000378 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000379 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
380 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381
382
Quinten Yearsley777660f2020-03-04 23:37:06 +0000383def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000384 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700385
386 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000387 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000388 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700389 options: Command-line options.
390 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000391 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000392 for project, bucket, builder in jobs:
393 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000394 print('To see results here, run: git cl try-results')
395 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700396
Quinten Yearsley777660f2020-03-04 23:37:06 +0000397 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000398 if not requests:
399 return
400
Edward Lemur5b929a42019-10-21 17:57:39 +0000401 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000402 http.force_exception_to_status_code = True
403
404 batch_request = {'requests': requests}
405 batch_response = _call_buildbucket(
406 http, options.buildbucket_host, 'Batch', batch_request)
407
408 errors = [
409 ' ' + response['error']['message']
410 for response in batch_response.get('responses', [])
411 if 'error' in response
412 ]
413 if errors:
414 raise BuildbucketResponseException(
415 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
416
417
Quinten Yearsley777660f2020-03-04 23:37:06 +0000418def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000419 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000420 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000421 shared_properties = {
422 'category': options.ensure_value('category', 'git_cl_try')
423 }
424 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425 shared_properties['clobber'] = True
426 shared_properties.update(_get_properties_from_options(options) or {})
427
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000428 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000429 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000430 shared_tags.append({'key': 'retry_failed',
431 'value': '1'})
432
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000433 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000434 for (project, bucket, builder) in jobs:
435 properties = shared_properties.copy()
436 if 'presubmit' in builder.lower():
437 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000438
Edward Lemur45768512020-03-02 19:03:14 +0000439 requests.append({
440 'scheduleBuild': {
441 'requestId': str(uuid.uuid4()),
442 'builder': {
443 'project': getattr(options, 'project', None) or project,
444 'bucket': bucket,
445 'builder': builder,
446 },
447 'gerritChanges': gerrit_changes,
448 'properties': properties,
449 'tags': [
450 {'key': 'builder', 'value': builder},
451 ] + shared_tags,
452 }
453 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000454
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000455 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000456 requests[-1]['scheduleBuild']['gitilesCommit'] = {
457 'host': gerrit_changes[0]['host'],
458 'project': gerrit_changes[0]['project'],
459 'id': options.revision
460 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000461
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000462 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000463
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000464
Quinten Yearsley777660f2020-03-04 23:37:06 +0000465def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000466 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000467
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000468 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000469 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000470 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000471 request = {
472 'predicate': {
473 'gerritChanges': [changelist.GetGerritChange(patchset)],
474 },
475 'fields': ','.join('builds.*.' + field for field in fields),
476 }
tandrii221ab252016-10-06 08:12:04 -0700477
Edward Lemur5b929a42019-10-21 17:57:39 +0000478 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000479 if authenticator.has_cached_credentials():
480 http = authenticator.authorize(httplib2.Http())
481 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700482 print('Warning: Some results might be missing because %s' %
483 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000484 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000485 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000486 http.force_exception_to_status_code = True
487
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000488 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
489 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000490
Edward Lemur45768512020-03-02 19:03:14 +0000491
Edward Lemur5b929a42019-10-21 17:57:39 +0000492def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 """Fetches builds from the latest patchset that has builds (within
494 the last few patchsets).
495
496 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000497 changelist (Changelist): The CL to fetch builds for
498 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000499 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
500 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000501 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000502 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
503 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000504 """
505 assert buildbucket_host
506 assert changelist.GetIssue(), 'CL must be uploaded first'
507 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000508 if latest_patchset is None:
509 assert changelist.GetMostRecentPatchset()
510 ps = changelist.GetMostRecentPatchset()
511 else:
512 assert latest_patchset > 0, latest_patchset
513 ps = latest_patchset
514
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515 min_ps = max(1, ps - 5)
516 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000517 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000518 if len(builds):
519 return builds, ps
520 ps -= 1
521 return [], 0
522
523
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000524def _filter_failed_for_retry(all_builds):
525 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000526
527 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000528 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000529 i.e. a list of buildbucket.v2.Builds which includes status and builder
530 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000531
532 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000533 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000534 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000535 """
Edward Lemur45768512020-03-02 19:03:14 +0000536 grouped = {}
537 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000538 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000539 key = (builder['project'], builder['bucket'], builder['builder'])
540 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000541
Edward Lemur45768512020-03-02 19:03:14 +0000542 jobs = []
543 for (project, bucket, builder), builds in grouped.items():
544 if 'triggered' in builder:
545 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
546 'from a parent. Please schedule a manual job for the parent '
547 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000548 continue
549 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
550 # Don't retry if any are running.
551 continue
Edward Lemur45768512020-03-02 19:03:14 +0000552 # If builder had several builds, retry only if the last one failed.
553 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
554 # build, but in case of retrying failed jobs retrying a flaky one makes
555 # sense.
556 builds = sorted(builds, key=lambda b: b['createTime'])
557 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
558 continue
559 # Don't retry experimental build previously triggered by CQ.
560 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
561 for t in builds[-1]['tags']):
562 continue
563 jobs.append((project, bucket, builder))
564
565 # Sort the jobs to make testing easier.
566 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000567
568
Quinten Yearsley777660f2020-03-04 23:37:06 +0000569def _print_tryjobs(options, builds):
570 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000571 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000572 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000573 return
574
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000575 longest_builder = max(len(b['builder']['builder']) for b in builds)
576 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
579 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000581 builds_by_status = {}
582 for b in builds:
583 builds_by_status.setdefault(b['status'], []).append({
584 'id': b['id'],
585 'name': name_fmt.format(
586 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
587 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000589 sort_key = lambda b: (b['name'], b['id'])
590
591 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 if not builds:
594 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000596 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000597 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000598 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000599 else:
600 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
601
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 print(colorize(title))
603 for b in sorted(builds, key=sort_key):
604 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000605
606 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000607 print_builds(
608 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
609 print_builds(
610 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
611 color=Fore.MAGENTA)
612 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
613 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
614 color=Fore.MAGENTA)
615 print_builds('Started:', builds_by_status.pop('STARTED', []))
616 print_builds(
617 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000618 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000619 print_builds(
620 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000621 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000622
623
Aiden Bennerc08566e2018-10-03 17:52:42 +0000624def _ComputeDiffLineRanges(files, upstream_commit):
625 """Gets the changed line ranges for each file since upstream_commit.
626
627 Parses a git diff on provided files and returns a dict that maps a file name
628 to an ordered list of range tuples in the form (start_line, count).
629 Ranges are in the same format as a git diff.
630 """
631 # If files is empty then diff_output will be a full diff.
632 if len(files) == 0:
633 return {}
634
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000635 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000636 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000637 diff_output = RunGit(diff_cmd)
638
639 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
640 # 2 capture groups
641 # 0 == fname of diff file
642 # 1 == 'diff_start,diff_count' or 'diff_start'
643 # will match each of
644 # diff --git a/foo.foo b/foo.py
645 # @@ -12,2 +14,3 @@
646 # @@ -12,2 +17 @@
647 # running re.findall on the above string with pattern will give
648 # [('foo.py', ''), ('', '14,3'), ('', '17')]
649
650 curr_file = None
651 line_diffs = {}
652 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
653 if match[0] != '':
654 # Will match the second filename in diff --git a/a.py b/b.py.
655 curr_file = match[0]
656 line_diffs[curr_file] = []
657 else:
658 # Matches +14,3
659 if ',' in match[1]:
660 diff_start, diff_count = match[1].split(',')
661 else:
662 # Single line changes are of the form +12 instead of +12,1.
663 diff_start = match[1]
664 diff_count = 1
665
666 diff_start = int(diff_start)
667 diff_count = int(diff_count)
668
669 # If diff_count == 0 this is a removal we can ignore.
670 line_diffs[curr_file].append((diff_start, diff_count))
671
672 return line_diffs
673
674
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000675def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676 """Checks if a yapf file is in any parent directory of fpath until top_dir.
677
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000678 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000679 is found returns None. Uses yapf_config_cache as a cache for previously found
680 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000681 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000682 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000683 # Return result if we've already computed it.
684 if fpath in yapf_config_cache:
685 return yapf_config_cache[fpath]
686
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000687 parent_dir = os.path.dirname(fpath)
688 if os.path.isfile(fpath):
689 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000690 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000691 # Otherwise fpath is a directory
692 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
693 if os.path.isfile(yapf_file):
694 ret = yapf_file
695 elif fpath == top_dir or parent_dir == fpath:
696 # If we're at the top level directory, or if we're at root
697 # there is no provided style.
698 ret = None
699 else:
700 # Otherwise recurse on the current directory.
701 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000702 yapf_config_cache[fpath] = ret
703 return ret
704
705
Brian Sheedyb4307d52019-12-02 19:18:17 +0000706def _GetYapfIgnorePatterns(top_dir):
707 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000708
709 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
710 but this functionality appears to break when explicitly passing files to
711 yapf for formatting. According to
712 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
713 the .yapfignore file should be in the directory that yapf is invoked from,
714 which we assume to be the top level directory in this case.
715
716 Args:
717 top_dir: The top level directory for the repository being formatted.
718
719 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000720 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000721 """
722 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000723 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000724 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000725 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000726
Brian Sheedyb4307d52019-12-02 19:18:17 +0000727 with open(yapfignore_file) as f:
728 for line in f.readlines():
729 stripped_line = line.strip()
730 # Comments and blank lines should be ignored.
731 if stripped_line.startswith('#') or stripped_line == '':
732 continue
733 ignore_patterns.add(stripped_line)
734 return ignore_patterns
735
736
737def _FilterYapfIgnoredFiles(filepaths, patterns):
738 """Filters out any filepaths that match any of the given patterns.
739
740 Args:
741 filepaths: An iterable of strings containing filepaths to filter.
742 patterns: An iterable of strings containing fnmatch patterns to filter on.
743
744 Returns:
745 A list of strings containing all the elements of |filepaths| that did not
746 match any of the patterns in |patterns|.
747 """
748 # Not inlined so that tests can use the same implementation.
749 return [f for f in filepaths
750 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000751
752
Aaron Gable13101a62018-02-09 13:20:41 -0800753def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 """Prints statistics about the change to the user."""
755 # --no-ext-diff is broken in some versions of Git, so try to work around
756 # this by overriding the environment (but there is still a problem if the
757 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000758 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000759 if 'GIT_EXTERNAL_DIFF' in env:
760 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000761
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000762 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800763 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000764 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000765
766
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000767class BuildbucketResponseException(Exception):
768 pass
769
770
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000771class Settings(object):
772 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000773 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000774 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775 self.tree_status_url = None
776 self.viewvc_url = None
777 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000778 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000779 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000780 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000781 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000782 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783
Edward Lemur26964072020-02-19 19:18:51 +0000784 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000785 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000786 if self.updated:
787 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788
Edward Lemur26964072020-02-19 19:18:51 +0000789 # The only value that actually changes the behavior is
790 # autoupdate = "false". Everything else means "true".
791 autoupdate = (
792 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
793
794 cr_settings_file = FindCodereviewSettingsFile()
795 if autoupdate != 'false' and cr_settings_file:
796 LoadCodereviewSettingsFromFile(cr_settings_file)
797 cr_settings_file.close()
798
799 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000801 @staticmethod
802 def GetRelativeRoot():
803 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000804
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000806 if self.root is None:
807 self.root = os.path.abspath(self.GetRelativeRoot())
808 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 def GetTreeStatusUrl(self, error_ok=False):
811 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000812 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
813 if self.tree_status_url is None and not error_ok:
814 DieWithError(
815 'You must configure your tree status URL by running '
816 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000817 return self.tree_status_url
818
819 def GetViewVCUrl(self):
820 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000821 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822 return self.viewvc_url
823
rmistry@google.com90752582014-01-14 21:04:50 +0000824 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000825 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000826
rmistry@google.com5626a922015-02-26 14:03:30 +0000827 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000828 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000829 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000830 return run_post_upload_hook == "True"
831
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000832 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000833 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000834
ukai@chromium.orge8077812012-02-03 03:41:46 +0000835 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000836 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000837 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000838 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000839 return self.is_gerrit
840
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000841 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000842 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000843 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700844 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000845 if self.squash_gerrit_uploads is None:
846 # Default is squash now (http://crbug.com/611892#c23).
847 self.squash_gerrit_uploads = self._GetConfig(
848 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000849 return self.squash_gerrit_uploads
850
tandriia60502f2016-06-20 02:01:53 -0700851 def GetSquashGerritUploadsOverride(self):
852 """Return True or False if codereview.settings should be overridden.
853
854 Returns None if no override has been defined.
855 """
856 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000857 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700858 if result == 'true':
859 return True
860 if result == 'false':
861 return False
862 return None
863
tandrii@chromium.org28253532016-04-14 13:46:56 +0000864 def GetGerritSkipEnsureAuthenticated(self):
865 """Return True if EnsureAuthenticated should not be done for Gerrit
866 uploads."""
867 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000868 self.gerrit_skip_ensure_authenticated = self._GetConfig(
869 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000870 return self.gerrit_skip_ensure_authenticated
871
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000872 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000873 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000874 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000875 # Git requires single quotes for paths with spaces. We need to replace
876 # them with double quotes for Windows to treat such paths as a single
877 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000878 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000879 return self.git_editor or None
880
thestig@chromium.org44202a22014-03-11 19:22:18 +0000881 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000882 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000883
884 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000885 return self._GetConfig(
886 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000887
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000888 def GetFormatFullByDefault(self):
889 if self.format_full_by_default is None:
890 result = (
891 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
892 error_ok=True).strip())
893 self.format_full_by_default = (result == 'true')
894 return self.format_full_by_default
895
Edward Lemur26964072020-02-19 19:18:51 +0000896 def _GetConfig(self, key, default=''):
897 self._LazyUpdateIfNeeded()
898 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000899
900
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000901class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000902 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000903 NONE = 'none'
904 DRY_RUN = 'dry_run'
905 COMMIT = 'commit'
906
907 ALL_STATES = [NONE, DRY_RUN, COMMIT]
908
909
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000910class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000911 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000912 self.issue = issue
913 self.patchset = patchset
914 self.hostname = hostname
915
916 @property
917 def valid(self):
918 return self.issue is not None
919
920
Edward Lemurf38bc172019-09-03 21:02:13 +0000921def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000922 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
923 fail_result = _ParsedIssueNumberArgument()
924
Edward Lemur678a6842019-10-03 22:25:05 +0000925 if isinstance(arg, int):
926 return _ParsedIssueNumberArgument(issue=arg)
927 if not isinstance(arg, basestring):
928 return fail_result
929
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000930 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000931 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000932 if not arg.startswith('http'):
933 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700934
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000935 url = gclient_utils.UpgradeToHttps(arg)
936 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000937 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000938 except ValueError:
939 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200940
Edward Lemur678a6842019-10-03 22:25:05 +0000941 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
942 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
943 # Short urls like https://domain/<issue_number> can be used, but don't allow
944 # specifying the patchset (you'd 404), but we allow that here.
945 if parsed_url.path == '/':
946 part = parsed_url.fragment
947 else:
948 part = parsed_url.path
949
950 match = re.match(
951 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
952 if not match:
953 return fail_result
954
955 issue = int(match.group('issue'))
956 patchset = match.group('patchset')
957 return _ParsedIssueNumberArgument(
958 issue=issue,
959 patchset=int(patchset) if patchset else None,
960 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000961
962
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000963def _create_description_from_log(args):
964 """Pulls out the commit log to use as a base for the CL description."""
965 log_args = []
966 if len(args) == 1 and not args[0].endswith('.'):
967 log_args = [args[0] + '..']
968 elif len(args) == 1 and args[0].endswith('...'):
969 log_args = [args[0][:-1]]
970 elif len(args) == 2:
971 log_args = [args[0] + '..' + args[1]]
972 else:
973 log_args = args[:] # Hope for the best!
Edward Lemura12175c2020-03-09 16:58:26 +0000974 return RunGit(['log', '--pretty=format:%s%n%n%b'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000975
976
Aaron Gablea45ee112016-11-22 15:14:38 -0800977class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700978 def __init__(self, issue, url):
979 self.issue = issue
980 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800981 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700982
983 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800984 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700985 self.issue, self.url)
986
987
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100988_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000989 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100990 # TODO(tandrii): these two aren't known in Gerrit.
991 'approval', 'disapproval'])
992
993
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000994class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000995 """Changelist works with one changelist in local branch.
996
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000997 Notes:
998 * Not safe for concurrent multi-{thread,process} use.
999 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001000 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001001 """
1002
Edward Lemur125d60a2019-09-13 18:25:41 +00001003 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001004 """Create a new ChangeList instance.
1005
Edward Lemurf38bc172019-09-03 21:02:13 +00001006 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001007 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001009 global settings
1010 if not settings:
1011 # Happens when git_cl.py is used as a utility library.
1012 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001013
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001014 self.branchref = branchref
1015 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001016 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001017 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018 else:
1019 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001020 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001021 self.lookedup_issue = False
1022 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001024 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001026 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001027 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001028 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001029 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001030
Edward Lemur125d60a2019-09-13 18:25:41 +00001031 # Lazily cached values.
1032 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1033 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1034 # Map from change number (issue) to its detail cache.
1035 self._detail_cache = {}
1036
1037 if codereview_host is not None:
1038 assert not codereview_host.startswith('https://'), codereview_host
1039 self._gerrit_host = codereview_host
1040 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001041
1042 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001043 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001044
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001045 The return value is a string suitable for passing to git cl with the --cc
1046 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001047 """
1048 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001049 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001050 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001051 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1052 return self.cc
1053
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001054 def GetCCListWithoutDefault(self):
1055 """Return the users cc'd on this CL excluding default ones."""
1056 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001057 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001058 return self.cc
1059
Daniel Cheng7227d212017-11-17 08:12:37 -08001060 def ExtendCC(self, more_cc):
1061 """Extends the list of users to cc on this CL based on the changed files."""
1062 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001063
1064 def GetBranch(self):
1065 """Returns the short branch name, e.g. 'master'."""
1066 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001067 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001068 if not branchref:
1069 return None
1070 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001071 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001072 return self.branch
1073
1074 def GetBranchRef(self):
1075 """Returns the full branch name, e.g. 'refs/heads/master'."""
1076 self.GetBranch() # Poke the lazy loader.
1077 return self.branchref
1078
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001079 def ClearBranch(self):
1080 """Clears cached branch data of this object."""
1081 self.branch = self.branchref = None
1082
Edward Lemur85153282020-02-14 22:06:29 +00001083 def _GitGetBranchConfigValue(self, key, default=None):
1084 return scm.GIT.GetBranchConfig(
1085 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001086
Edward Lemur85153282020-02-14 22:06:29 +00001087 def _GitSetBranchConfigValue(self, key, value):
1088 action = 'set %s to %r' % (key, value)
1089 if not value:
1090 action = 'unset %s' % key
1091 assert self.GetBranch(), 'a branch is needed to ' + action
1092 return scm.GIT.SetBranchConfig(
1093 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001094
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001095 @staticmethod
1096 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001097 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098 e.g. 'origin', 'refs/heads/master'
1099 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001100 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1101 settings.GetRoot(), branch)
1102 if not remote or not upstream_branch:
1103 DieWithError(
1104 'Unable to determine default branch to diff against.\n'
1105 'Either pass complete "git diff"-style arguments, like\n'
1106 ' git cl upload origin/master\n'
1107 'or verify this branch is set up to track another \n'
1108 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109
1110 return remote, upstream_branch
1111
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001112 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001113 upstream_branch = self.GetUpstreamBranch()
1114 if not BranchExists(upstream_branch):
1115 DieWithError('The upstream for the current branch (%s) does not exist '
1116 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001117 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001118 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001119
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 def GetUpstreamBranch(self):
1121 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001122 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001123 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001124 upstream_branch = upstream_branch.replace('refs/heads/',
1125 'refs/remotes/%s/' % remote)
1126 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1127 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128 self.upstream_branch = upstream_branch
1129 return self.upstream_branch
1130
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001131 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001132 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001133 remote, branch = None, self.GetBranch()
1134 seen_branches = set()
1135 while branch not in seen_branches:
1136 seen_branches.add(branch)
1137 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001138 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001139 if remote != '.' or branch.startswith('refs/remotes'):
1140 break
1141 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001142 remotes = RunGit(['remote'], error_ok=True).split()
1143 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001144 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001145 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001146 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001147 logging.warn('Could not determine which remote this change is '
1148 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001149 else:
1150 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001151 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001152 branch = 'HEAD'
1153 if branch.startswith('refs/remotes'):
1154 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001155 elif branch.startswith('refs/branch-heads/'):
1156 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001157 else:
1158 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001159 return self._remote
1160
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001161 def GitSanityChecks(self, upstream_git_obj):
1162 """Checks git repo status and ensures diff is from local commits."""
1163
sbc@chromium.org79706062015-01-14 21:18:12 +00001164 if upstream_git_obj is None:
1165 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001166 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001167 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001168 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001169 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001170 return False
1171
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 # Verify the commit we're diffing against is in our current branch.
1173 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1174 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1175 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001176 print('ERROR: %s is not in the current branch. You may need to rebase '
1177 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 return False
1179
1180 # List the commits inside the diff, and verify they are all local.
1181 commits_in_diff = RunGit(
1182 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1183 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1184 remote_branch = remote_branch.strip()
1185 if code != 0:
1186 _, remote_branch = self.GetRemoteBranch()
1187
1188 commits_in_remote = RunGit(
1189 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1190
1191 common_commits = set(commits_in_diff) & set(commits_in_remote)
1192 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001193 print('ERROR: Your diff contains %d commits already in %s.\n'
1194 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1195 'the diff. If you are using a custom git flow, you can override'
1196 ' the reference used for this check with "git config '
1197 'gitcl.remotebranch <git-ref>".' % (
1198 len(common_commits), remote_branch, upstream_git_obj),
1199 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001200 return False
1201 return True
1202
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001203 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001204 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001205
1206 Returns None if it is not set.
1207 """
tandrii5d48c322016-08-18 16:19:37 -07001208 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001209
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001210 def GetRemoteUrl(self):
1211 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1212
1213 Returns None if there is no remote.
1214 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001215 is_cached, value = self._cached_remote_url
1216 if is_cached:
1217 return value
1218
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001219 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001220 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001221
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001223 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001224 if host:
1225 self._cached_remote_url = (True, url)
1226 return url
1227
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001228 # If it cannot be parsed as an url, assume it is a local directory,
1229 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001230 logging.warning('"%s" doesn\'t appear to point to a git host. '
1231 'Interpreting it as a local directory.', url)
1232 if not os.path.isdir(url):
1233 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001234 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1235 'but it doesn\'t exist.',
1236 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001237 return None
1238
1239 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001240 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001241
Edward Lemur79d4f992019-11-11 23:49:02 +00001242 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001243 if not host:
1244 logging.error(
1245 'Remote "%(remote)s" for branch "%(branch)s" points to '
1246 '"%(cache_path)s", but it is misconfigured.\n'
1247 '"%(cache_path)s" must be a git repo and must have a remote named '
1248 '"%(remote)s" pointing to the git host.', {
1249 'remote': remote,
1250 'cache_path': cache_path,
1251 'branch': self.GetBranch()})
1252 return None
1253
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001254 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001255 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001256
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001257 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001258 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001259 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001260 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1261 if self.issue is not None:
1262 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001263 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001264 return self.issue
1265
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001266 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001268 issue = self.GetIssue()
1269 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001270 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001271 server = self.GetCodereviewServer()
1272 if short:
1273 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1274 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001275
Edward Lemur6c6827c2020-02-06 21:15:18 +00001276 def FetchDescription(self, pretty=False):
1277 assert self.GetIssue(), 'issue is required to query Gerrit'
1278
Edward Lemur9aa1a962020-02-25 00:58:38 +00001279 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001280 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1281 current_rev = data['current_revision']
1282 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001283
1284 if not pretty:
1285 return self.description
1286
1287 # Set width to 72 columns + 2 space indent.
1288 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1289 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1290 lines = self.description.splitlines()
1291 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292
1293 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001294 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001295 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001296 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1297 if self.patchset is not None:
1298 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001299 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300 return self.patchset
1301
Edward Lemur9aa1a962020-02-25 00:58:38 +00001302 def GetAuthor(self):
1303 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1304
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001305 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001306 """Set this branch's patchset. If patchset=0, clears the patchset."""
1307 assert self.GetBranch()
1308 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001309 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001310 else:
1311 self.patchset = int(patchset)
1312 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001313 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001314
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001315 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001316 """Set this branch's issue. If issue isn't given, clears the issue."""
1317 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001318 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001319 issue = int(issue)
1320 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001321 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001322 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001323 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001324 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001325 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001326 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001327 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001328 else:
tandrii5d48c322016-08-18 16:19:37 -07001329 # Reset all of these just to be clean.
1330 reset_suffixes = [
1331 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001332 self.IssueConfigKey(),
1333 self.PatchsetConfigKey(),
1334 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001335 ] + self._PostUnsetIssueProperties()
1336 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001337 try:
1338 self._GitSetBranchConfigValue(prop, None)
1339 except subprocess2.CalledProcessError:
1340 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001341 msg = RunGit(['log', '-1', '--format=%B']).strip()
1342 if msg and git_footers.get_footer_change_id(msg):
1343 print('WARNING: The change patched into this branch has a Change-Id. '
1344 'Removing it.')
1345 RunGit(['commit', '--amend', '-m',
1346 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001347 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001348 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001349 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001350
Edward Lemur2c62b332020-03-12 22:12:33 +00001351 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001352 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001353 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001354 except subprocess2.CalledProcessError:
1355 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001356 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001357 'This branch probably doesn\'t exist anymore. To reset the\n'
1358 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001359 ' git branch --set-upstream-to origin/master %s\n'
1360 'or replace origin/master with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001361 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001362
dsansomee2d6fd92016-09-08 00:10:47 -07001363 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001364 assert self.GetIssue(), 'issue is required to update description'
1365
1366 if gerrit_util.HasPendingChangeEdit(
1367 self._GetGerritHost(), self._GerritChangeIdentifier()):
1368 if not force:
1369 confirm_or_exit(
1370 'The description cannot be modified while the issue has a pending '
1371 'unpublished edit. Either publish the edit in the Gerrit web UI '
1372 'or delete it.\n\n', action='delete the unpublished edit')
1373
1374 gerrit_util.DeletePendingChangeEdit(
1375 self._GetGerritHost(), self._GerritChangeIdentifier())
1376 gerrit_util.SetCommitMessage(
1377 self._GetGerritHost(), self._GerritChangeIdentifier(),
1378 description, notify='NONE')
1379
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001380 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001381
Edward Lemur75526302020-02-27 22:31:05 +00001382 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001383 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001384 '--root', settings.GetRoot(),
1385 '--upstream', upstream,
1386 ]
1387
1388 args.extend(['--verbose'] * verbose)
1389
Edward Lemur99df04e2020-03-05 19:39:43 +00001390 author = self.GetAuthor()
1391 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001392 issue = self.GetIssue()
1393 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001394 if author:
1395 args.extend(['--author', author])
1396 if gerrit_url:
1397 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001398 if issue:
1399 args.extend(['--issue', str(issue)])
1400 if patchset:
1401 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001402
Edward Lemur75526302020-02-27 22:31:05 +00001403 return args
1404
1405 def RunHook(
1406 self, committing, may_prompt, verbose, parallel, upstream, description,
1407 all_files):
1408 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1409 args = self._GetCommonPresubmitArgs(verbose, upstream)
1410 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001411 if may_prompt:
1412 args.append('--may_prompt')
1413 if parallel:
1414 args.append('--parallel')
1415 if all_files:
1416 args.append('--all_files')
1417
1418 with gclient_utils.temporary_file() as description_file:
1419 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001420
1421 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001422 args.extend(['--json_output', json_output])
1423 args.extend(['--description_file', description_file])
1424
1425 start = time_time()
1426 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1427 exit_code = p.wait()
1428 metrics.collector.add_repeated('sub_commands', {
1429 'command': 'presubmit',
1430 'execution_time': time_time() - start,
1431 'exit_code': exit_code,
1432 })
1433
1434 if exit_code:
1435 sys.exit(exit_code)
1436
1437 json_results = gclient_utils.FileRead(json_output)
1438 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001439
Edward Lemur75526302020-02-27 22:31:05 +00001440 def RunPostUploadHook(self, verbose, upstream, description):
1441 args = self._GetCommonPresubmitArgs(verbose, upstream)
1442 args.append('--post_upload')
1443
1444 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001445 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001446 args.extend(['--description_file', description_file])
1447 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1448 p.wait()
1449
Edward Lemur5a644f82020-03-18 16:44:57 +00001450 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1451 # Get description message for upload.
1452 if self.GetIssue():
1453 description = self.FetchDescription()
1454 elif options.message:
1455 description = options.message
1456 else:
1457 description = _create_description_from_log(git_diff_args)
1458 if options.title and options.squash:
1459 description = options.title + '\n\n' + message
1460
1461 # Extract bug number from branch name.
1462 bug = options.bug
1463 fixed = options.fixed
1464 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1465 self.GetBranch())
1466 if not bug and not fixed and match:
1467 if match.group('type') == 'bug':
1468 bug = match.group('bugnum')
1469 else:
1470 fixed = match.group('bugnum')
1471
1472 change_description = ChangeDescription(description, bug, fixed)
1473
1474 # Set the reviewer list now so that presubmit checks can access it.
1475 if options.reviewers or options.tbrs or options.add_owners_to:
1476 change_description.update_reviewers(
1477 options.reviewers, options.tbrs, options.add_owners_to, files,
1478 self.GetAuthor())
1479
1480 return change_description
1481
1482 def _GetTitleForUpload(self, options):
1483 # When not squashing, just return options.title.
1484 if not options.squash:
1485 return options.title
1486
1487 # On first upload, patchset title is always this string, while options.title
1488 # gets converted to first line of message.
1489 if not self.GetIssue():
1490 return 'Initial upload'
1491
1492 # When uploading subsequent patchsets, options.message is taken as the title
1493 # if options.title is not provided.
1494 if options.title:
1495 return options.title
1496 if options.message:
1497 return options.message.strip()
1498
1499 # Use the subject of the last commit as title by default.
1500 title = RunGit(
1501 ['show', '-s', '--format=%s', 'HEAD']).strip()
1502 if options.force:
1503 return title
1504 return ask_for_data('Title for patchset [%s]: ' % title) or title
1505
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001506 def CMDUpload(self, options, git_diff_args, orig_args):
1507 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001508 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001509 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001510 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001511 else:
1512 if self.GetBranch() is None:
1513 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1514
1515 # Default to diffing against common ancestor of upstream branch
1516 base_branch = self.GetCommonAncestorWithUpstream()
1517 git_diff_args = [base_branch, 'HEAD']
1518
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001519 # Fast best-effort checks to abort before running potentially expensive
1520 # hooks if uploading is likely to fail anyway. Passing these checks does
1521 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001522 self.EnsureAuthenticated(force=options.force)
1523 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001524
1525 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001526 watchlist = watchlists.Watchlists(settings.GetRoot())
1527 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001528 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001529 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001530
Edward Lemur5a644f82020-03-18 16:44:57 +00001531 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001532 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001533 hook_results = self.RunHook(
1534 committing=False,
1535 may_prompt=not options.force,
1536 verbose=options.verbose,
1537 parallel=options.parallel,
1538 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001539 description=change_desc.description,
Edward Lemur2c62b332020-03-12 22:12:33 +00001540 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001541 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001542
Aaron Gable13101a62018-02-09 13:20:41 -08001543 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001544 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001545 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001546 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001547 self._GitSetBranchConfigValue(
1548 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001549 # Run post upload hooks, if specified.
1550 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001551 self.RunPostUploadHook(
1552 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001553
1554 # Upload all dependencies if specified.
1555 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001556 print()
1557 print('--dependencies has been specified.')
1558 print('All dependent local branches will be re-uploaded.')
1559 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001560 # Remove the dependencies flag from args so that we do not end up in a
1561 # loop.
1562 orig_args.remove('--dependencies')
1563 ret = upload_branch_deps(self, orig_args)
1564 return ret
1565
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001566 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001567 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001568
1569 Issue must have been already uploaded and known.
1570 """
1571 assert new_state in _CQState.ALL_STATES
1572 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001573 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001574 vote_map = {
1575 _CQState.NONE: 0,
1576 _CQState.DRY_RUN: 1,
1577 _CQState.COMMIT: 2,
1578 }
1579 labels = {'Commit-Queue': vote_map[new_state]}
1580 notify = False if new_state == _CQState.DRY_RUN else None
1581 gerrit_util.SetReview(
1582 self._GetGerritHost(), self._GerritChangeIdentifier(),
1583 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001584 return 0
1585 except KeyboardInterrupt:
1586 raise
1587 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001588 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001589 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001590 ' * Your project has no CQ,\n'
1591 ' * You don\'t have permission to change the CQ state,\n'
1592 ' * There\'s a bug in this code (see stack trace below).\n'
1593 'Consider specifying which bots to trigger manually or asking your '
1594 'project owners for permissions or contacting Chrome Infra at:\n'
1595 'https://www.chromium.org/infra\n\n' %
1596 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001597 # Still raise exception so that stack trace is printed.
1598 raise
1599
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001600 def _GetGerritHost(self):
1601 # Lazy load of configs.
1602 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001603 if self._gerrit_host and '.' not in self._gerrit_host:
1604 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1605 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001606 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001607 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001608 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001609 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001610 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1611 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001612 return self._gerrit_host
1613
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001614 def _GetGitHost(self):
1615 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001616 remote_url = self.GetRemoteUrl()
1617 if not remote_url:
1618 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001619 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001620
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001621 def GetCodereviewServer(self):
1622 if not self._gerrit_server:
1623 # If we're on a branch then get the server potentially associated
1624 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001625 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001626 self._gerrit_server = self._GitGetBranchConfigValue(
1627 self.CodereviewServerConfigKey())
1628 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001629 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001630 if not self._gerrit_server:
1631 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1632 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001633 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001634 parts[0] = parts[0] + '-review'
1635 self._gerrit_host = '.'.join(parts)
1636 self._gerrit_server = 'https://%s' % self._gerrit_host
1637 return self._gerrit_server
1638
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001639 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001640 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001641 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001642 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001643 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001644 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001645 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001646 if project.endswith('.git'):
1647 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001648 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1649 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1650 # gitiles/git-over-https protocol. E.g.,
1651 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1652 # as
1653 # https://chromium.googlesource.com/v8/v8
1654 if project.startswith('a/'):
1655 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001656 return project
1657
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001658 def _GerritChangeIdentifier(self):
1659 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1660
1661 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001662 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001663 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001664 project = self._GetGerritProject()
1665 if project:
1666 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1667 # Fall back on still unique, but less efficient change number.
1668 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001669
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001670 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001671 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001672 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001673
tandrii5d48c322016-08-18 16:19:37 -07001674 @classmethod
1675 def PatchsetConfigKey(cls):
1676 return 'gerritpatchset'
1677
1678 @classmethod
1679 def CodereviewServerConfigKey(cls):
1680 return 'gerritserver'
1681
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001682 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001683 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001684 if settings.GetGerritSkipEnsureAuthenticated():
1685 # For projects with unusual authentication schemes.
1686 # See http://crbug.com/603378.
1687 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001688
1689 # Check presence of cookies only if using cookies-based auth method.
1690 cookie_auth = gerrit_util.Authenticator.get()
1691 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001692 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001693
Florian Mayerae510e82020-01-30 21:04:48 +00001694 remote_url = self.GetRemoteUrl()
1695 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001696 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001697 return
1698 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001699 logging.warning('Ignoring branch %(branch)s with non-https remote '
1700 '%(remote)s', {
1701 'branch': self.branch,
1702 'remote': self.GetRemoteUrl()
1703 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001704 return
1705
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001706 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001707 self.GetCodereviewServer()
1708 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001709 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001710
1711 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1712 git_auth = cookie_auth.get_auth_header(git_host)
1713 if gerrit_auth and git_auth:
1714 if gerrit_auth == git_auth:
1715 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001716 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001717 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001718 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001719 ' %s\n'
1720 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001721 ' Consider running the following command:\n'
1722 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001723 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001724 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001725 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001726 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001727 cookie_auth.get_new_password_message(git_host)))
1728 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001729 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001730 return
1731 else:
1732 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001733 ([] if gerrit_auth else [self._gerrit_host]) +
1734 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001735 DieWithError('Credentials for the following hosts are required:\n'
1736 ' %s\n'
1737 'These are read from %s (or legacy %s)\n'
1738 '%s' % (
1739 '\n '.join(missing),
1740 cookie_auth.get_gitcookies_path(),
1741 cookie_auth.get_netrc_path(),
1742 cookie_auth.get_new_password_message(git_host)))
1743
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001744 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001745 if not self.GetIssue():
1746 return
1747
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001748 status = self._GetChangeDetail()['status']
1749 if status in ('MERGED', 'ABANDONED'):
1750 DieWithError('Change %s has been %s, new uploads are not allowed' %
1751 (self.GetIssueURL(),
1752 'submitted' if status == 'MERGED' else 'abandoned'))
1753
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001754 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1755 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1756 # Apparently this check is not very important? Otherwise get_auth_email
1757 # could have been added to other implementations of Authenticator.
1758 cookies_auth = gerrit_util.Authenticator.get()
1759 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001760 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001761
1762 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001763 if self.GetIssueOwner() == cookies_user:
1764 return
1765 logging.debug('change %s owner is %s, cookies user is %s',
1766 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001767 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001768 # so ask what Gerrit thinks of this user.
1769 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1770 if details['email'] == self.GetIssueOwner():
1771 return
1772 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001773 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001774 'as %s.\n'
1775 'Uploading may fail due to lack of permissions.' %
1776 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1777 confirm_or_exit(action='upload')
1778
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001779 def _PostUnsetIssueProperties(self):
1780 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001781 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001782
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001783 def GetGerritObjForPresubmit(self):
1784 return presubmit_support.GerritAccessor(self._GetGerritHost())
1785
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001786 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001787 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001788 or CQ status, assuming adherence to a common workflow.
1789
1790 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001791 * 'error' - error from review tool (including deleted issues)
1792 * 'unsent' - no reviewers added
1793 * 'waiting' - waiting for review
1794 * 'reply' - waiting for uploader to reply to review
1795 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001796 * 'dry-run' - dry-running in the CQ
1797 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001798 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001799 """
1800 if not self.GetIssue():
1801 return None
1802
1803 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001804 data = self._GetChangeDetail([
1805 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001806 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001807 return 'error'
1808
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001809 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001810 return 'closed'
1811
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001812 cq_label = data['labels'].get('Commit-Queue', {})
1813 max_cq_vote = 0
1814 for vote in cq_label.get('all', []):
1815 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1816 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001817 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001818 if max_cq_vote == 1:
1819 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001820
Aaron Gable9ab38c62017-04-06 14:36:33 -07001821 if data['labels'].get('Code-Review', {}).get('approved'):
1822 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001823
1824 if not data.get('reviewers', {}).get('REVIEWER', []):
1825 return 'unsent'
1826
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001827 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001828 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001829 while messages:
1830 m = messages.pop()
1831 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001832 # Ignore replies from CQ.
1833 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001834 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001835 # Most recent message was by owner.
1836 return 'waiting'
1837 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001838 # Some reply from non-owner.
1839 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001840
1841 # Somehow there are no messages even though there are reviewers.
1842 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001843
1844 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001845 if not self.GetIssue():
1846 return None
1847
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001848 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001849 patchset = data['revisions'][data['current_revision']]['_number']
1850 self.SetPatchset(patchset)
1851 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001852
Aaron Gable636b13f2017-07-14 10:42:48 -07001853 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001854 gerrit_util.SetReview(
1855 self._GetGerritHost(), self._GerritChangeIdentifier(),
1856 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001857
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001858 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001859 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001860 # CURRENT_REVISION is included to get the latest patchset so that
1861 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001862 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001863 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1864 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001865 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001866 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001867 robot_file_comments = gerrit_util.GetChangeRobotComments(
1868 self._GetGerritHost(), self._GerritChangeIdentifier())
1869
1870 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001871 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001872 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001873 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001874 line_comments = file_comments.setdefault(path, [])
1875 line_comments.extend(
1876 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001877
1878 # Build dictionary of file comments for easy access and sorting later.
1879 # {author+date: {path: {patchset: {line: url+message}}}}
1880 comments = collections.defaultdict(
1881 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001882 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001883 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001884 tag = comment.get('tag', '')
1885 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001886 continue
1887 key = (comment['author']['email'], comment['updated'])
1888 if comment.get('side', 'REVISION') == 'PARENT':
1889 patchset = 'Base'
1890 else:
1891 patchset = 'PS%d' % comment['patch_set']
1892 line = comment.get('line', 0)
1893 url = ('https://%s/c/%s/%s/%s#%s%s' %
1894 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1895 'b' if comment.get('side') == 'PARENT' else '',
1896 str(line) if line else ''))
1897 comments[key][path][patchset][line] = (url, comment['message'])
1898
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001899 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001900 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001901 summary = self._BuildCommentSummary(msg, comments, readable)
1902 if summary:
1903 summaries.append(summary)
1904 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001905
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001906 @staticmethod
1907 def _BuildCommentSummary(msg, comments, readable):
1908 key = (msg['author']['email'], msg['date'])
1909 # Don't bother showing autogenerated messages that don't have associated
1910 # file or line comments. this will filter out most autogenerated
1911 # messages, but will keep robot comments like those from Tricium.
1912 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1913 if is_autogenerated and not comments.get(key):
1914 return None
1915 message = msg['message']
1916 # Gerrit spits out nanoseconds.
1917 assert len(msg['date'].split('.')[-1]) == 9
1918 date = datetime.datetime.strptime(msg['date'][:-3],
1919 '%Y-%m-%d %H:%M:%S.%f')
1920 if key in comments:
1921 message += '\n'
1922 for path, patchsets in sorted(comments.get(key, {}).items()):
1923 if readable:
1924 message += '\n%s' % path
1925 for patchset, lines in sorted(patchsets.items()):
1926 for line, (url, content) in sorted(lines.items()):
1927 if line:
1928 line_str = 'Line %d' % line
1929 path_str = '%s:%d:' % (path, line)
1930 else:
1931 line_str = 'File comment'
1932 path_str = '%s:0:' % path
1933 if readable:
1934 message += '\n %s, %s: %s' % (patchset, line_str, url)
1935 message += '\n %s\n' % content
1936 else:
1937 message += '\n%s ' % path_str
1938 message += '\n%s\n' % content
1939
1940 return _CommentSummary(
1941 date=date,
1942 message=message,
1943 sender=msg['author']['email'],
1944 autogenerated=is_autogenerated,
1945 # These could be inferred from the text messages and correlated with
1946 # Code-Review label maximum, however this is not reliable.
1947 # Leaving as is until the need arises.
1948 approval=False,
1949 disapproval=False,
1950 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001951
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001952 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001953 gerrit_util.AbandonChange(
1954 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001955
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001956 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001957 gerrit_util.SubmitChange(
1958 self._GetGerritHost(), self._GerritChangeIdentifier(),
1959 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001960
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001961 def _GetChangeDetail(self, options=None):
1962 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001963 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001964 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001965
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001966 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001967 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001968 options.append('CURRENT_COMMIT')
1969
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001970 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001971 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001972 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001973
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001974 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1975 # Assumption: data fetched before with extra options is suitable
1976 # for return for a smaller set of options.
1977 # For example, if we cached data for
1978 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1979 # and request is for options=[CURRENT_REVISION],
1980 # THEN we can return prior cached data.
1981 if options_set.issubset(cached_options_set):
1982 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001983
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001984 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001985 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001986 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001987 except gerrit_util.GerritError as e:
1988 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001989 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001990 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001991
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001992 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001993 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001994
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001995 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001996 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001997 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001998 data = gerrit_util.GetChangeCommit(
1999 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002000 except gerrit_util.GerritError as e:
2001 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002002 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002003 raise
agable32978d92016-11-01 12:55:02 -07002004 return data
2005
Karen Qian40c19422019-03-13 21:28:29 +00002006 def _IsCqConfigured(self):
2007 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002008 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002009
Olivier Robin75ee7252018-04-13 10:02:56 +02002010 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002011 if git_common.is_dirty_git_tree('land'):
2012 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002013
tandriid60367b2016-06-22 05:25:12 -07002014 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002015 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002016 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002017 'which can test and land changes for you. '
2018 'Are you sure you wish to bypass it?\n',
2019 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002020 differs = True
tandriic4344b52016-08-29 06:04:54 -07002021 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002022 # Note: git diff outputs nothing if there is no diff.
2023 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002024 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002025 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002026 if detail['current_revision'] == last_upload:
2027 differs = False
2028 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002029 print('WARNING: Local branch contents differ from latest uploaded '
2030 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002031 if differs:
2032 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002033 confirm_or_exit(
2034 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2035 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002036 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002037 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002038 upstream = self.GetCommonAncestorWithUpstream()
2039 if self.GetIssue():
2040 description = self.FetchDescription()
2041 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002042 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002043 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002044 committing=True,
2045 may_prompt=not force,
2046 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002047 parallel=parallel,
2048 upstream=upstream,
2049 description=description,
2050 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002051
2052 self.SubmitIssue(wait_for_merge=True)
2053 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002054 links = self._GetChangeCommit().get('web_links', [])
2055 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002056 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002057 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002058 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002059 return 0
2060
Edward Lemurf38bc172019-09-03 21:02:13 +00002061 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002062 assert parsed_issue_arg.valid
2063
Edward Lemur125d60a2019-09-13 18:25:41 +00002064 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002065
2066 if parsed_issue_arg.hostname:
2067 self._gerrit_host = parsed_issue_arg.hostname
2068 self._gerrit_server = 'https://%s' % self._gerrit_host
2069
tandriic2405f52016-10-10 08:13:15 -07002070 try:
2071 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002072 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002073 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002074
2075 if not parsed_issue_arg.patchset:
2076 # Use current revision by default.
2077 revision_info = detail['revisions'][detail['current_revision']]
2078 patchset = int(revision_info['_number'])
2079 else:
2080 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002081 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002082 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2083 break
2084 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002085 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002086 (parsed_issue_arg.patchset, self.GetIssue()))
2087
Edward Lemur125d60a2019-09-13 18:25:41 +00002088 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002089 if remote_url.endswith('.git'):
2090 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002091 remote_url = remote_url.rstrip('/')
2092
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002093 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002094 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002095
2096 if remote_url != fetch_info['url']:
2097 DieWithError('Trying to patch a change from %s but this repo appears '
2098 'to be %s.' % (fetch_info['url'], remote_url))
2099
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002100 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002101
Aaron Gable62619a32017-06-16 08:22:09 -07002102 if force:
2103 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2104 print('Checked out commit for change %i patchset %i locally' %
2105 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002106 elif nocommit:
2107 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2108 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002109 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002110 RunGit(['cherry-pick', 'FETCH_HEAD'])
2111 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002112 (parsed_issue_arg.issue, patchset))
2113 print('Note: this created a local commit which does not have '
2114 'the same hash as the one uploaded for review. This will make '
2115 'uploading changes based on top of this branch difficult.\n'
2116 'If you want to do that, use "git cl patch --force" instead.')
2117
Stefan Zagerd08043c2017-10-12 12:07:02 -07002118 if self.GetBranch():
2119 self.SetIssue(parsed_issue_arg.issue)
2120 self.SetPatchset(patchset)
2121 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2122 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2123 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2124 else:
2125 print('WARNING: You are in detached HEAD state.\n'
2126 'The patch has been applied to your checkout, but you will not be '
2127 'able to upload a new patch set to the gerrit issue.\n'
2128 'Try using the \'-b\' option if you would like to work on a '
2129 'branch and/or upload a new patch set.')
2130
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002131 return 0
2132
tandrii16e0b4e2016-06-07 10:34:28 -07002133 def _GerritCommitMsgHookCheck(self, offer_removal):
2134 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2135 if not os.path.exists(hook):
2136 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002137 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2138 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002139 data = gclient_utils.FileRead(hook)
2140 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2141 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002142 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002143 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002144 'and may interfere with it in subtle ways.\n'
2145 'We recommend you remove the commit-msg hook.')
2146 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002147 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002148 gclient_utils.rm_file_or_tree(hook)
2149 print('Gerrit commit-msg hook removed.')
2150 else:
2151 print('OK, will keep Gerrit commit-msg hook in place.')
2152
Edward Lemur1b52d872019-05-09 21:12:12 +00002153 def _CleanUpOldTraces(self):
2154 """Keep only the last |MAX_TRACES| traces."""
2155 try:
2156 traces = sorted([
2157 os.path.join(TRACES_DIR, f)
2158 for f in os.listdir(TRACES_DIR)
2159 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2160 and not f.startswith('tmp'))
2161 ])
2162 traces_to_delete = traces[:-MAX_TRACES]
2163 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002164 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002165 except OSError:
2166 print('WARNING: Failed to remove old git traces from\n'
2167 ' %s'
2168 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002169
Edward Lemur5737f022019-05-17 01:24:00 +00002170 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002171 """Zip and write the git push traces stored in traces_dir."""
2172 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002173 traces_zip = trace_name + '-traces'
2174 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002175 # Create a temporary dir to store git config and gitcookies in. It will be
2176 # compressed and stored next to the traces.
2177 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002178 git_info_zip = trace_name + '-git-info'
2179
Edward Lemur5737f022019-05-17 01:24:00 +00002180 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002181 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002182 git_push_metadata['now'] = git_push_metadata['now'].decode(
2183 sys.stdin.encoding)
2184
Edward Lemur1b52d872019-05-09 21:12:12 +00002185 git_push_metadata['trace_name'] = trace_name
2186 gclient_utils.FileWrite(
2187 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2188
2189 # Keep only the first 6 characters of the git hashes on the packet
2190 # trace. This greatly decreases size after compression.
2191 packet_traces = os.path.join(traces_dir, 'trace-packet')
2192 if os.path.isfile(packet_traces):
2193 contents = gclient_utils.FileRead(packet_traces)
2194 gclient_utils.FileWrite(
2195 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2196 shutil.make_archive(traces_zip, 'zip', traces_dir)
2197
2198 # Collect and compress the git config and gitcookies.
2199 git_config = RunGit(['config', '-l'])
2200 gclient_utils.FileWrite(
2201 os.path.join(git_info_dir, 'git-config'),
2202 git_config)
2203
2204 cookie_auth = gerrit_util.Authenticator.get()
2205 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2206 gitcookies_path = cookie_auth.get_gitcookies_path()
2207 if os.path.isfile(gitcookies_path):
2208 gitcookies = gclient_utils.FileRead(gitcookies_path)
2209 gclient_utils.FileWrite(
2210 os.path.join(git_info_dir, 'gitcookies'),
2211 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2212 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2213
Edward Lemur1b52d872019-05-09 21:12:12 +00002214 gclient_utils.rmtree(git_info_dir)
2215
2216 def _RunGitPushWithTraces(
2217 self, change_desc, refspec, refspec_opts, git_push_metadata):
2218 """Run git push and collect the traces resulting from the execution."""
2219 # Create a temporary directory to store traces in. Traces will be compressed
2220 # and stored in a 'traces' dir inside depot_tools.
2221 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002222 trace_name = os.path.join(
2223 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002224
2225 env = os.environ.copy()
2226 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2227 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002228 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002229 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2230 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2231 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2232
2233 try:
2234 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002235 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002236 before_push = time_time()
2237 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002238 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002239 env=env,
2240 print_stdout=True,
2241 # Flush after every line: useful for seeing progress when running as
2242 # recipe.
2243 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002244 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002245 except subprocess2.CalledProcessError as e:
2246 push_returncode = e.returncode
2247 DieWithError('Failed to create a change. Please examine output above '
2248 'for the reason of the failure.\n'
2249 'Hint: run command below to diagnose common Git/Gerrit '
2250 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002251 ' git cl creds-check\n'
2252 '\n'
2253 'If git-cl is not working correctly, file a bug under the '
2254 'Infra>SDK component including the files below.\n'
2255 'Review the files before upload, since they might contain '
2256 'sensitive information.\n'
2257 'Set the Restrict-View-Google label so that they are not '
2258 'publicly accessible.\n'
2259 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002260 change_desc)
2261 finally:
2262 execution_time = time_time() - before_push
2263 metrics.collector.add_repeated('sub_commands', {
2264 'command': 'git push',
2265 'execution_time': execution_time,
2266 'exit_code': push_returncode,
2267 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2268 })
2269
Edward Lemur1b52d872019-05-09 21:12:12 +00002270 git_push_metadata['execution_time'] = execution_time
2271 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002272 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002273
Edward Lemur1b52d872019-05-09 21:12:12 +00002274 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002275 gclient_utils.rmtree(traces_dir)
2276
2277 return push_stdout
2278
Edward Lemura12175c2020-03-09 16:58:26 +00002279 def CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002280 self, options, git_diff_args, custom_cl_base, change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002281 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002282 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002283 # Load default for user, repo, squash=true, in this order.
2284 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002285
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002286 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002287 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002288
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002289 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002290 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002291 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002292 # User requested to change description
2293 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002294 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002295 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002296 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002297 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002298 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002299 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002300 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002301 if len(change_ids) == 1:
2302 change_id = change_ids[0]
2303 else:
2304 change_id = GenerateGerritChangeId(change_desc.description)
2305 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002306
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002307 if options.preserve_tryjobs:
2308 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002309
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002310 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002311 parent = self._ComputeParent(
2312 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002313 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002314 with gclient_utils.temporary_file() as desc_tempfile:
2315 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2316 ref_to_push = RunGit(
2317 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002318 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002319 if not git_footers.get_footer_change_id(change_desc.description):
2320 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002321 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002322 self._AddChangeIdToCommitMessage(
2323 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002324 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002325 # For no-squash mode, we assume the remote called "origin" is the one we
2326 # want. It is not worthwhile to support different workflows for
2327 # no-squash mode.
2328 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002329 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2330
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002331 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002332 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2333 ref_to_push)]).splitlines()
2334 if len(commits) > 1:
2335 print('WARNING: This will upload %d commits. Run the following command '
2336 'to see which commits will be uploaded: ' % len(commits))
2337 print('git log %s..%s' % (parent, ref_to_push))
2338 print('You can also use `git squash-branch` to squash these into a '
2339 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002340 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002341
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002342 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002343 cc = []
2344 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2345 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2346 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002347 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002348 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002349 if options.cc:
2350 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002351 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002352 if change_desc.get_cced():
2353 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002354 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2355 valid_accounts = set(reviewers + cc)
2356 # TODO(crbug/877717): relax this for all hosts.
2357 else:
2358 valid_accounts = gerrit_util.ValidAccounts(
2359 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002360 logging.info('accounts %s are recognized, %s invalid',
2361 sorted(valid_accounts),
2362 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002363
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002364 # Extra options that can be specified at push time. Doc:
2365 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002366 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002367
Aaron Gable844cf292017-06-28 11:32:59 -07002368 # By default, new changes are started in WIP mode, and subsequent patchsets
2369 # don't send email. At any time, passing --send-mail will mark the change
2370 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002371 if options.send_mail:
2372 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002373 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002374 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002375 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002376 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002377 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002378
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002379 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002380 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002381
Edward Lemur5a644f82020-03-18 16:44:57 +00002382 title = self._GetTitleForUpload(options)
Aaron Gable9b713dd2016-12-14 16:04:21 -08002383 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002384 # Punctuation and whitespace in |title| must be percent-encoded.
2385 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002386
agablec6787972016-09-09 16:13:34 -07002387 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002388 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002389
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002390 for r in sorted(reviewers):
2391 if r in valid_accounts:
2392 refspec_opts.append('r=%s' % r)
2393 reviewers.remove(r)
2394 else:
2395 # TODO(tandrii): this should probably be a hard failure.
2396 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2397 % r)
2398 for c in sorted(cc):
2399 # refspec option will be rejected if cc doesn't correspond to an
2400 # account, even though REST call to add such arbitrary cc may succeed.
2401 if c in valid_accounts:
2402 refspec_opts.append('cc=%s' % c)
2403 cc.remove(c)
2404
rmistry9eadede2016-09-19 11:22:43 -07002405 if options.topic:
2406 # Documentation on Gerrit topics is here:
2407 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002408 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002409
Edward Lemur687ca902018-12-05 02:30:30 +00002410 if options.enable_auto_submit:
2411 refspec_opts.append('l=Auto-Submit+1')
2412 if options.use_commit_queue:
2413 refspec_opts.append('l=Commit-Queue+2')
2414 elif options.cq_dry_run:
2415 refspec_opts.append('l=Commit-Queue+1')
2416
2417 if change_desc.get_reviewers(tbr_only=True):
2418 score = gerrit_util.GetCodeReviewTbrScore(
2419 self._GetGerritHost(),
2420 self._GetGerritProject())
2421 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002422
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002423 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002424 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002425 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002426 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002427 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2428
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002429 refspec_suffix = ''
2430 if refspec_opts:
2431 refspec_suffix = '%' + ','.join(refspec_opts)
2432 assert ' ' not in refspec_suffix, (
2433 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2434 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2435
Edward Lemur1b52d872019-05-09 21:12:12 +00002436 git_push_metadata = {
2437 'gerrit_host': self._GetGerritHost(),
2438 'title': title or '<untitled>',
2439 'change_id': change_id,
2440 'description': change_desc.description,
2441 }
2442 push_stdout = self._RunGitPushWithTraces(
2443 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002444
2445 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002446 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002447 change_numbers = [m.group(1)
2448 for m in map(regex.match, push_stdout.splitlines())
2449 if m]
2450 if len(change_numbers) != 1:
2451 DieWithError(
2452 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002453 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002454 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002455 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002456
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002457 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002458 # GetIssue() is not set in case of non-squash uploads according to tests.
2459 # TODO(agable): non-squash uploads in git cl should be removed.
2460 gerrit_util.AddReviewers(
2461 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002462 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002463 reviewers, cc,
2464 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002465
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002466 return 0
2467
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002468 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2469 change_desc):
2470 """Computes parent of the generated commit to be uploaded to Gerrit.
2471
2472 Returns revision or a ref name.
2473 """
2474 if custom_cl_base:
2475 # Try to avoid creating additional unintended CLs when uploading, unless
2476 # user wants to take this risk.
2477 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2478 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2479 local_ref_of_target_remote])
2480 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002481 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002482 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2483 'If you proceed with upload, more than 1 CL may be created by '
2484 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2485 'If you are certain that specified base `%s` has already been '
2486 'uploaded to Gerrit as another CL, you may proceed.\n' %
2487 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2488 if not force:
2489 confirm_or_exit(
2490 'Do you take responsibility for cleaning up potential mess '
2491 'resulting from proceeding with upload?',
2492 action='upload')
2493 return custom_cl_base
2494
Aaron Gablef97e33d2017-03-30 15:44:27 -07002495 if remote != '.':
2496 return self.GetCommonAncestorWithUpstream()
2497
2498 # If our upstream branch is local, we base our squashed commit on its
2499 # squashed version.
2500 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2501
Aaron Gablef97e33d2017-03-30 15:44:27 -07002502 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002503 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002504
2505 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002506 # TODO(tandrii): consider checking parent change in Gerrit and using its
2507 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2508 # the tree hash of the parent branch. The upside is less likely bogus
2509 # requests to reupload parent change just because it's uploadhash is
2510 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002511 parent = RunGit(['config',
2512 'branch.%s.gerritsquashhash' % upstream_branch_name],
2513 error_ok=True).strip()
2514 # Verify that the upstream branch has been uploaded too, otherwise
2515 # Gerrit will create additional CLs when uploading.
2516 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2517 RunGitSilent(['rev-parse', parent + ':'])):
2518 DieWithError(
2519 '\nUpload upstream branch %s first.\n'
2520 'It is likely that this branch has been rebased since its last '
2521 'upload, so you just need to upload it again.\n'
2522 '(If you uploaded it with --no-squash, then branch dependencies '
2523 'are not supported, and you should reupload with --squash.)'
2524 % upstream_branch_name,
2525 change_desc)
2526 return parent
2527
Edward Lemura12175c2020-03-09 16:58:26 +00002528 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002529 """Re-commits using the current message, assumes the commit hook is in
2530 place.
2531 """
Edward Lemura12175c2020-03-09 16:58:26 +00002532 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002533 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002534 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002535 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002536 return new_log_desc
2537 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002538 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002539
tandriie113dfd2016-10-11 10:20:12 -07002540 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002541 try:
2542 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002543 except GerritChangeNotExists:
2544 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002545
2546 if data['status'] in ('ABANDONED', 'MERGED'):
2547 return 'CL %s is closed' % self.GetIssue()
2548
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002549 def GetGerritChange(self, patchset=None):
2550 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002551 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002552 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002553 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002554 data = self._GetChangeDetail(['ALL_REVISIONS'])
2555
2556 assert host and issue and patchset, 'CL must be uploaded first'
2557
2558 has_patchset = any(
2559 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002560 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002561 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002562 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002563 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002564
tandrii8c5a3532016-11-04 07:52:02 -07002565 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002566 'host': host,
2567 'change': issue,
2568 'project': data['project'],
2569 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002570 }
tandriie113dfd2016-10-11 10:20:12 -07002571
tandriide281ae2016-10-12 06:02:30 -07002572 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002573 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002574
Edward Lemur707d70b2018-02-07 00:50:14 +01002575 def GetReviewers(self):
2576 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002577 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002578
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002579
tandriif9aefb72016-07-01 09:06:51 -07002580def _get_bug_line_values(default_project, bugs):
2581 """Given default_project and comma separated list of bugs, yields bug line
2582 values.
2583
2584 Each bug can be either:
2585 * a number, which is combined with default_project
2586 * string, which is left as is.
2587
2588 This function may produce more than one line, because bugdroid expects one
2589 project per line.
2590
2591 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2592 ['v8:123', 'chromium:789']
2593 """
2594 default_bugs = []
2595 others = []
2596 for bug in bugs.split(','):
2597 bug = bug.strip()
2598 if bug:
2599 try:
2600 default_bugs.append(int(bug))
2601 except ValueError:
2602 others.append(bug)
2603
2604 if default_bugs:
2605 default_bugs = ','.join(map(str, default_bugs))
2606 if default_project:
2607 yield '%s:%s' % (default_project, default_bugs)
2608 else:
2609 yield default_bugs
2610 for other in sorted(others):
2611 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2612 yield other
2613
2614
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002615class ChangeDescription(object):
2616 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002617 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002618 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002619 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002620 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002621 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002622 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2623 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002624 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002625 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002626
Dan Beamd8b04ca2019-10-10 21:23:26 +00002627 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002628 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002629 if bug:
2630 regexp = re.compile(self.BUG_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, bug))
2634 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002635 if fixed:
2636 regexp = re.compile(self.FIXED_LINE)
2637 prefix = settings.GetBugPrefix()
2638 if not any((regexp.match(line) for line in self._description_lines)):
2639 values = list(_get_bug_line_values(prefix, fixed))
2640 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002641
agable@chromium.org42c20792013-09-12 17:34:49 +00002642 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002643 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002644 return '\n'.join(self._description_lines)
2645
2646 def set_description(self, desc):
2647 if isinstance(desc, basestring):
2648 lines = desc.splitlines()
2649 else:
2650 lines = [line.rstrip() for line in desc]
2651 while lines and not lines[0]:
2652 lines.pop(0)
2653 while lines and not lines[-1]:
2654 lines.pop(-1)
2655 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002656
Edward Lemur5a644f82020-03-18 16:44:57 +00002657 def ensure_change_id(self, change_id):
2658 description = self.description
2659 footer_change_ids = git_footers.get_footer_change_id(description)
2660 # Make sure that the Change-Id in the description matches the given one.
2661 if footer_change_ids != [change_id]:
2662 if footer_change_ids:
2663 # Remove any existing Change-Id footers since they don't match the
2664 # expected change_id footer.
2665 description = git_footers.remove_footer(description, 'Change-Id')
2666 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2667 'if you want to set a new one.')
2668 # Add the expected Change-Id footer.
2669 description = git_footers.add_footer_change_id(description, change_id)
2670 self.set_description(description)
2671
Edward Lemur2c62b332020-03-12 22:12:33 +00002672 def update_reviewers(
2673 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002674 """Rewrites the R=/TBR= line(s) as a single line each.
2675
2676 Args:
2677 reviewers (list(str)) - list of additional emails to use for reviewers.
2678 tbrs (list(str)) - list of additional emails to use for TBRs.
2679 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2680 the change that are missing OWNER coverage. If this is not None, you
2681 must also pass a value for `change`.
2682 change (Change) - The Change that should be used for OWNERS lookups.
2683 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002684 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002685 assert isinstance(tbrs, list), tbrs
2686
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002687 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002688 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002689
2690 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002691 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002692
2693 reviewers = set(reviewers)
2694 tbrs = set(tbrs)
2695 LOOKUP = {
2696 'TBR': tbrs,
2697 'R': reviewers,
2698 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002699
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002700 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002701 regexp = re.compile(self.R_LINE)
2702 matches = [regexp.match(line) for line in self._description_lines]
2703 new_desc = [l for i, l in enumerate(self._description_lines)
2704 if not matches[i]]
2705 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002706
agable@chromium.org42c20792013-09-12 17:34:49 +00002707 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002708
2709 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002710 for match in matches:
2711 if not match:
2712 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002713 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2714
2715 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002716 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002717 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002718 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002719 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002720 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002721 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002722 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002723
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002724 # If any folks ended up in both groups, remove them from tbrs.
2725 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002726
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002727 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2728 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002729
2730 # Put the new lines in the description where the old first R= line was.
2731 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2732 if 0 <= line_loc < len(self._description_lines):
2733 if new_tbr_line:
2734 self._description_lines.insert(line_loc, new_tbr_line)
2735 if new_r_line:
2736 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002737 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002738 if new_r_line:
2739 self.append_footer(new_r_line)
2740 if new_tbr_line:
2741 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002742
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002743 def set_preserve_tryjobs(self):
2744 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2745 footers = git_footers.parse_footers(self.description)
2746 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2747 if v.lower() == 'true':
2748 return
2749 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2750
Anthony Polito8b955342019-09-24 19:01:36 +00002751 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002752 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002753 self.set_description([
2754 '# Enter a description of the change.',
2755 '# This will be displayed on the codereview site.',
2756 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002757 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002758 '--------------------',
2759 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002760 bug_regexp = re.compile(self.BUG_LINE)
2761 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002762 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002763 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2764 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002765 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002766
agable@chromium.org42c20792013-09-12 17:34:49 +00002767 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002768 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002769 if not content:
2770 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002771 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002772
Bruce Dawson2377b012018-01-11 16:46:49 -08002773 # Strip off comments and default inserted "Bug:" line.
2774 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002775 (line.startswith('#') or
2776 line.rstrip() == "Bug:" or
2777 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002778 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002779 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002780 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002781
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002782 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002783 """Adds a footer line to the description.
2784
2785 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2786 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2787 that Gerrit footers are always at the end.
2788 """
2789 parsed_footer_line = git_footers.parse_footer(line)
2790 if parsed_footer_line:
2791 # Line is a gerrit footer in the form: Footer-Key: any value.
2792 # Thus, must be appended observing Gerrit footer rules.
2793 self.set_description(
2794 git_footers.add_footer(self.description,
2795 key=parsed_footer_line[0],
2796 value=parsed_footer_line[1]))
2797 return
2798
2799 if not self._description_lines:
2800 self._description_lines.append(line)
2801 return
2802
2803 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2804 if gerrit_footers:
2805 # git_footers.split_footers ensures that there is an empty line before
2806 # actual (gerrit) footers, if any. We have to keep it that way.
2807 assert top_lines and top_lines[-1] == ''
2808 top_lines, separator = top_lines[:-1], top_lines[-1:]
2809 else:
2810 separator = [] # No need for separator if there are no gerrit_footers.
2811
2812 prev_line = top_lines[-1] if top_lines else ''
2813 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2814 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2815 top_lines.append('')
2816 top_lines.append(line)
2817 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002818
tandrii99a72f22016-08-17 14:33:24 -07002819 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002820 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002821 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002822 reviewers = [match.group(2).strip()
2823 for match in matches
2824 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002825 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002826
bradnelsond975b302016-10-23 12:20:23 -07002827 def get_cced(self):
2828 """Retrieves the list of reviewers."""
2829 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2830 cced = [match.group(2).strip() for match in matches if match]
2831 return cleanup_list(cced)
2832
Nodir Turakulov23b82142017-11-16 11:04:25 -08002833 def get_hash_tags(self):
2834 """Extracts and sanitizes a list of Gerrit hashtags."""
2835 subject = (self._description_lines or ('',))[0]
2836 subject = re.sub(
2837 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2838
2839 tags = []
2840 start = 0
2841 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2842 while True:
2843 m = bracket_exp.match(subject, start)
2844 if not m:
2845 break
2846 tags.append(self.sanitize_hash_tag(m.group(1)))
2847 start = m.end()
2848
2849 if not tags:
2850 # Try "Tag: " prefix.
2851 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2852 if m:
2853 tags.append(self.sanitize_hash_tag(m.group(1)))
2854 return tags
2855
2856 @classmethod
2857 def sanitize_hash_tag(cls, tag):
2858 """Returns a sanitized Gerrit hash tag.
2859
2860 A sanitized hashtag can be used as a git push refspec parameter value.
2861 """
2862 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2863
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002864 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2865 """Updates this commit description given the parent.
2866
2867 This is essentially what Gnumbd used to do.
2868 Consult https://goo.gl/WMmpDe for more details.
2869 """
2870 assert parent_msg # No, orphan branch creation isn't supported.
2871 assert parent_hash
2872 assert dest_ref
2873 parent_footer_map = git_footers.parse_footers(parent_msg)
2874 # This will also happily parse svn-position, which GnumbD is no longer
2875 # supporting. While we'd generate correct footers, the verifier plugin
2876 # installed in Gerrit will block such commit (ie git push below will fail).
2877 parent_position = git_footers.get_position(parent_footer_map)
2878
2879 # Cherry-picks may have last line obscuring their prior footers,
2880 # from git_footers perspective. This is also what Gnumbd did.
2881 cp_line = None
2882 if (self._description_lines and
2883 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2884 cp_line = self._description_lines.pop()
2885
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002886 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002887
2888 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2889 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002890 for i, line in enumerate(footer_lines):
2891 k, v = git_footers.parse_footer(line) or (None, None)
2892 if k and k.startswith('Cr-'):
2893 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002894
2895 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002896 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002897 if parent_position[0] == dest_ref:
2898 # Same branch as parent.
2899 number = int(parent_position[1]) + 1
2900 else:
2901 number = 1 # New branch, and extra lineage.
2902 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2903 int(parent_position[1])))
2904
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002905 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2906 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002907
2908 self._description_lines = top_lines
2909 if cp_line:
2910 self._description_lines.append(cp_line)
2911 if self._description_lines[-1] != '':
2912 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002913 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002914
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002915
Aaron Gablea1bab272017-04-11 16:38:18 -07002916def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002917 """Retrieves the reviewers that approved a CL from the issue properties with
2918 messages.
2919
2920 Note that the list may contain reviewers that are not committer, thus are not
2921 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002922
2923 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002924 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002925 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002926 return sorted(
2927 set(
2928 message['sender']
2929 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07002930 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002931 )
2932 )
2933
2934
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002935def FindCodereviewSettingsFile(filename='codereview.settings'):
2936 """Finds the given file starting in the cwd and going up.
2937
2938 Only looks up to the top of the repository unless an
2939 'inherit-review-settings-ok' file exists in the root of the repository.
2940 """
2941 inherit_ok_file = 'inherit-review-settings-ok'
2942 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002943 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002944 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2945 root = '/'
2946 while True:
2947 if filename in os.listdir(cwd):
2948 if os.path.isfile(os.path.join(cwd, filename)):
2949 return open(os.path.join(cwd, filename))
2950 if cwd == root:
2951 break
2952 cwd = os.path.dirname(cwd)
2953
2954
2955def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002956 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002957 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002958
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002959 def SetProperty(name, setting, unset_error_ok=False):
2960 fullname = 'rietveld.' + name
2961 if setting in keyvals:
2962 RunGit(['config', fullname, keyvals[setting]])
2963 else:
2964 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2965
tandrii48df5812016-10-17 03:55:37 -07002966 if not keyvals.get('GERRIT_HOST', False):
2967 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002968 # Only server setting is required. Other settings can be absent.
2969 # In that case, we ignore errors raised during option deletion attempt.
2970 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2971 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2972 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002973 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002974 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2975 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002976 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2977 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002978 SetProperty(
2979 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002980
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002981 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002982 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002983
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002984 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07002985 RunGit(['config', 'gerrit.squash-uploads',
2986 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002987
tandrii@chromium.org28253532016-04-14 13:46:56 +00002988 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002989 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002990 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2991
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002992 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002993 # should be of the form
2994 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2995 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002996 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2997 keyvals['ORIGIN_URL_CONFIG']])
2998
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002999
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003000def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003001 """Downloads a network object to a local file, like urllib.urlretrieve.
3002
3003 This is necessary because urllib is broken for SSL connections via a proxy.
3004 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003005 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003006 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003007
3008
ukai@chromium.org712d6102013-11-27 00:52:58 +00003009def hasSheBang(fname):
3010 """Checks fname is a #! script."""
3011 with open(fname) as f:
3012 return f.read(2).startswith('#!')
3013
3014
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003015# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3016def DownloadHooks(*args, **kwargs):
3017 pass
3018
3019
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003020def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003021 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003022
3023 Args:
3024 force: True to update hooks. False to install hooks if not present.
3025 """
3026 if not settings.GetIsGerrit():
3027 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003028 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003029 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3030 if not os.access(dst, os.X_OK):
3031 if os.path.exists(dst):
3032 if not force:
3033 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003034 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003035 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003036 if not hasSheBang(dst):
3037 DieWithError('Not a script: %s\n'
3038 'You need to download from\n%s\n'
3039 'into .git/hooks/commit-msg and '
3040 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003041 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3042 except Exception:
3043 if os.path.exists(dst):
3044 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003045 DieWithError('\nFailed to download hooks.\n'
3046 'You need to download from\n%s\n'
3047 'into .git/hooks/commit-msg and '
3048 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003049
3050
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003051class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003052 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003053
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003054 _GOOGLESOURCE = 'googlesource.com'
3055
3056 def __init__(self):
3057 # Cached list of [host, identity, source], where source is either
3058 # .gitcookies or .netrc.
3059 self._all_hosts = None
3060
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003061 def ensure_configured_gitcookies(self):
3062 """Runs checks and suggests fixes to make git use .gitcookies from default
3063 path."""
3064 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3065 configured_path = RunGitSilent(
3066 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003067 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003068 if configured_path:
3069 self._ensure_default_gitcookies_path(configured_path, default)
3070 else:
3071 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003072
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003073 @staticmethod
3074 def _ensure_default_gitcookies_path(configured_path, default_path):
3075 assert configured_path
3076 if configured_path == default_path:
3077 print('git is already configured to use your .gitcookies from %s' %
3078 configured_path)
3079 return
3080
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003081 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003082 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3083 (configured_path, default_path))
3084
3085 if not os.path.exists(configured_path):
3086 print('However, your configured .gitcookies file is missing.')
3087 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3088 action='reconfigure')
3089 RunGit(['config', '--global', 'http.cookiefile', default_path])
3090 return
3091
3092 if os.path.exists(default_path):
3093 print('WARNING: default .gitcookies file already exists %s' %
3094 default_path)
3095 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3096 default_path)
3097
3098 confirm_or_exit('Move existing .gitcookies to default location?',
3099 action='move')
3100 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003101 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003102 print('Moved and reconfigured git to use .gitcookies from %s' %
3103 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003104
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003105 @staticmethod
3106 def _configure_gitcookies_path(default_path):
3107 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3108 if os.path.exists(netrc_path):
3109 print('You seem to be using outdated .netrc for git credentials: %s' %
3110 netrc_path)
3111 print('This tool will guide you through setting up recommended '
3112 '.gitcookies store for git credentials.\n'
3113 '\n'
3114 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3115 ' git config --global --unset http.cookiefile\n'
3116 ' mv %s %s.backup\n\n' % (default_path, default_path))
3117 confirm_or_exit(action='setup .gitcookies')
3118 RunGit(['config', '--global', 'http.cookiefile', default_path])
3119 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003120
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003121 def get_hosts_with_creds(self, include_netrc=False):
3122 if self._all_hosts is None:
3123 a = gerrit_util.CookiesAuthenticator()
3124 self._all_hosts = [
3125 (h, u, s)
3126 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003127 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3128 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003129 )
3130 if h.endswith(self._GOOGLESOURCE)
3131 ]
3132
3133 if include_netrc:
3134 return self._all_hosts
3135 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3136
3137 def print_current_creds(self, include_netrc=False):
3138 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3139 if not hosts:
3140 print('No Git/Gerrit credentials found')
3141 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003142 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003143 header = [('Host', 'User', 'Which file'),
3144 ['=' * l for l in lengths]]
3145 for row in (header + hosts):
3146 print('\t'.join((('%%+%ds' % l) % s)
3147 for l, s in zip(lengths, row)))
3148
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003149 @staticmethod
3150 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003151 """Parses identity "git-<username>.domain" into <username> and domain."""
3152 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003153 # distinguishable from sub-domains. But we do know typical domains:
3154 if identity.endswith('.chromium.org'):
3155 domain = 'chromium.org'
3156 username = identity[:-len('.chromium.org')]
3157 else:
3158 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003159 if username.startswith('git-'):
3160 username = username[len('git-'):]
3161 return username, domain
3162
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003163 def _canonical_git_googlesource_host(self, host):
3164 """Normalizes Gerrit hosts (with '-review') to Git host."""
3165 assert host.endswith(self._GOOGLESOURCE)
3166 # Prefix doesn't include '.' at the end.
3167 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3168 if prefix.endswith('-review'):
3169 prefix = prefix[:-len('-review')]
3170 return prefix + '.' + self._GOOGLESOURCE
3171
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003172 def _canonical_gerrit_googlesource_host(self, host):
3173 git_host = self._canonical_git_googlesource_host(host)
3174 prefix = git_host.split('.', 1)[0]
3175 return prefix + '-review.' + self._GOOGLESOURCE
3176
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003177 def _get_counterpart_host(self, host):
3178 assert host.endswith(self._GOOGLESOURCE)
3179 git = self._canonical_git_googlesource_host(host)
3180 gerrit = self._canonical_gerrit_googlesource_host(git)
3181 return git if gerrit == host else gerrit
3182
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003183 def has_generic_host(self):
3184 """Returns whether generic .googlesource.com has been configured.
3185
3186 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3187 """
3188 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3189 if host == '.' + self._GOOGLESOURCE:
3190 return True
3191 return False
3192
3193 def _get_git_gerrit_identity_pairs(self):
3194 """Returns map from canonic host to pair of identities (Git, Gerrit).
3195
3196 One of identities might be None, meaning not configured.
3197 """
3198 host_to_identity_pairs = {}
3199 for host, identity, _ in self.get_hosts_with_creds():
3200 canonical = self._canonical_git_googlesource_host(host)
3201 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3202 idx = 0 if canonical == host else 1
3203 pair[idx] = identity
3204 return host_to_identity_pairs
3205
3206 def get_partially_configured_hosts(self):
3207 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003208 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003209 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003210 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003211
3212 def get_conflicting_hosts(self):
3213 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003214 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003215 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003216 if None not in (i1, i2) and i1 != i2)
3217
3218 def get_duplicated_hosts(self):
3219 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003220 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003221
3222 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3223 'chromium.googlesource.com': 'chromium.org',
3224 'chrome-internal.googlesource.com': 'google.com',
3225 }
3226
3227 def get_hosts_with_wrong_identities(self):
3228 """Finds hosts which **likely** reference wrong identities.
3229
3230 Note: skips hosts which have conflicting identities for Git and Gerrit.
3231 """
3232 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003233 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003234 pair = self._get_git_gerrit_identity_pairs().get(host)
3235 if pair and pair[0] == pair[1]:
3236 _, domain = self._parse_identity(pair[0])
3237 if domain != expected:
3238 hosts.add(host)
3239 return hosts
3240
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003241 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003242 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003243 hosts = sorted(hosts)
3244 assert hosts
3245 if extra_column_func is None:
3246 extras = [''] * len(hosts)
3247 else:
3248 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003249 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3250 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003251 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003252 lines.append(tmpl % he)
3253 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003254
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003255 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003256 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003257 yield ('.googlesource.com wildcard record detected',
3258 ['Chrome Infrastructure team recommends to list full host names '
3259 'explicitly.'],
3260 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003261
3262 dups = self.get_duplicated_hosts()
3263 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003264 yield ('The following hosts were defined twice',
3265 self._format_hosts(dups),
3266 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003267
3268 partial = self.get_partially_configured_hosts()
3269 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003270 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3271 'These hosts are missing',
3272 self._format_hosts(partial, lambda host: 'but %s defined' %
3273 self._get_counterpart_host(host)),
3274 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003275
3276 conflicting = self.get_conflicting_hosts()
3277 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003278 yield ('The following Git hosts have differing credentials from their '
3279 'Gerrit counterparts',
3280 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3281 tuple(self._get_git_gerrit_identity_pairs()[host])),
3282 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003283
3284 wrong = self.get_hosts_with_wrong_identities()
3285 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003286 yield ('These hosts likely use wrong identity',
3287 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3288 (self._get_git_gerrit_identity_pairs()[host][0],
3289 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3290 wrong)
3291
3292 def find_and_report_problems(self):
3293 """Returns True if there was at least one problem, else False."""
3294 found = False
3295 bad_hosts = set()
3296 for title, sublines, hosts in self._find_problems():
3297 if not found:
3298 found = True
3299 print('\n\n.gitcookies problem report:\n')
3300 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003301 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003302 if sublines:
3303 print()
3304 print(' %s' % '\n '.join(sublines))
3305 print()
3306
3307 if bad_hosts:
3308 assert found
3309 print(' You can manually remove corresponding lines in your %s file and '
3310 'visit the following URLs with correct account to generate '
3311 'correct credential lines:\n' %
3312 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3313 print(' %s' % '\n '.join(sorted(set(
3314 gerrit_util.CookiesAuthenticator().get_new_password_url(
3315 self._canonical_git_googlesource_host(host))
3316 for host in bad_hosts
3317 ))))
3318 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003319
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003320
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003321@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003322def CMDcreds_check(parser, args):
3323 """Checks credentials and suggests changes."""
3324 _, _ = parser.parse_args(args)
3325
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003326 # Code below checks .gitcookies. Abort if using something else.
3327 authn = gerrit_util.Authenticator.get()
3328 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003329 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003330 'This command is not designed for bot environment. It checks '
3331 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003332 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3333 if isinstance(authn, gerrit_util.GceAuthenticator):
3334 message += (
3335 '\n'
3336 'If you need to run this on GCE or a cloudtop instance, '
3337 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3338 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003339
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003340 checker = _GitCookiesChecker()
3341 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003342
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003343 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003344 checker.print_current_creds(include_netrc=True)
3345
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003346 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003347 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003348 return 0
3349 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003350
3351
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003352@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003353def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003354 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003355 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003356 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003357 _, args = parser.parse_args(args)
3358 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003359 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003360 return RunGit(['config', 'branch.%s.base-url' % branch],
3361 error_ok=False).strip()
3362 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003363 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003364 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3365 error_ok=False).strip()
3366
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003367
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003368def color_for_status(status):
3369 """Maps a Changelist status to color, for CMDstatus and other tools."""
3370 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003371 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003372 'waiting': Fore.BLUE,
3373 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003374 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003375 'lgtm': Fore.GREEN,
3376 'commit': Fore.MAGENTA,
3377 'closed': Fore.CYAN,
3378 'error': Fore.WHITE,
3379 }.get(status, Fore.WHITE)
3380
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003381
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003382def get_cl_statuses(changes, fine_grained, max_processes=None):
3383 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003384
3385 If fine_grained is true, this will fetch CL statuses from the server.
3386 Otherwise, simply indicate if there's a matching url for the given branches.
3387
3388 If max_processes is specified, it is used as the maximum number of processes
3389 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3390 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003391
3392 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003393 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003394 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003395 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003396
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003397 if not fine_grained:
3398 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003399 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003400 for cl in changes:
3401 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003402 return
3403
3404 # First, sort out authentication issues.
3405 logging.debug('ensuring credentials exist')
3406 for cl in changes:
3407 cl.EnsureAuthenticated(force=False, refresh=True)
3408
3409 def fetch(cl):
3410 try:
3411 return (cl, cl.GetStatus())
3412 except:
3413 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003414 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003415 raise
3416
3417 threads_count = len(changes)
3418 if max_processes:
3419 threads_count = max(1, min(threads_count, max_processes))
3420 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3421
Edward Lemur61bf4172020-02-24 23:22:37 +00003422 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003423 fetched_cls = set()
3424 try:
3425 it = pool.imap_unordered(fetch, changes).__iter__()
3426 while True:
3427 try:
3428 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003429 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003430 break
3431 fetched_cls.add(cl)
3432 yield cl, status
3433 finally:
3434 pool.close()
3435
3436 # Add any branches that failed to fetch.
3437 for cl in set(changes) - fetched_cls:
3438 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003439
rmistry@google.com2dd99862015-06-22 12:22:18 +00003440
3441def upload_branch_deps(cl, args):
3442 """Uploads CLs of local branches that are dependents of the current branch.
3443
3444 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003445
3446 test1 -> test2.1 -> test3.1
3447 -> test3.2
3448 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003449
3450 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3451 run on the dependent branches in this order:
3452 test2.1, test3.1, test3.2, test2.2, test3.3
3453
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003454 Note: This function does not rebase your local dependent branches. Use it
3455 when you make a change to the parent branch that will not conflict
3456 with its dependent branches, and you would like their dependencies
3457 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003458 """
3459 if git_common.is_dirty_git_tree('upload-branch-deps'):
3460 return 1
3461
3462 root_branch = cl.GetBranch()
3463 if root_branch is None:
3464 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3465 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003466 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003467 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3468 'patchset dependencies without an uploaded CL.')
3469
3470 branches = RunGit(['for-each-ref',
3471 '--format=%(refname:short) %(upstream:short)',
3472 'refs/heads'])
3473 if not branches:
3474 print('No local branches found.')
3475 return 0
3476
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003477 # Create a dictionary of all local branches to the branches that are
3478 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003479 tracked_to_dependents = collections.defaultdict(list)
3480 for b in branches.splitlines():
3481 tokens = b.split()
3482 if len(tokens) == 2:
3483 branch_name, tracked = tokens
3484 tracked_to_dependents[tracked].append(branch_name)
3485
vapiera7fbd5a2016-06-16 09:17:49 -07003486 print()
3487 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003488 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003489
rmistry@google.com2dd99862015-06-22 12:22:18 +00003490 def traverse_dependents_preorder(branch, padding=''):
3491 dependents_to_process = tracked_to_dependents.get(branch, [])
3492 padding += ' '
3493 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003494 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003495 dependents.append(dependent)
3496 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003497
rmistry@google.com2dd99862015-06-22 12:22:18 +00003498 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003499 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003500
3501 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003502 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003503 return 0
3504
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003505 confirm_or_exit('This command will checkout all dependent branches and run '
3506 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003507
rmistry@google.com2dd99862015-06-22 12:22:18 +00003508 # Record all dependents that failed to upload.
3509 failures = {}
3510 # Go through all dependents, checkout the branch and upload.
3511 try:
3512 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003513 print()
3514 print('--------------------------------------')
3515 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003516 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003517 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003518 try:
3519 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003520 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003521 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003522 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003523 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003524 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003525 finally:
3526 # Swap back to the original root branch.
3527 RunGit(['checkout', '-q', root_branch])
3528
vapiera7fbd5a2016-06-16 09:17:49 -07003529 print()
3530 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003531 for dependent_branch in dependents:
3532 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003533 print(' %s : %s' % (dependent_branch, upload_status))
3534 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003535
3536 return 0
3537
3538
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003539def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3540 """Given a proposed tag name, returns a tag name that is guaranteed to be
3541 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3542 or 'foo-3', and so on."""
3543
3544 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3545 for suffix_num in itertools.count(1):
3546 if suffix_num == 1:
3547 to_check = proposed_tag
3548 else:
3549 to_check = '%s-%d' % (proposed_tag, suffix_num)
3550
3551 if to_check not in existing_tags:
3552 return to_check
3553
3554
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003555@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003556def CMDarchive(parser, args):
3557 """Archives and deletes branches associated with closed changelists."""
3558 parser.add_option(
3559 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003560 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003561 parser.add_option(
3562 '-f', '--force', action='store_true',
3563 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003564 parser.add_option(
3565 '-d', '--dry-run', action='store_true',
3566 help='Skip the branch tagging and removal steps.')
3567 parser.add_option(
3568 '-t', '--notags', action='store_true',
3569 help='Do not tag archived branches. '
3570 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003571
kmarshall3bff56b2016-06-06 18:31:47 -07003572 options, args = parser.parse_args(args)
3573 if args:
3574 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003575
3576 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3577 if not branches:
3578 return 0
3579
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003580 tags = RunGit(['for-each-ref', '--format=%(refname)',
3581 'refs/tags']).splitlines() or []
3582 tags = [t.split('/')[-1] for t in tags]
3583
vapiera7fbd5a2016-06-16 09:17:49 -07003584 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003585 changes = [Changelist(branchref=b)
3586 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003587 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3588 statuses = get_cl_statuses(changes,
3589 fine_grained=True,
3590 max_processes=options.maxjobs)
3591 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003592 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3593 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003594 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003595 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003596 proposal.sort()
3597
3598 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003599 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003600 return 0
3601
Edward Lemur85153282020-02-14 22:06:29 +00003602 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003603
vapiera7fbd5a2016-06-16 09:17:49 -07003604 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003605 if options.notags:
3606 for next_item in proposal:
3607 print(' ' + next_item[0])
3608 else:
3609 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3610 for next_item in proposal:
3611 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003612
kmarshall9249e012016-08-23 12:02:16 -07003613 # Quit now on precondition failure or if instructed by the user, either
3614 # via an interactive prompt or by command line flags.
3615 if options.dry_run:
3616 print('\nNo changes were made (dry run).\n')
3617 return 0
3618 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003619 print('You are currently on a branch \'%s\' which is associated with a '
3620 'closed codereview issue, so archive cannot proceed. Please '
3621 'checkout another branch and run this command again.' %
3622 current_branch)
3623 return 1
kmarshall9249e012016-08-23 12:02:16 -07003624 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003625 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3626 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003627 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003628 return 1
3629
3630 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003631 if not options.notags:
3632 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003633
3634 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3635 # Clean up the tag if we failed to delete the branch.
3636 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003637
vapiera7fbd5a2016-06-16 09:17:49 -07003638 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003639
3640 return 0
3641
3642
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003643@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003644def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003645 """Show status of changelists.
3646
3647 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003648 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003649 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003650 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003651 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003652 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003653 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003654 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003655
3656 Also see 'git cl comments'.
3657 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003658 parser.add_option(
3659 '--no-branch-color',
3660 action='store_true',
3661 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003662 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003663 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003664 parser.add_option('-f', '--fast', action='store_true',
3665 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003666 parser.add_option(
3667 '-j', '--maxjobs', action='store', type=int,
3668 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003669 parser.add_option(
3670 '-i', '--issue', type=int,
3671 help='Operate on this issue instead of the current branch\'s implicit '
3672 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003673 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003674 if args:
3675 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003676
iannuccie53c9352016-08-17 14:40:40 -07003677 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003678 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003679
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003680 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003681 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003682 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003683 if cl.GetIssue():
3684 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003685 elif options.field == 'id':
3686 issueid = cl.GetIssue()
3687 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003688 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003689 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003690 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003691 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003692 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003693 elif options.field == 'status':
3694 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003695 elif options.field == 'url':
3696 url = cl.GetIssueURL()
3697 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003698 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003699 return 0
3700
3701 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3702 if not branches:
3703 print('No local branch found.')
3704 return 0
3705
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003706 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003707 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003708 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003709 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003710 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003711 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003712 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003713
Edward Lemur85153282020-02-14 22:06:29 +00003714 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003715
3716 def FormatBranchName(branch, colorize=False):
3717 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3718 an asterisk when it is the current branch."""
3719
3720 asterisk = ""
3721 color = Fore.RESET
3722 if branch == current_branch:
3723 asterisk = "* "
3724 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003725 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003726
3727 if colorize:
3728 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003729 return asterisk + branch_name
3730
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003731 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003732
3733 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003734 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3735 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003736 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003737 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003738 branch_statuses[c.GetBranch()] = status
3739 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003740 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003741 if url and (not status or status == 'error'):
3742 # The issue probably doesn't exist anymore.
3743 url += ' (broken)'
3744
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003745 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003746 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003747 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003748 color = ''
3749 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003750 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003751
Alan Cuttera3be9a52019-03-04 18:50:33 +00003752 branch_display = FormatBranchName(branch)
3753 padding = ' ' * (alignment - len(branch_display))
3754 if not options.no_branch_color:
3755 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003756
Alan Cuttera3be9a52019-03-04 18:50:33 +00003757 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3758 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003759
vapiera7fbd5a2016-06-16 09:17:49 -07003760 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003761 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003762 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003763 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003764 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003765 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003766 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003767 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003768 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003769 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003770 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003771 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003772 return 0
3773
3774
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003775def colorize_CMDstatus_doc():
3776 """To be called once in main() to add colors to git cl status help."""
3777 colors = [i for i in dir(Fore) if i[0].isupper()]
3778
3779 def colorize_line(line):
3780 for color in colors:
3781 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003782 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003783 indent = len(line) - len(line.lstrip(' ')) + 1
3784 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3785 return line
3786
3787 lines = CMDstatus.__doc__.splitlines()
3788 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3789
3790
phajdan.jre328cf92016-08-22 04:12:17 -07003791def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003792 if path == '-':
3793 json.dump(contents, sys.stdout)
3794 else:
3795 with open(path, 'w') as f:
3796 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003797
3798
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003799@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003800@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003801def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003802 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003803
3804 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003805 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003806 parser.add_option('-r', '--reverse', action='store_true',
3807 help='Lookup the branch(es) for the specified issues. If '
3808 'no issues are specified, all branches with mapped '
3809 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003810 parser.add_option('--json',
3811 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003812 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003813
dnj@chromium.org406c4402015-03-03 17:22:28 +00003814 if options.reverse:
3815 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003816 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003817 # Reverse issue lookup.
3818 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003819
3820 git_config = {}
3821 for config in RunGit(['config', '--get-regexp',
3822 r'branch\..*issue']).splitlines():
3823 name, _space, val = config.partition(' ')
3824 git_config[name] = val
3825
dnj@chromium.org406c4402015-03-03 17:22:28 +00003826 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003827 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003828 Changelist.IssueConfigKey())
3829 issue = git_config.get(config_key)
3830 if issue:
3831 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003832 if not args:
3833 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003834 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003835 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003836 try:
3837 issue_num = int(issue)
3838 except ValueError:
3839 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003840 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003841 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003842 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003843 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003844 if options.json:
3845 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003846 return 0
3847
3848 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003849 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003850 if not issue.valid:
3851 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3852 'or no argument to list it.\n'
3853 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003854 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003855 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003856 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003857 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003858 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3859 if options.json:
3860 write_json(options.json, {
3861 'issue': cl.GetIssue(),
3862 'issue_url': cl.GetIssueURL(),
3863 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003864 return 0
3865
3866
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003867@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003868def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003869 """Shows or posts review comments for any changelist."""
3870 parser.add_option('-a', '--add-comment', dest='comment',
3871 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003872 parser.add_option('-p', '--publish', action='store_true',
3873 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003874 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003875 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003876 parser.add_option('-m', '--machine-readable', dest='readable',
3877 action='store_false', default=True,
3878 help='output comments in a format compatible with '
3879 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003880 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003881 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003882 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003883
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003884 issue = None
3885 if options.issue:
3886 try:
3887 issue = int(options.issue)
3888 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003889 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003890
Edward Lemur934836a2019-09-09 20:16:54 +00003891 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003892
3893 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003894 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003895 return 0
3896
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003897 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3898 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003899 for comment in summary:
3900 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003901 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003902 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003903 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003904 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003905 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003906 elif comment.autogenerated:
3907 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003908 else:
3909 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003910 print('\n%s%s %s%s\n%s' % (
3911 color,
3912 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3913 comment.sender,
3914 Fore.RESET,
3915 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3916
smut@google.comc85ac942015-09-15 16:34:43 +00003917 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003918 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003919 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003920 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3921 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003922 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003923 return 0
3924
3925
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003926@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003927@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003928def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003929 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003930 parser.add_option('-d', '--display', action='store_true',
3931 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003932 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003933 help='New description to set for this issue (- for stdin, '
3934 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003935 parser.add_option('-f', '--force', action='store_true',
3936 help='Delete any unpublished Gerrit edits for this issue '
3937 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003938
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003939 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003940
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003941 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003942 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003943 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003944 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003945 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003946
Edward Lemur934836a2019-09-09 20:16:54 +00003947 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003948 if target_issue_arg:
3949 kwargs['issue'] = target_issue_arg.issue
3950 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003951
3952 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003953 if not cl.GetIssue():
3954 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003955
Edward Lemur678a6842019-10-03 22:25:05 +00003956 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003957 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003958
Edward Lemur6c6827c2020-02-06 21:15:18 +00003959 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003960
smut@google.com34fb6b12015-07-13 20:03:26 +00003961 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003962 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003963 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003964
3965 if options.new_description:
3966 text = options.new_description
3967 if text == '-':
3968 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003969 elif text == '+':
3970 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003971 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003972
3973 description.set_description(text)
3974 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003975 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003976 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003977 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003978 return 0
3979
3980
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003981@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003982def CMDlint(parser, args):
3983 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003984 parser.add_option('--filter', action='append', metavar='-x,+y',
3985 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003986 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003987
3988 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003989 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003990 try:
3991 import cpplint
3992 import cpplint_chromium
3993 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003994 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003995 return 1
3996
3997 # Change the current working directory before calling lint so that it
3998 # shows the correct base.
3999 previous_cwd = os.getcwd()
4000 os.chdir(settings.GetRoot())
4001 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004002 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004003 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004004 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004005 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004006 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004007
4008 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004009 command = args + files
4010 if options.filter:
4011 command = ['--filter=' + ','.join(options.filter)] + command
4012 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004013
4014 white_regex = re.compile(settings.GetLintRegex())
4015 black_regex = re.compile(settings.GetLintIgnoreRegex())
4016 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4017 for filename in filenames:
4018 if white_regex.match(filename):
4019 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004020 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004021 else:
4022 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4023 extra_check_functions)
4024 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004025 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004026 finally:
4027 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004028 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004029 if cpplint._cpplint_state.error_count != 0:
4030 return 1
4031 return 0
4032
4033
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004034@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004035def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004036 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004037 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004038 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004039 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004040 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004041 parser.add_option('--all', action='store_true',
4042 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004043 parser.add_option('--parallel', action='store_true',
4044 help='Run all tests specified by input_api.RunTests in all '
4045 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004046 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004047
sbc@chromium.org71437c02015-04-09 19:29:40 +00004048 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004050 return 1
4051
Edward Lemur934836a2019-09-09 20:16:54 +00004052 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004053 if args:
4054 base_branch = args[0]
4055 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004056 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004057 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004058
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004059 if cl.GetIssue():
4060 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004061 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004062 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004063
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004064 cl.RunHook(
4065 committing=not options.upload,
4066 may_prompt=False,
4067 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004068 parallel=options.parallel,
4069 upstream=base_branch,
4070 description=description,
4071 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004072 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004073
4074
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004075def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004076 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004077
4078 Works the same way as
4079 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4080 but can be called on demand on all platforms.
4081
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004082 The basic idea is to generate git hash of a state of the tree, original
4083 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004084 """
4085 lines = []
4086 tree_hash = RunGitSilent(['write-tree'])
4087 lines.append('tree %s' % tree_hash.strip())
4088 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4089 if code == 0:
4090 lines.append('parent %s' % parent.strip())
4091 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4092 lines.append('author %s' % author.strip())
4093 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4094 lines.append('committer %s' % committer.strip())
4095 lines.append('')
4096 # Note: Gerrit's commit-hook actually cleans message of some lines and
4097 # whitespace. This code is not doing this, but it clearly won't decrease
4098 # entropy.
4099 lines.append(message)
4100 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004101 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004102 return 'I%s' % change_hash.strip()
4103
4104
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004105def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004106 """Computes the remote branch ref to use for the CL.
4107
4108 Args:
4109 remote (str): The git remote for the CL.
4110 remote_branch (str): The git remote branch for the CL.
4111 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004112 """
4113 if not (remote and remote_branch):
4114 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004115
wittman@chromium.org455dc922015-01-26 20:15:50 +00004116 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004117 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004118 # refs, which are then translated into the remote full symbolic refs
4119 # below.
4120 if '/' not in target_branch:
4121 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4122 else:
4123 prefix_replacements = (
4124 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4125 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4126 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4127 )
4128 match = None
4129 for regex, replacement in prefix_replacements:
4130 match = re.search(regex, target_branch)
4131 if match:
4132 remote_branch = target_branch.replace(match.group(0), replacement)
4133 break
4134 if not match:
4135 # This is a branch path but not one we recognize; use as-is.
4136 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004137 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4138 # Handle the refs that need to land in different refs.
4139 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004140
wittman@chromium.org455dc922015-01-26 20:15:50 +00004141 # Create the true path to the remote branch.
4142 # Does the following translation:
4143 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4144 # * refs/remotes/origin/master -> refs/heads/master
4145 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4146 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4147 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4148 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4149 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4150 'refs/heads/')
4151 elif remote_branch.startswith('refs/remotes/branch-heads'):
4152 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004153
wittman@chromium.org455dc922015-01-26 20:15:50 +00004154 return remote_branch
4155
4156
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004157def cleanup_list(l):
4158 """Fixes a list so that comma separated items are put as individual items.
4159
4160 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4161 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4162 """
4163 items = sum((i.split(',') for i in l), [])
4164 stripped_items = (i.strip() for i in items)
4165 return sorted(filter(None, stripped_items))
4166
4167
Aaron Gable4db38df2017-11-03 14:59:07 -07004168@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004169@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004170def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004171 """Uploads the current changelist to codereview.
4172
4173 Can skip dependency patchset uploads for a branch by running:
4174 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004175 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004176 git config --unset branch.branch_name.skip-deps-uploads
4177 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004178
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004179 If the name of the checked out branch starts with "bug-" or "fix-" followed
4180 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004181 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004182
4183 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004184 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004185 [git-cl] add support for hashtags
4186 Foo bar: implement foo
4187 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004188 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004189 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4190 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004191 parser.add_option('--bypass-watchlists', action='store_true',
4192 dest='bypass_watchlists',
4193 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004194 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004195 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004196 parser.add_option('--message', '-m', dest='message',
4197 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004198 parser.add_option('-b', '--bug',
4199 help='pre-populate the bug number(s) for this issue. '
4200 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004201 parser.add_option('--message-file', dest='message_file',
4202 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004203 parser.add_option('--title', '-t', dest='title',
4204 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004205 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004206 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004207 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004208 parser.add_option('--tbrs',
4209 action='append', default=[],
4210 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004211 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004212 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004213 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004214 parser.add_option('--hashtag', dest='hashtags',
4215 action='append', default=[],
4216 help=('Gerrit hashtag for new CL; '
4217 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004218 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004219 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004220 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004221 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004222 metavar='TARGET',
4223 help='Apply CL to remote ref TARGET. ' +
4224 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004225 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004226 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004227 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004228 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004229 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004230 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004231 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4232 const='TBR', help='add a set of OWNERS to TBR')
4233 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4234 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004235 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004236 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004237 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004238 'implies --send-mail')
4239 parser.add_option('-d', '--cq-dry-run',
4240 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004241 help='Send the patchset to do a CQ dry run right after '
4242 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004243 parser.add_option('--preserve-tryjobs', action='store_true',
4244 help='instruct the CQ to let tryjobs running even after '
4245 'new patchsets are uploaded instead of canceling '
4246 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004247 parser.add_option('--dependencies', action='store_true',
4248 help='Uploads CLs of all the local branches that depend on '
4249 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004250 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4251 help='Sends your change to the CQ after an approval. Only '
4252 'works on repos that have the Auto-Submit label '
4253 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004254 parser.add_option('--parallel', action='store_true',
4255 help='Run all tests specified by input_api.RunTests in all '
4256 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004257 parser.add_option('--no-autocc', action='store_true',
4258 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004259 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004260 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004261 parser.add_option('-R', '--retry-failed', action='store_true',
4262 help='Retry failed tryjobs from old patchset immediately '
4263 'after uploading new patchset. Cannot be used with '
4264 '--use-commit-queue or --cq-dry-run.')
4265 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4266 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004267 parser.add_option('--fixed', '-x',
4268 help='List of bugs that will be commented on and marked '
4269 'fixed (pre-populates "Fixed:" tag). Same format as '
4270 '-b option / "Bug:" tag. If fixing several issues, '
4271 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004272 parser.add_option('--edit-description', action='store_true', default=False,
4273 help='Modify description before upload. Cannot be used '
4274 'with --force. It is a noop when --no-squash is set '
4275 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004276
rmistry@google.com2dd99862015-06-22 12:22:18 +00004277 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004278 (options, args) = parser.parse_args(args)
4279
sbc@chromium.org71437c02015-04-09 19:29:40 +00004280 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004281 return 1
4282
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004283 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004284 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004285 options.cc = cleanup_list(options.cc)
4286
Josipe827b0f2020-01-30 00:07:20 +00004287 if options.edit_description and options.force:
4288 parser.error('Only one of --force and --edit-description allowed')
4289
tandriib80458a2016-06-23 12:20:07 -07004290 if options.message_file:
4291 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004292 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004293 options.message = gclient_utils.FileRead(options.message_file)
4294 options.message_file = None
4295
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004296 if ([options.cq_dry_run,
4297 options.use_commit_queue,
4298 options.retry_failed].count(True) > 1):
4299 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4300 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004301
Aaron Gableedbc4132017-09-11 13:22:28 -07004302 if options.use_commit_queue:
4303 options.send_mail = True
4304
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004305 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4306 settings.GetIsGerrit()
4307
Edward Lemur934836a2019-09-09 20:16:54 +00004308 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004309 # Warm change details cache now to avoid RPCs later, reducing latency for
4310 # developers.
4311 if cl.GetIssue():
4312 cl._GetChangeDetail(
4313 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4314
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004315 if options.retry_failed and not cl.GetIssue():
4316 print('No previous patchsets, so --retry-failed has no effect.')
4317 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004318
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004319 # cl.GetMostRecentPatchset uses cached information, and can return the last
4320 # patchset before upload. Calling it here makes it clear that it's the
4321 # last patchset before upload. Note that GetMostRecentPatchset will fail
4322 # if no CL has been uploaded yet.
4323 if options.retry_failed:
4324 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004325
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004326 ret = cl.CMDUpload(options, args, orig_args)
4327
4328 if options.retry_failed:
4329 if ret != 0:
4330 print('Upload failed, so --retry-failed has no effect.')
4331 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004332 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004333 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004334 jobs = _filter_failed_for_retry(builds)
4335 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004336 print('No failed tryjobs, so --retry-failed has no effect.')
4337 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004338 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004339
4340 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004341
4342
Francois Dorayd42c6812017-05-30 15:10:20 -04004343@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004344@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004345def CMDsplit(parser, args):
4346 """Splits a branch into smaller branches and uploads CLs.
4347
4348 Creates a branch and uploads a CL for each group of files modified in the
4349 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004350 comment, the string '$directory', is replaced with the directory containing
4351 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004352 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004353 parser.add_option('-d', '--description', dest='description_file',
4354 help='A text file containing a CL description in which '
4355 '$directory will be replaced by each CL\'s directory.')
4356 parser.add_option('-c', '--comment', dest='comment_file',
4357 help='A text file containing a CL comment.')
4358 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004359 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004360 help='List the files and reviewers for each CL that would '
4361 'be created, but don\'t create branches or CLs.')
4362 parser.add_option('--cq-dry-run', action='store_true',
4363 help='If set, will do a cq dry run for each uploaded CL. '
4364 'Please be careful when doing this; more than ~10 CLs '
4365 'has the potential to overload our build '
4366 'infrastructure. Try to upload these not during high '
4367 'load times (usually 11-3 Mountain View time). Email '
4368 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004369 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4370 default=True,
4371 help='Sends your change to the CQ after an approval. Only '
4372 'works on repos that have the Auto-Submit label '
4373 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004374 options, _ = parser.parse_args(args)
4375
4376 if not options.description_file:
4377 parser.error('No --description flag specified.')
4378
4379 def WrappedCMDupload(args):
4380 return CMDupload(OptionParser(), args)
4381
Edward Lemur2c62b332020-03-12 22:12:33 +00004382 return split_cl.SplitCl(
4383 options.description_file, options.comment_file, Changelist,
4384 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4385 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004386
4387
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004388@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004389@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004390def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004391 """DEPRECATED: Used to commit the current changelist via git-svn."""
4392 message = ('git-cl no longer supports committing to SVN repositories via '
4393 'git-svn. You probably want to use `git cl land` instead.')
4394 print(message)
4395 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004396
4397
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004398@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004399@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004400def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004401 """Commits the current changelist via git.
4402
4403 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4404 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004405 """
4406 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4407 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004408 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004409 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004410 parser.add_option('--parallel', action='store_true',
4411 help='Run all tests specified by input_api.RunTests in all '
4412 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004413 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004414
Edward Lemur934836a2019-09-09 20:16:54 +00004415 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004416
Robert Iannucci2e73d432018-03-14 01:10:47 -07004417 if not cl.GetIssue():
4418 DieWithError('You must upload the change first to Gerrit.\n'
4419 ' If you would rather have `git cl land` upload '
4420 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004421 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004422 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004423
4424
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004425@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004426@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004427def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004428 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004429 parser.add_option('-b', dest='newbranch',
4430 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004431 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004432 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004433 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004434 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004435
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004436 group = optparse.OptionGroup(
4437 parser,
4438 'Options for continuing work on the current issue uploaded from a '
4439 'different clone (e.g. different machine). Must be used independently '
4440 'from the other options. No issue number should be specified, and the '
4441 'branch must have an issue number associated with it')
4442 group.add_option('--reapply', action='store_true', dest='reapply',
4443 help='Reset the branch and reapply the issue.\n'
4444 'CAUTION: This will undo any local changes in this '
4445 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004446
4447 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004448 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004449 parser.add_option_group(group)
4450
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004451 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004452
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004453 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004454 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004455 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004456 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004457 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004458
Edward Lemur934836a2019-09-09 20:16:54 +00004459 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004460 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004461 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004462
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004463 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004464 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004465 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004466
4467 RunGit(['reset', '--hard', upstream])
4468 if options.pull:
4469 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004470
Edward Lemur678a6842019-10-03 22:25:05 +00004471 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4472 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004473
4474 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004475 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004476
Edward Lemurf38bc172019-09-03 21:02:13 +00004477 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004478 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004479 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004480
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004481 # We don't want uncommitted changes mixed up with the patch.
4482 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004483 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004484
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004485 if options.newbranch:
4486 if options.force:
4487 RunGit(['branch', '-D', options.newbranch],
4488 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004489 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004490
Edward Lemur678a6842019-10-03 22:25:05 +00004491 cl = Changelist(
4492 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004493
Edward Lemur678a6842019-10-03 22:25:05 +00004494 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004495 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004496
Edward Lemurf38bc172019-09-03 21:02:13 +00004497 return cl.CMDPatchWithParsedIssue(
4498 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004499
4500
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004501def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004502 """Fetches the tree status and returns either 'open', 'closed',
4503 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004504 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004505 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004506 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004507 if status.find('closed') != -1 or status == '0':
4508 return 'closed'
4509 elif status.find('open') != -1 or status == '1':
4510 return 'open'
4511 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004512 return 'unset'
4513
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004514
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004515def GetTreeStatusReason():
4516 """Fetches the tree status from a json url and returns the message
4517 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004518 url = settings.GetTreeStatusUrl()
4519 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004520 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004521 status = json.loads(connection.read())
4522 connection.close()
4523 return status['message']
4524
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004525
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004526@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004527def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004528 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004529 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004530 status = GetTreeStatus()
4531 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004532 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004533 return 2
4534
vapiera7fbd5a2016-06-16 09:17:49 -07004535 print('The tree is %s' % status)
4536 print()
4537 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004538 if status != 'open':
4539 return 1
4540 return 0
4541
4542
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004543@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004544def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004545 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4546 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004547 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004548 '-b', '--bot', action='append',
4549 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4550 'times to specify multiple builders. ex: '
4551 '"-b win_rel -b win_layout". See '
4552 'the try server waterfall for the builders name and the tests '
4553 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004554 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004555 '-B', '--bucket', default='',
4556 help=('Buildbucket bucket to send the try requests.'))
4557 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004558 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004559 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004560 'be determined by the try recipe that builder runs, which usually '
4561 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004562 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004563 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004564 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004565 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004566 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004567 '--category', default='git_cl_try', help='Specify custom build category.')
4568 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004569 '--project',
4570 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004571 'in recipe to determine to which repository or directory to '
4572 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004573 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004574 '-p', '--property', dest='properties', action='append', default=[],
4575 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004576 'key2=value2 etc. The value will be treated as '
4577 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004578 'NOTE: using this may make your tryjob not usable for CQ, '
4579 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004580 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004581 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4582 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004583 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004584 parser.add_option(
4585 '-R', '--retry-failed', action='store_true', default=False,
4586 help='Retry failed jobs from the latest set of tryjobs. '
4587 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004588 parser.add_option(
4589 '-i', '--issue', type=int,
4590 help='Operate on this issue instead of the current branch\'s implicit '
4591 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004592 options, args = parser.parse_args(args)
4593
machenbach@chromium.org45453142015-09-15 08:45:22 +00004594 # Make sure that all properties are prop=value pairs.
4595 bad_params = [x for x in options.properties if '=' not in x]
4596 if bad_params:
4597 parser.error('Got properties with missing "=": %s' % bad_params)
4598
maruel@chromium.org15192402012-09-06 12:38:29 +00004599 if args:
4600 parser.error('Unknown arguments: %s' % args)
4601
Edward Lemur934836a2019-09-09 20:16:54 +00004602 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004603 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004604 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004605
Edward Lemurf38bc172019-09-03 21:02:13 +00004606 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004607 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004608
tandriie113dfd2016-10-11 10:20:12 -07004609 error_message = cl.CannotTriggerTryJobReason()
4610 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004611 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004612
Edward Lemur45768512020-03-02 19:03:14 +00004613 if options.bot:
4614 if options.retry_failed:
4615 parser.error('--bot is not compatible with --retry-failed.')
4616 if not options.bucket:
4617 parser.error('A bucket (e.g. "chromium/try") is required.')
4618
4619 triggered = [b for b in options.bot if 'triggered' in b]
4620 if triggered:
4621 parser.error(
4622 'Cannot schedule builds on triggered bots: %s.\n'
4623 'This type of bot requires an initial job from a parent (usually a '
4624 'builder). Schedule a job on the parent instead.\n' % triggered)
4625
4626 if options.bucket.startswith('.master'):
4627 parser.error('Buildbot masters are not supported.')
4628
4629 project, bucket = _parse_bucket(options.bucket)
4630 if project is None or bucket is None:
4631 parser.error('Invalid bucket: %s.' % options.bucket)
4632 jobs = sorted((project, bucket, bot) for bot in options.bot)
4633 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004634 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004635 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004636 if options.verbose:
4637 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004638 jobs = _filter_failed_for_retry(builds)
4639 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004640 print('There are no failed jobs in the latest set of jobs '
4641 '(patchset #%d), doing nothing.' % patchset)
4642 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004643 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004644 if num_builders > 10:
4645 confirm_or_exit('There are %d builders with failed builds.'
4646 % num_builders, action='continue')
4647 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004648 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004649 print('git cl try with no bots now defaults to CQ dry run.')
4650 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4651 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004652
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004653 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004654 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004655 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004656 except BuildbucketResponseException as ex:
4657 print('ERROR: %s' % ex)
4658 return 1
4659 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004660
4661
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004662@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004663def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004664 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004665 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004666 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004667 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004668 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004669 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004670 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004671 '--color', action='store_true', default=setup_color.IS_TTY,
4672 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004673 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004674 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4675 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004676 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004677 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004678 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004679 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004680 parser.add_option(
4681 '-i', '--issue', type=int,
4682 help='Operate on this issue instead of the current branch\'s implicit '
4683 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004684 options, args = parser.parse_args(args)
4685 if args:
4686 parser.error('Unrecognized args: %s' % ' '.join(args))
4687
Edward Lemur934836a2019-09-09 20:16:54 +00004688 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004689 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004690 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004691
tandrii221ab252016-10-06 08:12:04 -07004692 patchset = options.patchset
4693 if not patchset:
4694 patchset = cl.GetMostRecentPatchset()
4695 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004696 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004697 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004698 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004699 cl.GetIssue())
4700
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004701 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004702 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004703 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004704 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004705 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004706 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004707 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004708 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004709 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004710 return 0
4711
4712
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004713@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004714@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004715def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004716 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004717 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004718 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004719 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004720
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004721 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004722 if args:
4723 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004724 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004725 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004726 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004727 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004728
4729 # Clear configured merge-base, if there is one.
4730 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004731 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004732 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004733 return 0
4734
4735
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004736@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004737def CMDweb(parser, args):
4738 """Opens the current CL in the web browser."""
4739 _, args = parser.parse_args(args)
4740 if args:
4741 parser.error('Unrecognized args: %s' % ' '.join(args))
4742
4743 issue_url = Changelist().GetIssueURL()
4744 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004745 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004746 return 1
4747
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004748 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004749 # allows us to hide the "Created new window in existing browser session."
4750 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004751 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004752 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004753 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004754 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004755 os.open(os.devnull, os.O_RDWR)
4756 try:
4757 webbrowser.open(issue_url)
4758 finally:
4759 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004760 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004761 return 0
4762
4763
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004764@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004765def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004766 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004767 parser.add_option('-d', '--dry-run', action='store_true',
4768 help='trigger in dry run mode')
4769 parser.add_option('-c', '--clear', action='store_true',
4770 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004771 parser.add_option(
4772 '-i', '--issue', type=int,
4773 help='Operate on this issue instead of the current branch\'s implicit '
4774 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004775 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004776 if args:
4777 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004778 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004779 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004780
Edward Lemur934836a2019-09-09 20:16:54 +00004781 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004782 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004783 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004784 elif options.dry_run:
4785 state = _CQState.DRY_RUN
4786 else:
4787 state = _CQState.COMMIT
4788 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004789 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004790 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004791 return 0
4792
4793
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004794@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004795def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004796 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004797 parser.add_option(
4798 '-i', '--issue', type=int,
4799 help='Operate on this issue instead of the current branch\'s implicit '
4800 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004801 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004802 if args:
4803 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004804 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004805 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004806 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004807 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004808 cl.CloseIssue()
4809 return 0
4810
4811
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004812@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004813def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004814 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004815 parser.add_option(
4816 '--stat',
4817 action='store_true',
4818 dest='stat',
4819 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004820 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004821 if args:
4822 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004823
Edward Lemur934836a2019-09-09 20:16:54 +00004824 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004825 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004826 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004827 if not issue:
4828 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004829
Aaron Gablea718c3e2017-08-28 17:47:28 -07004830 base = cl._GitGetBranchConfigValue('last-upload-hash')
4831 if not base:
4832 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4833 if not base:
4834 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4835 revision_info = detail['revisions'][detail['current_revision']]
4836 fetch_info = revision_info['fetch']['http']
4837 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4838 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004839
Aaron Gablea718c3e2017-08-28 17:47:28 -07004840 cmd = ['git', 'diff']
4841 if options.stat:
4842 cmd.append('--stat')
4843 cmd.append(base)
4844 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004845
4846 return 0
4847
4848
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004849@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004850def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004851 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004852 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004853 '--ignore-current',
4854 action='store_true',
4855 help='Ignore the CL\'s current reviewers and start from scratch.')
4856 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004857 '--ignore-self',
4858 action='store_true',
4859 help='Do not consider CL\'s author as an owners.')
4860 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004861 '--no-color',
4862 action='store_true',
4863 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004864 parser.add_option(
4865 '--batch',
4866 action='store_true',
4867 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004868 # TODO: Consider moving this to another command, since other
4869 # git-cl owners commands deal with owners for a given CL.
4870 parser.add_option(
4871 '--show-all',
4872 action='store_true',
4873 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004874 options, args = parser.parse_args(args)
4875
4876 author = RunGit(['config', 'user.email']).strip() or None
4877
Edward Lemur934836a2019-09-09 20:16:54 +00004878 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004879
Yang Guo6e269a02019-06-26 11:17:02 +00004880 if options.show_all:
4881 for arg in args:
4882 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004883 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004884 database.load_data_needed_for([arg])
4885 print('Owners for %s:' % arg)
4886 for owner in sorted(database.all_possible_owners([arg], None)):
4887 print(' - %s' % owner)
4888 return 0
4889
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004890 if args:
4891 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004892 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004893 base_branch = args[0]
4894 else:
4895 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004896 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004897
Edward Lemur2c62b332020-03-12 22:12:33 +00004898 root = settings.GetRoot()
4899 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004900
4901 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004902 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004903 print('\n'.join(db.reviewers_for(affected_files, author)))
4904 return 0
4905
Edward Lemur2c62b332020-03-12 22:12:33 +00004906 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4907 original_owner_files = {
4908 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4909 for f in owner_files}
4910
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004911 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004912 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004913 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004914 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004915 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004916 fopen=open,
4917 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004918 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004919 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004920 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004921
4922
Aiden Bennerc08566e2018-10-03 17:52:42 +00004923def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004924 """Generates a diff command."""
4925 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004926 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4927
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004928 if allow_prefix:
4929 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4930 # case that diff.noprefix is set in the user's git config.
4931 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4932 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004933 diff_cmd += ['--no-prefix']
4934
4935 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004936
4937 if args:
4938 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004939 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004940 diff_cmd.append(arg)
4941 else:
4942 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004943
4944 return diff_cmd
4945
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004946
Jamie Madill5e96ad12020-01-13 16:08:35 +00004947def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4948 """Runs clang-format-diff and sets a return value if necessary."""
4949
4950 if not clang_diff_files:
4951 return 0
4952
4953 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4954 # formatted. This is used to block during the presubmit.
4955 return_value = 0
4956
4957 # Locate the clang-format binary in the checkout
4958 try:
4959 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4960 except clang_format.NotFoundError as e:
4961 DieWithError(e)
4962
4963 if opts.full or settings.GetFormatFullByDefault():
4964 cmd = [clang_format_tool]
4965 if not opts.dry_run and not opts.diff:
4966 cmd.append('-i')
4967 if opts.dry_run:
4968 for diff_file in clang_diff_files:
4969 with open(diff_file, 'r') as myfile:
4970 code = myfile.read().replace('\r\n', '\n')
4971 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4972 stdout = stdout.replace('\r\n', '\n')
4973 if opts.diff:
4974 sys.stdout.write(stdout)
4975 if code != stdout:
4976 return_value = 2
4977 else:
4978 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4979 if opts.diff:
4980 sys.stdout.write(stdout)
4981 else:
4982 env = os.environ.copy()
4983 env['PATH'] = str(os.path.dirname(clang_format_tool))
4984 try:
4985 script = clang_format.FindClangFormatScriptInChromiumTree(
4986 'clang-format-diff.py')
4987 except clang_format.NotFoundError as e:
4988 DieWithError(e)
4989
4990 cmd = [sys.executable, script, '-p0']
4991 if not opts.dry_run and not opts.diff:
4992 cmd.append('-i')
4993
4994 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004995 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004996
4997 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
4998 if opts.diff:
4999 sys.stdout.write(stdout)
5000 if opts.dry_run and len(stdout) > 0:
5001 return_value = 2
5002
5003 return return_value
5004
5005
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005006def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005007 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005008 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005009
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005010
enne@chromium.org555cfe42014-01-29 18:21:39 +00005011@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005012@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005013def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005014 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005015 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005016 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005017 parser.add_option('--full', action='store_true',
5018 help='Reformat the full content of all touched files')
5019 parser.add_option('--dry-run', action='store_true',
5020 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005021 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005022 '--no-clang-format',
5023 dest='clang_format',
5024 action='store_false',
5025 default=True,
5026 help='Disables formatting of various file types using clang-format.')
5027 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005028 '--python',
5029 action='store_true',
5030 default=None,
5031 help='Enables python formatting on all python files.')
5032 parser.add_option(
5033 '--no-python',
5034 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005035 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005036 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005037 'If neither --python or --no-python are set, python files that have a '
5038 '.style.yapf file in an ancestor directory will be formatted. '
5039 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005040 parser.add_option(
5041 '--js',
5042 action='store_true',
5043 help='Format javascript code with clang-format. '
5044 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005045 parser.add_option('--diff', action='store_true',
5046 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005047 parser.add_option('--presubmit', action='store_true',
5048 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005049 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005050
Garrett Beaty91a6f332020-01-06 16:57:24 +00005051 if opts.python is not None and opts.no_python:
5052 raise parser.error('Cannot set both --python and --no-python')
5053 if opts.no_python:
5054 opts.python = False
5055
Daniel Chengc55eecf2016-12-30 03:11:02 -08005056 # Normalize any remaining args against the current path, so paths relative to
5057 # the current directory are still resolved as expected.
5058 args = [os.path.join(os.getcwd(), arg) for arg in args]
5059
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005060 # git diff generates paths against the root of the repository. Change
5061 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005062 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005063 if rel_base_path:
5064 os.chdir(rel_base_path)
5065
digit@chromium.org29e47272013-05-17 17:01:46 +00005066 # Grab the merge-base commit, i.e. the upstream commit of the current
5067 # branch when it was created or the last time it was rebased. This is
5068 # to cover the case where the user may have called "git fetch origin",
5069 # moving the origin branch to a newer commit, but hasn't rebased yet.
5070 upstream_commit = None
5071 cl = Changelist()
5072 upstream_branch = cl.GetUpstreamBranch()
5073 if upstream_branch:
5074 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5075 upstream_commit = upstream_commit.strip()
5076
5077 if not upstream_commit:
5078 DieWithError('Could not find base commit for this branch. '
5079 'Are you in detached state?')
5080
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005081 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5082 diff_output = RunGit(changed_files_cmd)
5083 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005084 # Filter out files deleted by this CL
5085 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005086
Andreas Haas417d89c2020-02-06 10:24:27 +00005087 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005088 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005089
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005090 clang_diff_files = []
5091 if opts.clang_format:
5092 clang_diff_files = [
5093 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5094 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005095 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5096 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005097 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005098
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005099 top_dir = os.path.normpath(
5100 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5101
Jamie Madill5e96ad12020-01-13 16:08:35 +00005102 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5103 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005104
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005105 # Similar code to above, but using yapf on .py files rather than clang-format
5106 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005107 py_explicitly_disabled = opts.python is not None and not opts.python
5108 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005109 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5110 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5111 if sys.platform.startswith('win'):
5112 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005113
Aiden Bennerc08566e2018-10-03 17:52:42 +00005114 # Used for caching.
5115 yapf_configs = {}
5116 for f in python_diff_files:
5117 # Find the yapf style config for the current file, defaults to depot
5118 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005119 _FindYapfConfigFile(f, yapf_configs, top_dir)
5120
5121 # Turn on python formatting by default if a yapf config is specified.
5122 # This breaks in the case of this repo though since the specified
5123 # style file is also the global default.
5124 if opts.python is None:
5125 filtered_py_files = []
5126 for f in python_diff_files:
5127 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5128 filtered_py_files.append(f)
5129 else:
5130 filtered_py_files = python_diff_files
5131
5132 # Note: yapf still seems to fix indentation of the entire file
5133 # even if line ranges are specified.
5134 # See https://github.com/google/yapf/issues/499
5135 if not opts.full and filtered_py_files:
5136 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5137
Brian Sheedyb4307d52019-12-02 19:18:17 +00005138 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5139 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5140 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005141
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005142 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005143 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5144 # Default to pep8 if not .style.yapf is found.
5145 if not yapf_style:
5146 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005147
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005148 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005149
5150 has_formattable_lines = False
5151 if not opts.full:
5152 # Only run yapf over changed line ranges.
5153 for diff_start, diff_len in py_line_diffs[f]:
5154 diff_end = diff_start + diff_len - 1
5155 # Yapf errors out if diff_end < diff_start but this
5156 # is a valid line range diff for a removal.
5157 if diff_end >= diff_start:
5158 has_formattable_lines = True
5159 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5160 # If all line diffs were removals we have nothing to format.
5161 if not has_formattable_lines:
5162 continue
5163
5164 if opts.diff or opts.dry_run:
5165 cmd += ['--diff']
5166 # Will return non-zero exit code if non-empty diff.
5167 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5168 if opts.diff:
5169 sys.stdout.write(stdout)
5170 elif len(stdout) > 0:
5171 return_value = 2
5172 else:
5173 cmd += ['-i']
5174 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005175
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005176 # Dart's formatter does not have the nice property of only operating on
5177 # modified chunks, so hard code full.
5178 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005179 try:
5180 command = [dart_format.FindDartFmtToolInChromiumTree()]
5181 if not opts.dry_run and not opts.diff:
5182 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005183 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005184
ppi@chromium.org6593d932016-03-03 15:41:15 +00005185 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005186 if opts.dry_run and stdout:
5187 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005188 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005189 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5190 'found in this checkout. Files in other languages are still '
5191 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005192
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005193 # Format GN build files. Always run on full build files for canonical form.
5194 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005195 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005196 if opts.dry_run or opts.diff:
5197 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005198 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005199 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5200 shell=sys.platform == 'win32',
5201 cwd=top_dir)
5202 if opts.dry_run and gn_ret == 2:
5203 return_value = 2 # Not formatted.
5204 elif opts.diff and gn_ret == 2:
5205 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005206 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005207 elif gn_ret != 0:
5208 # For non-dry run cases (and non-2 return values for dry-run), a
5209 # nonzero error code indicates a failure, probably because the file
5210 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005211 DieWithError('gn format failed on ' + gn_diff_file +
5212 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005213
Ilya Shermane081cbe2017-08-15 17:51:04 -07005214 # Skip the metrics formatting from the global presubmit hook. These files have
5215 # a separate presubmit hook that issues an error if the files need formatting,
5216 # whereas the top-level presubmit script merely issues a warning. Formatting
5217 # these files is somewhat slow, so it's important not to duplicate the work.
5218 if not opts.presubmit:
5219 for xml_dir in GetDirtyMetricsDirs(diff_files):
5220 tool_dir = os.path.join(top_dir, xml_dir)
5221 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5222 if opts.dry_run or opts.diff:
5223 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005224 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005225 if opts.diff:
5226 sys.stdout.write(stdout)
5227 if opts.dry_run and stdout:
5228 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005229
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005230 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005231
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005232
Steven Holte2e664bf2017-04-21 13:10:47 -07005233def GetDirtyMetricsDirs(diff_files):
5234 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5235 metrics_xml_dirs = [
5236 os.path.join('tools', 'metrics', 'actions'),
5237 os.path.join('tools', 'metrics', 'histograms'),
5238 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005239 os.path.join('tools', 'metrics', 'ukm'),
5240 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005241 for xml_dir in metrics_xml_dirs:
5242 if any(file.startswith(xml_dir) for file in xml_diff_files):
5243 yield xml_dir
5244
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005245
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005246@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005247@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005248def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005249 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005250 _, args = parser.parse_args(args)
5251
5252 if len(args) != 1:
5253 parser.print_help()
5254 return 1
5255
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005256 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005257 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005258 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005259
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005260 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005261
Edward Lemur52969c92020-02-06 18:15:28 +00005262 issueprefix = Changelist.IssueConfigKey()
5263 output = RunGit(['config', '--local', '--get-regexp',
5264 r'branch\..*\.%s' % issueprefix],
5265 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005266
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005267 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005268 for key, issue in [x.split() for x in output.splitlines()]:
5269 if issue == target_issue:
5270 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5271
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005272 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005273 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005274 return 1
5275 if len(branches) == 1:
5276 RunGit(['checkout', branches[0]])
5277 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005278 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005279 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005280 print('%d: %s' % (i, branches[i]))
Edward Lemur1a83da12020-03-04 21:18:36 +00005281 which = ask_for_data('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005282 try:
5283 RunGit(['checkout', branches[int(which)]])
5284 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005285 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005286 return 1
5287
5288 return 0
5289
5290
maruel@chromium.org29404b52014-09-08 22:58:00 +00005291def CMDlol(parser, args):
5292 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005293 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005294 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5295 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5296 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005297 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005298 return 0
5299
5300
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005301class OptionParser(optparse.OptionParser):
5302 """Creates the option parse and add --verbose support."""
5303 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005304 optparse.OptionParser.__init__(
5305 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005306 self.add_option(
5307 '-v', '--verbose', action='count', default=0,
5308 help='Use 2 times for more debugging info')
5309
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005310 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005311 try:
5312 return self._parse_args(args)
5313 finally:
5314 # Regardless of success or failure of args parsing, we want to report
5315 # metrics, but only after logging has been initialized (if parsing
5316 # succeeded).
5317 global settings
5318 settings = Settings()
5319
5320 if not metrics.DISABLE_METRICS_COLLECTION:
5321 # GetViewVCUrl ultimately calls logging method.
5322 project_url = settings.GetViewVCUrl().strip('/+')
5323 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5324 metrics.collector.add('project_urls', [project_url])
5325
5326 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005327 # Create an optparse.Values object that will store only the actual passed
5328 # options, without the defaults.
5329 actual_options = optparse.Values()
5330 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5331 # Create an optparse.Values object with the default options.
5332 options = optparse.Values(self.get_default_values().__dict__)
5333 # Update it with the options passed by the user.
5334 options._update_careful(actual_options.__dict__)
5335 # Store the options passed by the user in an _actual_options attribute.
5336 # We store only the keys, and not the values, since the values can contain
5337 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005338 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005339
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005340 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005341 logging.basicConfig(
5342 level=levels[min(options.verbose, len(levels) - 1)],
5343 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5344 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005345
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005346 return options, args
5347
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005348
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005349def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005350 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005351 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005352 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005353 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005354
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005355 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005356 dispatcher = subcommand.CommandDispatcher(__name__)
5357 try:
5358 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005359 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005360 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005361 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005362 if e.code != 500:
5363 raise
5364 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005365 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005366 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005367 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005368
5369
5370if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005371 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5372 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005373 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005374 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005375 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005376 sys.exit(main(sys.argv[1:]))