blob: ff391a23631738bc5132bcb7a0a5aac477895a27 [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
tandrii9d2c7a32016-06-22 03:42:45 -0700105COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800106POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000107DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000108REFS_THAT_ALIAS_TO_OTHER_REFS = {
109 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
110 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
111}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
thestig@chromium.org44202a22014-03-11 19:22:18 +0000113# Valid extensions for files we want to lint.
114DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
115DEFAULT_LINT_IGNORE_REGEX = r"$^"
116
Aiden Bennerc08566e2018-10-03 17:52:42 +0000117# File name for yapf style config files.
118YAPF_CONFIG_FILENAME = '.style.yapf'
119
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000120# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000121Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000122
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000123# Initialized in main()
124settings = None
125
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100126# Used by tests/git_cl_test.py to add extra logging.
127# Inside the weirdly failing test, add this:
128# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700129# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100130_IS_BEING_TESTED = False
131
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000132
Christopher Lamf732cd52017-01-24 12:40:11 +1100133def DieWithError(message, change_desc=None):
134 if change_desc:
135 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000136 print('\n ** Content of CL description **\n' +
137 '='*72 + '\n' +
138 change_desc.description + '\n' +
139 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100140
vapiera7fbd5a2016-06-16 09:17:49 -0700141 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000142 sys.exit(1)
143
144
Christopher Lamf732cd52017-01-24 12:40:11 +1100145def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000146 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000147 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000148 with open(backup_path, 'w') as backup_file:
149 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100150
151
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000152def GetNoGitPagerEnv():
153 env = os.environ.copy()
154 # 'cat' is a magical git string that disables pagers on all platforms.
155 env['GIT_PAGER'] = 'cat'
156 return env
157
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000158
bsep@chromium.org627d9002016-04-29 00:00:52 +0000159def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000160 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000161 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
162 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000163 except subprocess2.CalledProcessError as e:
164 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000165 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000166 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000167 'Command "%s" failed.\n%s' % (
168 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000169 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000170
171
172def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000173 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000174 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000175
176
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000177def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000178 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700179 if suppress_stderr:
180 stderr = subprocess2.VOID
181 else:
182 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000183 try:
tandrii5d48c322016-08-18 16:19:37 -0700184 (out, _), code = subprocess2.communicate(['git'] + args,
185 env=GetNoGitPagerEnv(),
186 stdout=subprocess2.PIPE,
187 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000188 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700189 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900190 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000191 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000192
193
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000194def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000195 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000196 return RunGitWithCode(args, suppress_stderr=True)[1]
197
198
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000199def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000200 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000201 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000202 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000203 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000204
205
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000206def BranchExists(branch):
207 """Return True if specified branch exists."""
208 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
209 suppress_stderr=True)
210 return not code
211
212
tandrii2a16b952016-10-19 07:09:44 -0700213def time_sleep(seconds):
214 # Use this so that it can be mocked in tests without interfering with python
215 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700216 return time.sleep(seconds)
217
218
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000219def time_time():
220 # Use this so that it can be mocked in tests without interfering with python
221 # system machinery.
222 return time.time()
223
224
Edward Lemur1b52d872019-05-09 21:12:12 +0000225def datetime_now():
226 # Use this so that it can be mocked in tests without interfering with python
227 # system machinery.
228 return datetime.datetime.now()
229
230
Edward Lemur1a83da12020-03-04 21:18:36 +0000231def _raw_input(message):
232 # Use this so that it can be mocked in tests on Python 2 and 3.
233 if sys.version_info.major == 2:
234 return raw_input(message)
235 return input(message)
236
237
maruel@chromium.org90541732011-04-01 17:54:18 +0000238def ask_for_data(prompt):
239 try:
Edward Lemur1a83da12020-03-04 21:18:36 +0000240 return _raw_input(prompt)
maruel@chromium.org90541732011-04-01 17:54:18 +0000241 except KeyboardInterrupt:
242 # Hide the exception.
243 sys.exit(1)
244
245
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100246def confirm_or_exit(prefix='', action='confirm'):
247 """Asks user to press enter to continue or press Ctrl+C to abort."""
248 if not prefix or prefix.endswith('\n'):
249 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100250 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100251 mid = ' Press'
252 elif prefix.endswith(' '):
253 mid = 'press'
254 else:
255 mid = ' press'
256 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
257
258
259def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000260 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100261 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
262 while True:
263 if 'yes'.startswith(result):
264 return True
265 if 'no'.startswith(result):
266 return False
267 result = ask_for_data('Please, type yes or no: ').lower()
268
269
tandrii5d48c322016-08-18 16:19:37 -0700270def _git_branch_config_key(branch, key):
271 """Helper method to return Git config key for a branch."""
272 assert branch, 'branch name is required to set git config for it'
273 return 'branch.%s.%s' % (branch, key)
274
275
machenbach@chromium.org45453142015-09-15 08:45:22 +0000276def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000277 prop_list = getattr(options, 'properties', [])
278 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000279 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000280 try:
281 properties[key] = json.loads(val)
282 except ValueError:
283 pass # If a value couldn't be evaluated, treat it as a string.
284 return properties
285
286
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000287# TODO(crbug.com/976104): Remove this function once git-cl try-results has
288# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000289def _buildbucket_retry(operation_name, http, *args, **kwargs):
290 """Retries requests to buildbucket service and returns parsed json content."""
291 try_count = 0
292 while True:
293 response, content = http.request(*args, **kwargs)
294 try:
295 content_json = json.loads(content)
296 except ValueError:
297 content_json = None
298
299 # Buildbucket could return an error even if status==200.
300 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000301 error = content_json.get('error')
302 if error.get('code') == 403:
303 raise BuildbucketResponseException(
304 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000305 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000306 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000307 raise BuildbucketResponseException(msg)
308
309 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700310 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000311 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000312 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700313 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000314 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000315 content)
316 return content_json
317 if response.status < 500 or try_count >= 2:
318 raise httplib2.HttpLib2Error(content)
319
320 # status >= 500 means transient failures.
321 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000322 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000323 try_count += 1
324 assert False, 'unreachable'
325
326
Edward Lemur4c707a22019-09-24 21:13:43 +0000327def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000328 """Calls a buildbucket v2 method and returns the parsed json response."""
329 headers = {
330 'Accept': 'application/json',
331 'Content-Type': 'application/json',
332 }
333 request = json.dumps(request)
334 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
335
336 logging.info('POST %s with %s' % (url, request))
337
338 attempts = 1
339 time_to_sleep = 1
340 while True:
341 response, content = http.request(url, 'POST', body=request, headers=headers)
342 if response.status == 200:
343 return json.loads(content[4:])
344 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
345 msg = '%s error when calling POST %s with %s: %s' % (
346 response.status, url, request, content)
347 raise BuildbucketResponseException(msg)
348 logging.debug(
349 '%s error when calling POST %s with %s. '
350 'Sleeping for %d seconds and retrying...' % (
351 response.status, url, request, time_to_sleep))
352 time.sleep(time_to_sleep)
353 time_to_sleep *= 2
354 attempts += 1
355
356 assert False, 'unreachable'
357
358
Edward Lemur6215c792019-10-03 21:59:05 +0000359def _parse_bucket(raw_bucket):
360 legacy = True
361 project = bucket = None
362 if '/' in raw_bucket:
363 legacy = False
364 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000365 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000366 elif raw_bucket.startswith('luci.'):
367 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000368 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000369 elif '.' in raw_bucket:
370 project = raw_bucket.split('.')[0]
371 bucket = raw_bucket
372 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000373 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000374 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
375 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000376
377
Quinten Yearsley777660f2020-03-04 23:37:06 +0000378def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000379 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700380
381 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000382 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000383 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700384 options: Command-line options.
385 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000386 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000387 for project, bucket, builder in jobs:
388 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000389 print('To see results here, run: git cl try-results')
390 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700391
Quinten Yearsley777660f2020-03-04 23:37:06 +0000392 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000393 if not requests:
394 return
395
Edward Lemur5b929a42019-10-21 17:57:39 +0000396 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000397 http.force_exception_to_status_code = True
398
399 batch_request = {'requests': requests}
400 batch_response = _call_buildbucket(
401 http, options.buildbucket_host, 'Batch', batch_request)
402
403 errors = [
404 ' ' + response['error']['message']
405 for response in batch_response.get('responses', [])
406 if 'error' in response
407 ]
408 if errors:
409 raise BuildbucketResponseException(
410 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
411
412
Quinten Yearsley777660f2020-03-04 23:37:06 +0000413def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000414 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000415 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000416 shared_properties = {
417 'category': options.ensure_value('category', 'git_cl_try')
418 }
419 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000420 shared_properties['clobber'] = True
421 shared_properties.update(_get_properties_from_options(options) or {})
422
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000423 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000424 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000425 shared_tags.append({'key': 'retry_failed',
426 'value': '1'})
427
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000428 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000429 for (project, bucket, builder) in jobs:
430 properties = shared_properties.copy()
431 if 'presubmit' in builder.lower():
432 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000433
Edward Lemur45768512020-03-02 19:03:14 +0000434 requests.append({
435 'scheduleBuild': {
436 'requestId': str(uuid.uuid4()),
437 'builder': {
438 'project': getattr(options, 'project', None) or project,
439 'bucket': bucket,
440 'builder': builder,
441 },
442 'gerritChanges': gerrit_changes,
443 'properties': properties,
444 'tags': [
445 {'key': 'builder', 'value': builder},
446 ] + shared_tags,
447 }
448 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000449
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000450 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000451 requests[-1]['scheduleBuild']['gitilesCommit'] = {
452 'host': gerrit_changes[0]['host'],
453 'project': gerrit_changes[0]['project'],
454 'id': options.revision
455 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000456
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000457 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000458
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000459
Quinten Yearsley777660f2020-03-04 23:37:06 +0000460def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000461 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000462
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000463 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000464 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000465 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000466 request = {
467 'predicate': {
468 'gerritChanges': [changelist.GetGerritChange(patchset)],
469 },
470 'fields': ','.join('builds.*.' + field for field in fields),
471 }
tandrii221ab252016-10-06 08:12:04 -0700472
Edward Lemur5b929a42019-10-21 17:57:39 +0000473 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000474 if authenticator.has_cached_credentials():
475 http = authenticator.authorize(httplib2.Http())
476 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700477 print('Warning: Some results might be missing because %s' %
478 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000479 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000480 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000481 http.force_exception_to_status_code = True
482
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000483 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
484 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000485
Edward Lemur45768512020-03-02 19:03:14 +0000486
Edward Lemur5b929a42019-10-21 17:57:39 +0000487def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000488 """Fetches builds from the latest patchset that has builds (within
489 the last few patchsets).
490
491 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000492 changelist (Changelist): The CL to fetch builds for
493 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000494 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
495 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000496 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000497 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
498 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000499 """
500 assert buildbucket_host
501 assert changelist.GetIssue(), 'CL must be uploaded first'
502 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000503 if latest_patchset is None:
504 assert changelist.GetMostRecentPatchset()
505 ps = changelist.GetMostRecentPatchset()
506 else:
507 assert latest_patchset > 0, latest_patchset
508 ps = latest_patchset
509
Quinten Yearsley983111f2019-09-26 17:18:48 +0000510 min_ps = max(1, ps - 5)
511 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000512 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000513 if len(builds):
514 return builds, ps
515 ps -= 1
516 return [], 0
517
518
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000519def _filter_failed_for_retry(all_builds):
520 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000521
522 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000523 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000524 i.e. a list of buildbucket.v2.Builds which includes status and builder
525 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000526
527 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000528 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000529 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000530 """
Edward Lemur45768512020-03-02 19:03:14 +0000531 grouped = {}
532 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000533 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000534 key = (builder['project'], builder['bucket'], builder['builder'])
535 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000536
Edward Lemur45768512020-03-02 19:03:14 +0000537 jobs = []
538 for (project, bucket, builder), builds in grouped.items():
539 if 'triggered' in builder:
540 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
541 'from a parent. Please schedule a manual job for the parent '
542 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000543 continue
544 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
545 # Don't retry if any are running.
546 continue
Edward Lemur45768512020-03-02 19:03:14 +0000547 # If builder had several builds, retry only if the last one failed.
548 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
549 # build, but in case of retrying failed jobs retrying a flaky one makes
550 # sense.
551 builds = sorted(builds, key=lambda b: b['createTime'])
552 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
553 continue
554 # Don't retry experimental build previously triggered by CQ.
555 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
556 for t in builds[-1]['tags']):
557 continue
558 jobs.append((project, bucket, builder))
559
560 # Sort the jobs to make testing easier.
561 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000562
563
Quinten Yearsley777660f2020-03-04 23:37:06 +0000564def _print_tryjobs(options, builds):
565 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000567 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 return
569
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 longest_builder = max(len(b['builder']['builder']) for b in builds)
571 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000572 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000573 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
574 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000575
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000576 builds_by_status = {}
577 for b in builds:
578 builds_by_status.setdefault(b['status'], []).append({
579 'id': b['id'],
580 'name': name_fmt.format(
581 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
582 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000583
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000584 sort_key = lambda b: (b['name'], b['id'])
585
586 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000587 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000588 if not builds:
589 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000590
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000591 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000592 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594 else:
595 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
596
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000597 print(colorize(title))
598 for b in sorted(builds, key=sort_key):
599 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600
601 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 print_builds(
603 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
604 print_builds(
605 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
606 color=Fore.MAGENTA)
607 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
608 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
609 color=Fore.MAGENTA)
610 print_builds('Started:', builds_by_status.pop('STARTED', []))
611 print_builds(
612 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000613 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000614 print_builds(
615 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000616 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000617
618
Aiden Bennerc08566e2018-10-03 17:52:42 +0000619def _ComputeDiffLineRanges(files, upstream_commit):
620 """Gets the changed line ranges for each file since upstream_commit.
621
622 Parses a git diff on provided files and returns a dict that maps a file name
623 to an ordered list of range tuples in the form (start_line, count).
624 Ranges are in the same format as a git diff.
625 """
626 # If files is empty then diff_output will be a full diff.
627 if len(files) == 0:
628 return {}
629
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000630 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000631 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000632 diff_output = RunGit(diff_cmd)
633
634 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
635 # 2 capture groups
636 # 0 == fname of diff file
637 # 1 == 'diff_start,diff_count' or 'diff_start'
638 # will match each of
639 # diff --git a/foo.foo b/foo.py
640 # @@ -12,2 +14,3 @@
641 # @@ -12,2 +17 @@
642 # running re.findall on the above string with pattern will give
643 # [('foo.py', ''), ('', '14,3'), ('', '17')]
644
645 curr_file = None
646 line_diffs = {}
647 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
648 if match[0] != '':
649 # Will match the second filename in diff --git a/a.py b/b.py.
650 curr_file = match[0]
651 line_diffs[curr_file] = []
652 else:
653 # Matches +14,3
654 if ',' in match[1]:
655 diff_start, diff_count = match[1].split(',')
656 else:
657 # Single line changes are of the form +12 instead of +12,1.
658 diff_start = match[1]
659 diff_count = 1
660
661 diff_start = int(diff_start)
662 diff_count = int(diff_count)
663
664 # If diff_count == 0 this is a removal we can ignore.
665 line_diffs[curr_file].append((diff_start, diff_count))
666
667 return line_diffs
668
669
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000670def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000671 """Checks if a yapf file is in any parent directory of fpath until top_dir.
672
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000673 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000674 is found returns None. Uses yapf_config_cache as a cache for previously found
675 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000677 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000678 # Return result if we've already computed it.
679 if fpath in yapf_config_cache:
680 return yapf_config_cache[fpath]
681
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000682 parent_dir = os.path.dirname(fpath)
683 if os.path.isfile(fpath):
684 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000685 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000686 # Otherwise fpath is a directory
687 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
688 if os.path.isfile(yapf_file):
689 ret = yapf_file
690 elif fpath == top_dir or parent_dir == fpath:
691 # If we're at the top level directory, or if we're at root
692 # there is no provided style.
693 ret = None
694 else:
695 # Otherwise recurse on the current directory.
696 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000697 yapf_config_cache[fpath] = ret
698 return ret
699
700
Brian Sheedyb4307d52019-12-02 19:18:17 +0000701def _GetYapfIgnorePatterns(top_dir):
702 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000703
704 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
705 but this functionality appears to break when explicitly passing files to
706 yapf for formatting. According to
707 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
708 the .yapfignore file should be in the directory that yapf is invoked from,
709 which we assume to be the top level directory in this case.
710
711 Args:
712 top_dir: The top level directory for the repository being formatted.
713
714 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000715 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000716 """
717 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000718 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000719 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000720 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000721
Brian Sheedyb4307d52019-12-02 19:18:17 +0000722 with open(yapfignore_file) as f:
723 for line in f.readlines():
724 stripped_line = line.strip()
725 # Comments and blank lines should be ignored.
726 if stripped_line.startswith('#') or stripped_line == '':
727 continue
728 ignore_patterns.add(stripped_line)
729 return ignore_patterns
730
731
732def _FilterYapfIgnoredFiles(filepaths, patterns):
733 """Filters out any filepaths that match any of the given patterns.
734
735 Args:
736 filepaths: An iterable of strings containing filepaths to filter.
737 patterns: An iterable of strings containing fnmatch patterns to filter on.
738
739 Returns:
740 A list of strings containing all the elements of |filepaths| that did not
741 match any of the patterns in |patterns|.
742 """
743 # Not inlined so that tests can use the same implementation.
744 return [f for f in filepaths
745 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000746
747
Aaron Gable13101a62018-02-09 13:20:41 -0800748def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000749 """Prints statistics about the change to the user."""
750 # --no-ext-diff is broken in some versions of Git, so try to work around
751 # this by overriding the environment (but there is still a problem if the
752 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000753 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 if 'GIT_EXTERNAL_DIFF' in env:
755 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000756
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800758 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000759 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000760
761
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000762class BuildbucketResponseException(Exception):
763 pass
764
765
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000766class Settings(object):
767 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000769 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000770 self.tree_status_url = None
771 self.viewvc_url = None
772 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000773 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000774 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000775 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000776 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000777 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000778
Edward Lemur26964072020-02-19 19:18:51 +0000779 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000780 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000781 if self.updated:
782 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000783
Edward Lemur26964072020-02-19 19:18:51 +0000784 # The only value that actually changes the behavior is
785 # autoupdate = "false". Everything else means "true".
786 autoupdate = (
787 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
788
789 cr_settings_file = FindCodereviewSettingsFile()
790 if autoupdate != 'false' and cr_settings_file:
791 LoadCodereviewSettingsFromFile(cr_settings_file)
792 cr_settings_file.close()
793
794 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000796 @staticmethod
797 def GetRelativeRoot():
798 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000799
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000801 if self.root is None:
802 self.root = os.path.abspath(self.GetRelativeRoot())
803 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805 def GetTreeStatusUrl(self, error_ok=False):
806 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000807 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
808 if self.tree_status_url is None and not error_ok:
809 DieWithError(
810 'You must configure your tree status URL by running '
811 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812 return self.tree_status_url
813
814 def GetViewVCUrl(self):
815 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000816 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000817 return self.viewvc_url
818
rmistry@google.com90752582014-01-14 21:04:50 +0000819 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000820 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000821
rmistry@google.com5626a922015-02-26 14:03:30 +0000822 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000823 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000824 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000825 return run_post_upload_hook == "True"
826
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000827 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000828 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000829
ukai@chromium.orge8077812012-02-03 03:41:46 +0000830 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000831 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000832 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000833 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000834 return self.is_gerrit
835
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000836 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000837 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000838 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700839 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000840 if self.squash_gerrit_uploads is None:
841 # Default is squash now (http://crbug.com/611892#c23).
842 self.squash_gerrit_uploads = self._GetConfig(
843 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000844 return self.squash_gerrit_uploads
845
tandriia60502f2016-06-20 02:01:53 -0700846 def GetSquashGerritUploadsOverride(self):
847 """Return True or False if codereview.settings should be overridden.
848
849 Returns None if no override has been defined.
850 """
851 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000852 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700853 if result == 'true':
854 return True
855 if result == 'false':
856 return False
857 return None
858
tandrii@chromium.org28253532016-04-14 13:46:56 +0000859 def GetGerritSkipEnsureAuthenticated(self):
860 """Return True if EnsureAuthenticated should not be done for Gerrit
861 uploads."""
862 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000863 self.gerrit_skip_ensure_authenticated = self._GetConfig(
864 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000865 return self.gerrit_skip_ensure_authenticated
866
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000867 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000868 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000869 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000870 # Git requires single quotes for paths with spaces. We need to replace
871 # them with double quotes for Windows to treat such paths as a single
872 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000873 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000874 return self.git_editor or None
875
thestig@chromium.org44202a22014-03-11 19:22:18 +0000876 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000877 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000878
879 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000880 return self._GetConfig(
881 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000882
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000883 def GetFormatFullByDefault(self):
884 if self.format_full_by_default is None:
885 result = (
886 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
887 error_ok=True).strip())
888 self.format_full_by_default = (result == 'true')
889 return self.format_full_by_default
890
Edward Lemur26964072020-02-19 19:18:51 +0000891 def _GetConfig(self, key, default=''):
892 self._LazyUpdateIfNeeded()
893 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000894
895
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000896class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000897 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000898 NONE = 'none'
899 DRY_RUN = 'dry_run'
900 COMMIT = 'commit'
901
902 ALL_STATES = [NONE, DRY_RUN, COMMIT]
903
904
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000905class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000906 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000907 self.issue = issue
908 self.patchset = patchset
909 self.hostname = hostname
910
911 @property
912 def valid(self):
913 return self.issue is not None
914
915
Edward Lemurf38bc172019-09-03 21:02:13 +0000916def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000917 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
918 fail_result = _ParsedIssueNumberArgument()
919
Edward Lemur678a6842019-10-03 22:25:05 +0000920 if isinstance(arg, int):
921 return _ParsedIssueNumberArgument(issue=arg)
922 if not isinstance(arg, basestring):
923 return fail_result
924
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000925 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000926 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000927 if not arg.startswith('http'):
928 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700929
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000930 url = gclient_utils.UpgradeToHttps(arg)
931 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000932 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000933 except ValueError:
934 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200935
Edward Lemur678a6842019-10-03 22:25:05 +0000936 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
937 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
938 # Short urls like https://domain/<issue_number> can be used, but don't allow
939 # specifying the patchset (you'd 404), but we allow that here.
940 if parsed_url.path == '/':
941 part = parsed_url.fragment
942 else:
943 part = parsed_url.path
944
945 match = re.match(
946 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
947 if not match:
948 return fail_result
949
950 issue = int(match.group('issue'))
951 patchset = match.group('patchset')
952 return _ParsedIssueNumberArgument(
953 issue=issue,
954 patchset=int(patchset) if patchset else None,
955 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000956
957
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000958def _create_description_from_log(args):
959 """Pulls out the commit log to use as a base for the CL description."""
960 log_args = []
961 if len(args) == 1 and not args[0].endswith('.'):
962 log_args = [args[0] + '..']
963 elif len(args) == 1 and args[0].endswith('...'):
964 log_args = [args[0][:-1]]
965 elif len(args) == 2:
966 log_args = [args[0] + '..' + args[1]]
967 else:
968 log_args = args[:] # Hope for the best!
Edward Lemura12175c2020-03-09 16:58:26 +0000969 return RunGit(['log', '--pretty=format:%s%n%n%b'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000970
971
Aaron Gablea45ee112016-11-22 15:14:38 -0800972class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700973 def __init__(self, issue, url):
974 self.issue = issue
975 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800976 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700977
978 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800979 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700980 self.issue, self.url)
981
982
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100983_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000984 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100985 # TODO(tandrii): these two aren't known in Gerrit.
986 'approval', 'disapproval'])
987
988
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000989class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000990 """Changelist works with one changelist in local branch.
991
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000992 Notes:
993 * Not safe for concurrent multi-{thread,process} use.
994 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700995 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000996 """
997
Edward Lemur125d60a2019-09-13 18:25:41 +0000998 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000999 """Create a new ChangeList instance.
1000
Edward Lemurf38bc172019-09-03 21:02:13 +00001001 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001002 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001003 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001004 global settings
1005 if not settings:
1006 # Happens when git_cl.py is used as a utility library.
1007 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009 self.branchref = branchref
1010 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001011 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001012 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001013 else:
1014 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001015 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001016 self.lookedup_issue = False
1017 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001019 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001020 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001021 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001022 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001023 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001024 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001025
Edward Lemur125d60a2019-09-13 18:25:41 +00001026 # Lazily cached values.
1027 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1028 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1029 # Map from change number (issue) to its detail cache.
1030 self._detail_cache = {}
1031
1032 if codereview_host is not None:
1033 assert not codereview_host.startswith('https://'), codereview_host
1034 self._gerrit_host = codereview_host
1035 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001036
1037 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001038 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001039
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001040 The return value is a string suitable for passing to git cl with the --cc
1041 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001042 """
1043 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001044 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001045 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001046 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1047 return self.cc
1048
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001049 def GetCCListWithoutDefault(self):
1050 """Return the users cc'd on this CL excluding default ones."""
1051 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001052 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001053 return self.cc
1054
Daniel Cheng7227d212017-11-17 08:12:37 -08001055 def ExtendCC(self, more_cc):
1056 """Extends the list of users to cc on this CL based on the changed files."""
1057 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001058
1059 def GetBranch(self):
1060 """Returns the short branch name, e.g. 'master'."""
1061 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001062 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001063 if not branchref:
1064 return None
1065 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001066 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001067 return self.branch
1068
1069 def GetBranchRef(self):
1070 """Returns the full branch name, e.g. 'refs/heads/master'."""
1071 self.GetBranch() # Poke the lazy loader.
1072 return self.branchref
1073
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001074 def ClearBranch(self):
1075 """Clears cached branch data of this object."""
1076 self.branch = self.branchref = None
1077
Edward Lemur85153282020-02-14 22:06:29 +00001078 def _GitGetBranchConfigValue(self, key, default=None):
1079 return scm.GIT.GetBranchConfig(
1080 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001081
Edward Lemur85153282020-02-14 22:06:29 +00001082 def _GitSetBranchConfigValue(self, key, value):
1083 action = 'set %s to %r' % (key, value)
1084 if not value:
1085 action = 'unset %s' % key
1086 assert self.GetBranch(), 'a branch is needed to ' + action
1087 return scm.GIT.SetBranchConfig(
1088 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001089
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001090 @staticmethod
1091 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001092 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001093 e.g. 'origin', 'refs/heads/master'
1094 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001095 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1096 settings.GetRoot(), branch)
1097 if not remote or not upstream_branch:
1098 DieWithError(
1099 'Unable to determine default branch to diff against.\n'
1100 'Either pass complete "git diff"-style arguments, like\n'
1101 ' git cl upload origin/master\n'
1102 'or verify this branch is set up to track another \n'
1103 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001104
1105 return remote, upstream_branch
1106
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001107 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001108 upstream_branch = self.GetUpstreamBranch()
1109 if not BranchExists(upstream_branch):
1110 DieWithError('The upstream for the current branch (%s) does not exist '
1111 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001112 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001113 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001114
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001115 def GetUpstreamBranch(self):
1116 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001117 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001118 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001119 upstream_branch = upstream_branch.replace('refs/heads/',
1120 'refs/remotes/%s/' % remote)
1121 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1122 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001123 self.upstream_branch = upstream_branch
1124 return self.upstream_branch
1125
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001126 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001127 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001128 remote, branch = None, self.GetBranch()
1129 seen_branches = set()
1130 while branch not in seen_branches:
1131 seen_branches.add(branch)
1132 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001133 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001134 if remote != '.' or branch.startswith('refs/remotes'):
1135 break
1136 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001137 remotes = RunGit(['remote'], error_ok=True).split()
1138 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001139 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001140 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001141 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001142 logging.warn('Could not determine which remote this change is '
1143 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001144 else:
1145 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001146 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001147 branch = 'HEAD'
1148 if branch.startswith('refs/remotes'):
1149 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001150 elif branch.startswith('refs/branch-heads/'):
1151 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001152 else:
1153 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001154 return self._remote
1155
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001156 def GitSanityChecks(self, upstream_git_obj):
1157 """Checks git repo status and ensures diff is from local commits."""
1158
sbc@chromium.org79706062015-01-14 21:18:12 +00001159 if upstream_git_obj is None:
1160 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001161 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001162 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001163 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001164 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001165 return False
1166
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 # Verify the commit we're diffing against is in our current branch.
1168 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1169 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1170 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001171 print('ERROR: %s is not in the current branch. You may need to rebase '
1172 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 return False
1174
1175 # List the commits inside the diff, and verify they are all local.
1176 commits_in_diff = RunGit(
1177 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1178 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1179 remote_branch = remote_branch.strip()
1180 if code != 0:
1181 _, remote_branch = self.GetRemoteBranch()
1182
1183 commits_in_remote = RunGit(
1184 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1185
1186 common_commits = set(commits_in_diff) & set(commits_in_remote)
1187 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001188 print('ERROR: Your diff contains %d commits already in %s.\n'
1189 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1190 'the diff. If you are using a custom git flow, you can override'
1191 ' the reference used for this check with "git config '
1192 'gitcl.remotebranch <git-ref>".' % (
1193 len(common_commits), remote_branch, upstream_git_obj),
1194 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001195 return False
1196 return True
1197
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001198 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001199 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001200
1201 Returns None if it is not set.
1202 """
tandrii5d48c322016-08-18 16:19:37 -07001203 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001204
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001205 def GetRemoteUrl(self):
1206 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1207
1208 Returns None if there is no remote.
1209 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001210 is_cached, value = self._cached_remote_url
1211 if is_cached:
1212 return value
1213
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001214 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001215 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001216
Edward Lemur298f2cf2019-02-22 21:40:39 +00001217 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001218 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001219 if host:
1220 self._cached_remote_url = (True, url)
1221 return url
1222
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001223 # If it cannot be parsed as an url, assume it is a local directory,
1224 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001225 logging.warning('"%s" doesn\'t appear to point to a git host. '
1226 'Interpreting it as a local directory.', url)
1227 if not os.path.isdir(url):
1228 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001229 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1230 'but it doesn\'t exist.',
1231 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001232 return None
1233
1234 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001235 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001236
Edward Lemur79d4f992019-11-11 23:49:02 +00001237 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001238 if not host:
1239 logging.error(
1240 'Remote "%(remote)s" for branch "%(branch)s" points to '
1241 '"%(cache_path)s", but it is misconfigured.\n'
1242 '"%(cache_path)s" must be a git repo and must have a remote named '
1243 '"%(remote)s" pointing to the git host.', {
1244 'remote': remote,
1245 'cache_path': cache_path,
1246 'branch': self.GetBranch()})
1247 return None
1248
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001249 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001250 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001251
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001252 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001253 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001254 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001255 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1256 if self.issue is not None:
1257 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001258 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259 return self.issue
1260
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 def GetIssueURL(self):
1262 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001263 issue = self.GetIssue()
1264 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001265 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001266 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267
Edward Lemur6c6827c2020-02-06 21:15:18 +00001268 def FetchDescription(self, pretty=False):
1269 assert self.GetIssue(), 'issue is required to query Gerrit'
1270
Edward Lemur9aa1a962020-02-25 00:58:38 +00001271 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001272 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1273 current_rev = data['current_revision']
1274 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001275
1276 if not pretty:
1277 return self.description
1278
1279 # Set width to 72 columns + 2 space indent.
1280 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1281 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1282 lines = self.description.splitlines()
1283 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284
1285 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001286 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001287 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001288 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1289 if self.patchset is not None:
1290 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001291 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292 return self.patchset
1293
Edward Lemur9aa1a962020-02-25 00:58:38 +00001294 def GetAuthor(self):
1295 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1296
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001298 """Set this branch's patchset. If patchset=0, clears the patchset."""
1299 assert self.GetBranch()
1300 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001301 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001302 else:
1303 self.patchset = int(patchset)
1304 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001305 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001306
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001307 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001308 """Set this branch's issue. If issue isn't given, clears the issue."""
1309 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001310 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001311 issue = int(issue)
1312 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001313 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001314 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001315 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001316 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001317 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001318 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001319 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001320 else:
tandrii5d48c322016-08-18 16:19:37 -07001321 # Reset all of these just to be clean.
1322 reset_suffixes = [
1323 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001324 self.IssueConfigKey(),
1325 self.PatchsetConfigKey(),
1326 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001327 ] + self._PostUnsetIssueProperties()
1328 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001329 try:
1330 self._GitSetBranchConfigValue(prop, None)
1331 except subprocess2.CalledProcessError:
1332 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001333 msg = RunGit(['log', '-1', '--format=%B']).strip()
1334 if msg and git_footers.get_footer_change_id(msg):
1335 print('WARNING: The change patched into this branch has a Change-Id. '
1336 'Removing it.')
1337 RunGit(['commit', '--amend', '-m',
1338 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001339 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001340 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001341 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001342
Edward Lemura12175c2020-03-09 16:58:26 +00001343 def GetChange(self, upstream_branch, description):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001344 if not self.GitSanityChecks(upstream_branch):
1345 DieWithError('\nGit sanity check failure')
1346
Edward Lemur7f6dec02020-02-06 20:23:58 +00001347 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001348 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001349 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001350 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001351 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001352 except subprocess2.CalledProcessError:
1353 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001354 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001355 'This branch probably doesn\'t exist anymore. To reset the\n'
1356 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001357 ' git branch --set-upstream-to origin/master %s\n'
1358 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001359 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001360
maruel@chromium.org52424302012-08-29 15:14:30 +00001361 issue = self.GetIssue()
1362 patchset = self.GetPatchset()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001363
Edward Lemur9aa1a962020-02-25 00:58:38 +00001364 author = self.GetAuthor()
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001365 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001366 name,
1367 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001368 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001369 files,
1370 issue,
1371 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001372 author,
1373 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001374
dsansomee2d6fd92016-09-08 00:10:47 -07001375 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001376 assert self.GetIssue(), 'issue is required to update description'
1377
1378 if gerrit_util.HasPendingChangeEdit(
1379 self._GetGerritHost(), self._GerritChangeIdentifier()):
1380 if not force:
1381 confirm_or_exit(
1382 'The description cannot be modified while the issue has a pending '
1383 'unpublished edit. Either publish the edit in the Gerrit web UI '
1384 'or delete it.\n\n', action='delete the unpublished edit')
1385
1386 gerrit_util.DeletePendingChangeEdit(
1387 self._GetGerritHost(), self._GerritChangeIdentifier())
1388 gerrit_util.SetCommitMessage(
1389 self._GetGerritHost(), self._GerritChangeIdentifier(),
1390 description, notify='NONE')
1391
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001392 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001393
Edward Lemur75526302020-02-27 22:31:05 +00001394 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001395 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001396 '--root', settings.GetRoot(),
1397 '--upstream', upstream,
1398 ]
1399
1400 args.extend(['--verbose'] * verbose)
1401
Edward Lemur99df04e2020-03-05 19:39:43 +00001402 author = self.GetAuthor()
1403 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001404 issue = self.GetIssue()
1405 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001406 if author:
1407 args.extend(['--author', author])
1408 if gerrit_url:
1409 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001410 if issue:
1411 args.extend(['--issue', str(issue)])
1412 if patchset:
1413 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001414
Edward Lemur75526302020-02-27 22:31:05 +00001415 return args
1416
1417 def RunHook(
1418 self, committing, may_prompt, verbose, parallel, upstream, description,
1419 all_files):
1420 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1421 args = self._GetCommonPresubmitArgs(verbose, upstream)
1422 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001423 if may_prompt:
1424 args.append('--may_prompt')
1425 if parallel:
1426 args.append('--parallel')
1427 if all_files:
1428 args.append('--all_files')
1429
1430 with gclient_utils.temporary_file() as description_file:
1431 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001432
1433 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001434 args.extend(['--json_output', json_output])
1435 args.extend(['--description_file', description_file])
1436
1437 start = time_time()
1438 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1439 exit_code = p.wait()
1440 metrics.collector.add_repeated('sub_commands', {
1441 'command': 'presubmit',
1442 'execution_time': time_time() - start,
1443 'exit_code': exit_code,
1444 })
1445
1446 if exit_code:
1447 sys.exit(exit_code)
1448
1449 json_results = gclient_utils.FileRead(json_output)
1450 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001451
Edward Lemur75526302020-02-27 22:31:05 +00001452 def RunPostUploadHook(self, verbose, upstream, description):
1453 args = self._GetCommonPresubmitArgs(verbose, upstream)
1454 args.append('--post_upload')
1455
1456 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001457 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001458 args.extend(['--description_file', description_file])
1459 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1460 p.wait()
1461
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001462 def CMDUpload(self, options, git_diff_args, orig_args):
1463 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001464 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001465 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001466 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001467 else:
1468 if self.GetBranch() is None:
1469 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1470
1471 # Default to diffing against common ancestor of upstream branch
1472 base_branch = self.GetCommonAncestorWithUpstream()
1473 git_diff_args = [base_branch, 'HEAD']
1474
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001475 # Fast best-effort checks to abort before running potentially expensive
1476 # hooks if uploading is likely to fail anyway. Passing these checks does
1477 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001478 self.EnsureAuthenticated(force=options.force)
1479 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001480
Edward Lemura12175c2020-03-09 16:58:26 +00001481 # Get description message for upload.
1482 if self.GetIssue():
1483 description = self.FetchDescription()
1484 elif options.message:
1485 description = options.message
1486 else:
1487 description = _create_description_from_log(git_diff_args)
1488 if options.title and options.squash:
1489 description = options.title + '\n\n' + message
1490
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001491 # Apply watchlists on upload.
Edward Lemura12175c2020-03-09 16:58:26 +00001492 change = self.GetChange(base_branch, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001493 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1494 files = [f.LocalPath() for f in change.AffectedFiles()]
1495 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001496 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001497
Edward Lemur75526302020-02-27 22:31:05 +00001498 if options.reviewers or options.tbrs or options.add_owners_to:
1499 # Set the reviewer list now so that presubmit checks can access it.
1500 change_description = ChangeDescription(description)
1501 change_description.update_reviewers(options.reviewers,
1502 options.tbrs,
1503 options.add_owners_to,
1504 change)
1505 description = change_description.description
1506
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001507 if not options.bypass_hooks:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001508 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001509 may_prompt=not options.force,
1510 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001511 parallel=options.parallel,
1512 upstream=base_branch,
1513 description=description,
1514 all_files=False)
1515 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001516
Aaron Gable13101a62018-02-09 13:20:41 -08001517 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001518 ret = self.CMDUploadChange(
1519 options, git_diff_args, custom_cl_base, change, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001520 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001521 self._GitSetBranchConfigValue(
1522 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001523 # Run post upload hooks, if specified.
1524 if settings.GetRunPostUploadHook():
Edward Lemur75526302020-02-27 22:31:05 +00001525 self.RunPostUploadHook(options.verbose, base_branch, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001526
1527 # Upload all dependencies if specified.
1528 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001529 print()
1530 print('--dependencies has been specified.')
1531 print('All dependent local branches will be re-uploaded.')
1532 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001533 # Remove the dependencies flag from args so that we do not end up in a
1534 # loop.
1535 orig_args.remove('--dependencies')
1536 ret = upload_branch_deps(self, orig_args)
1537 return ret
1538
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001539 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001540 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001541
1542 Issue must have been already uploaded and known.
1543 """
1544 assert new_state in _CQState.ALL_STATES
1545 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001546 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001547 vote_map = {
1548 _CQState.NONE: 0,
1549 _CQState.DRY_RUN: 1,
1550 _CQState.COMMIT: 2,
1551 }
1552 labels = {'Commit-Queue': vote_map[new_state]}
1553 notify = False if new_state == _CQState.DRY_RUN else None
1554 gerrit_util.SetReview(
1555 self._GetGerritHost(), self._GerritChangeIdentifier(),
1556 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001557 return 0
1558 except KeyboardInterrupt:
1559 raise
1560 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001561 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001562 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001563 ' * Your project has no CQ,\n'
1564 ' * You don\'t have permission to change the CQ state,\n'
1565 ' * There\'s a bug in this code (see stack trace below).\n'
1566 'Consider specifying which bots to trigger manually or asking your '
1567 'project owners for permissions or contacting Chrome Infra at:\n'
1568 'https://www.chromium.org/infra\n\n' %
1569 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001570 # Still raise exception so that stack trace is printed.
1571 raise
1572
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001573 def _GetGerritHost(self):
1574 # Lazy load of configs.
1575 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001576 if self._gerrit_host and '.' not in self._gerrit_host:
1577 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1578 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001579 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001580 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001581 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001582 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001583 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1584 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001585 return self._gerrit_host
1586
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001587 def _GetGitHost(self):
1588 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001589 remote_url = self.GetRemoteUrl()
1590 if not remote_url:
1591 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001592 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001593
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001594 def GetCodereviewServer(self):
1595 if not self._gerrit_server:
1596 # If we're on a branch then get the server potentially associated
1597 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001598 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001599 self._gerrit_server = self._GitGetBranchConfigValue(
1600 self.CodereviewServerConfigKey())
1601 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001602 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001603 if not self._gerrit_server:
1604 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1605 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001606 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001607 parts[0] = parts[0] + '-review'
1608 self._gerrit_host = '.'.join(parts)
1609 self._gerrit_server = 'https://%s' % self._gerrit_host
1610 return self._gerrit_server
1611
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001612 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001613 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001614 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001615 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001616 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001617 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001618 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001619 if project.endswith('.git'):
1620 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001621 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1622 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1623 # gitiles/git-over-https protocol. E.g.,
1624 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1625 # as
1626 # https://chromium.googlesource.com/v8/v8
1627 if project.startswith('a/'):
1628 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001629 return project
1630
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001631 def _GerritChangeIdentifier(self):
1632 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1633
1634 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001635 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001636 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001637 project = self._GetGerritProject()
1638 if project:
1639 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1640 # Fall back on still unique, but less efficient change number.
1641 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001642
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001643 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001644 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001645 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001646
tandrii5d48c322016-08-18 16:19:37 -07001647 @classmethod
1648 def PatchsetConfigKey(cls):
1649 return 'gerritpatchset'
1650
1651 @classmethod
1652 def CodereviewServerConfigKey(cls):
1653 return 'gerritserver'
1654
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001655 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001656 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001657 if settings.GetGerritSkipEnsureAuthenticated():
1658 # For projects with unusual authentication schemes.
1659 # See http://crbug.com/603378.
1660 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001661
1662 # Check presence of cookies only if using cookies-based auth method.
1663 cookie_auth = gerrit_util.Authenticator.get()
1664 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001665 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001666
Florian Mayerae510e82020-01-30 21:04:48 +00001667 remote_url = self.GetRemoteUrl()
1668 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001669 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001670 return
1671 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001672 logging.warning('Ignoring branch %(branch)s with non-https remote '
1673 '%(remote)s', {
1674 'branch': self.branch,
1675 'remote': self.GetRemoteUrl()
1676 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001677 return
1678
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001679 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001680 self.GetCodereviewServer()
1681 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001682 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001683
1684 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1685 git_auth = cookie_auth.get_auth_header(git_host)
1686 if gerrit_auth and git_auth:
1687 if gerrit_auth == git_auth:
1688 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001689 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001690 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001691 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001692 ' %s\n'
1693 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001694 ' Consider running the following command:\n'
1695 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001696 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001697 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001698 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001699 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001700 cookie_auth.get_new_password_message(git_host)))
1701 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001702 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001703 return
1704 else:
1705 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001706 ([] if gerrit_auth else [self._gerrit_host]) +
1707 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001708 DieWithError('Credentials for the following hosts are required:\n'
1709 ' %s\n'
1710 'These are read from %s (or legacy %s)\n'
1711 '%s' % (
1712 '\n '.join(missing),
1713 cookie_auth.get_gitcookies_path(),
1714 cookie_auth.get_netrc_path(),
1715 cookie_auth.get_new_password_message(git_host)))
1716
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001717 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001718 if not self.GetIssue():
1719 return
1720
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001721 status = self._GetChangeDetail()['status']
1722 if status in ('MERGED', 'ABANDONED'):
1723 DieWithError('Change %s has been %s, new uploads are not allowed' %
1724 (self.GetIssueURL(),
1725 'submitted' if status == 'MERGED' else 'abandoned'))
1726
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001727 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1728 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1729 # Apparently this check is not very important? Otherwise get_auth_email
1730 # could have been added to other implementations of Authenticator.
1731 cookies_auth = gerrit_util.Authenticator.get()
1732 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001733 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001734
1735 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001736 if self.GetIssueOwner() == cookies_user:
1737 return
1738 logging.debug('change %s owner is %s, cookies user is %s',
1739 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001740 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001741 # so ask what Gerrit thinks of this user.
1742 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1743 if details['email'] == self.GetIssueOwner():
1744 return
1745 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001746 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001747 'as %s.\n'
1748 'Uploading may fail due to lack of permissions.' %
1749 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1750 confirm_or_exit(action='upload')
1751
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001752 def _PostUnsetIssueProperties(self):
1753 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001754 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001755
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001756 def GetGerritObjForPresubmit(self):
1757 return presubmit_support.GerritAccessor(self._GetGerritHost())
1758
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001759 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001760 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001761 or CQ status, assuming adherence to a common workflow.
1762
1763 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001764 * 'error' - error from review tool (including deleted issues)
1765 * 'unsent' - no reviewers added
1766 * 'waiting' - waiting for review
1767 * 'reply' - waiting for uploader to reply to review
1768 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001769 * 'dry-run' - dry-running in the CQ
1770 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001771 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001772 """
1773 if not self.GetIssue():
1774 return None
1775
1776 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001777 data = self._GetChangeDetail([
1778 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001779 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001780 return 'error'
1781
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001782 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001783 return 'closed'
1784
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001785 cq_label = data['labels'].get('Commit-Queue', {})
1786 max_cq_vote = 0
1787 for vote in cq_label.get('all', []):
1788 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1789 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001790 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001791 if max_cq_vote == 1:
1792 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001793
Aaron Gable9ab38c62017-04-06 14:36:33 -07001794 if data['labels'].get('Code-Review', {}).get('approved'):
1795 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001796
1797 if not data.get('reviewers', {}).get('REVIEWER', []):
1798 return 'unsent'
1799
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001800 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001801 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001802 last_message_author = messages.pop().get('author', {})
1803 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001804 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1805 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001806 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001807 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001808 if last_message_author.get('_account_id') == owner:
1809 # Most recent message was by owner.
1810 return 'waiting'
1811 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001812 # Some reply from non-owner.
1813 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001814
1815 # Somehow there are no messages even though there are reviewers.
1816 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001817
1818 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001819 if not self.GetIssue():
1820 return None
1821
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001822 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001823 patchset = data['revisions'][data['current_revision']]['_number']
1824 self.SetPatchset(patchset)
1825 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001826
Aaron Gable636b13f2017-07-14 10:42:48 -07001827 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001828 gerrit_util.SetReview(
1829 self._GetGerritHost(), self._GerritChangeIdentifier(),
1830 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001831
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001832 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001833 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001834 # CURRENT_REVISION is included to get the latest patchset so that
1835 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001836 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001837 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1838 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001839 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001840 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001841 robot_file_comments = gerrit_util.GetChangeRobotComments(
1842 self._GetGerritHost(), self._GerritChangeIdentifier())
1843
1844 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001845 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001846 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001847 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001848 line_comments = file_comments.setdefault(path, [])
1849 line_comments.extend(
1850 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001851
1852 # Build dictionary of file comments for easy access and sorting later.
1853 # {author+date: {path: {patchset: {line: url+message}}}}
1854 comments = collections.defaultdict(
1855 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001856 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001857 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001858 tag = comment.get('tag', '')
1859 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001860 continue
1861 key = (comment['author']['email'], comment['updated'])
1862 if comment.get('side', 'REVISION') == 'PARENT':
1863 patchset = 'Base'
1864 else:
1865 patchset = 'PS%d' % comment['patch_set']
1866 line = comment.get('line', 0)
1867 url = ('https://%s/c/%s/%s/%s#%s%s' %
1868 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1869 'b' if comment.get('side') == 'PARENT' else '',
1870 str(line) if line else ''))
1871 comments[key][path][patchset][line] = (url, comment['message'])
1872
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001873 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001874 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001875 summary = self._BuildCommentSummary(msg, comments, readable)
1876 if summary:
1877 summaries.append(summary)
1878 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001879
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001880 @staticmethod
1881 def _BuildCommentSummary(msg, comments, readable):
1882 key = (msg['author']['email'], msg['date'])
1883 # Don't bother showing autogenerated messages that don't have associated
1884 # file or line comments. this will filter out most autogenerated
1885 # messages, but will keep robot comments like those from Tricium.
1886 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1887 if is_autogenerated and not comments.get(key):
1888 return None
1889 message = msg['message']
1890 # Gerrit spits out nanoseconds.
1891 assert len(msg['date'].split('.')[-1]) == 9
1892 date = datetime.datetime.strptime(msg['date'][:-3],
1893 '%Y-%m-%d %H:%M:%S.%f')
1894 if key in comments:
1895 message += '\n'
1896 for path, patchsets in sorted(comments.get(key, {}).items()):
1897 if readable:
1898 message += '\n%s' % path
1899 for patchset, lines in sorted(patchsets.items()):
1900 for line, (url, content) in sorted(lines.items()):
1901 if line:
1902 line_str = 'Line %d' % line
1903 path_str = '%s:%d:' % (path, line)
1904 else:
1905 line_str = 'File comment'
1906 path_str = '%s:0:' % path
1907 if readable:
1908 message += '\n %s, %s: %s' % (patchset, line_str, url)
1909 message += '\n %s\n' % content
1910 else:
1911 message += '\n%s ' % path_str
1912 message += '\n%s\n' % content
1913
1914 return _CommentSummary(
1915 date=date,
1916 message=message,
1917 sender=msg['author']['email'],
1918 autogenerated=is_autogenerated,
1919 # These could be inferred from the text messages and correlated with
1920 # Code-Review label maximum, however this is not reliable.
1921 # Leaving as is until the need arises.
1922 approval=False,
1923 disapproval=False,
1924 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001925
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001926 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001927 gerrit_util.AbandonChange(
1928 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001929
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001930 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001931 gerrit_util.SubmitChange(
1932 self._GetGerritHost(), self._GerritChangeIdentifier(),
1933 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001934
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001935 def _GetChangeDetail(self, options=None):
1936 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001937 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001938 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001939
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001940 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001941 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001942 options.append('CURRENT_COMMIT')
1943
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001944 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001945 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001946 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001947
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001948 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1949 # Assumption: data fetched before with extra options is suitable
1950 # for return for a smaller set of options.
1951 # For example, if we cached data for
1952 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1953 # and request is for options=[CURRENT_REVISION],
1954 # THEN we can return prior cached data.
1955 if options_set.issubset(cached_options_set):
1956 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001957
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001958 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001959 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001960 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001961 except gerrit_util.GerritError as e:
1962 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001963 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001964 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001965
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001966 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001967 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001968
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001969 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001970 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001971 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001972 data = gerrit_util.GetChangeCommit(
1973 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001974 except gerrit_util.GerritError as e:
1975 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001976 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001977 raise
agable32978d92016-11-01 12:55:02 -07001978 return data
1979
Karen Qian40c19422019-03-13 21:28:29 +00001980 def _IsCqConfigured(self):
1981 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001982 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001983
Olivier Robin75ee7252018-04-13 10:02:56 +02001984 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001985 if git_common.is_dirty_git_tree('land'):
1986 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001987
tandriid60367b2016-06-22 05:25:12 -07001988 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001989 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001990 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001991 'which can test and land changes for you. '
1992 'Are you sure you wish to bypass it?\n',
1993 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001994 differs = True
tandriic4344b52016-08-29 06:04:54 -07001995 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001996 # Note: git diff outputs nothing if there is no diff.
1997 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001998 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001999 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002000 if detail['current_revision'] == last_upload:
2001 differs = False
2002 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002003 print('WARNING: Local branch contents differ from latest uploaded '
2004 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002005 if differs:
2006 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002007 confirm_or_exit(
2008 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2009 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002010 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002011 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002012 upstream = self.GetCommonAncestorWithUpstream()
2013 if self.GetIssue():
2014 description = self.FetchDescription()
2015 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002016 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002017 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002018 committing=True,
2019 may_prompt=not force,
2020 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002021 parallel=parallel,
2022 upstream=upstream,
2023 description=description,
2024 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002025
2026 self.SubmitIssue(wait_for_merge=True)
2027 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002028 links = self._GetChangeCommit().get('web_links', [])
2029 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002030 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002031 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002032 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002033 return 0
2034
Edward Lemurf38bc172019-09-03 21:02:13 +00002035 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002036 assert parsed_issue_arg.valid
2037
Edward Lemur125d60a2019-09-13 18:25:41 +00002038 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002039
2040 if parsed_issue_arg.hostname:
2041 self._gerrit_host = parsed_issue_arg.hostname
2042 self._gerrit_server = 'https://%s' % self._gerrit_host
2043
tandriic2405f52016-10-10 08:13:15 -07002044 try:
2045 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002046 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002047 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002048
2049 if not parsed_issue_arg.patchset:
2050 # Use current revision by default.
2051 revision_info = detail['revisions'][detail['current_revision']]
2052 patchset = int(revision_info['_number'])
2053 else:
2054 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002055 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002056 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2057 break
2058 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002059 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002060 (parsed_issue_arg.patchset, self.GetIssue()))
2061
Edward Lemur125d60a2019-09-13 18:25:41 +00002062 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002063 if remote_url.endswith('.git'):
2064 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002065 remote_url = remote_url.rstrip('/')
2066
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002067 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002068 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002069
2070 if remote_url != fetch_info['url']:
2071 DieWithError('Trying to patch a change from %s but this repo appears '
2072 'to be %s.' % (fetch_info['url'], remote_url))
2073
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002074 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002075
Aaron Gable62619a32017-06-16 08:22:09 -07002076 if force:
2077 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2078 print('Checked out commit for change %i patchset %i locally' %
2079 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002080 elif nocommit:
2081 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2082 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002083 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002084 RunGit(['cherry-pick', 'FETCH_HEAD'])
2085 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002086 (parsed_issue_arg.issue, patchset))
2087 print('Note: this created a local commit which does not have '
2088 'the same hash as the one uploaded for review. This will make '
2089 'uploading changes based on top of this branch difficult.\n'
2090 'If you want to do that, use "git cl patch --force" instead.')
2091
Stefan Zagerd08043c2017-10-12 12:07:02 -07002092 if self.GetBranch():
2093 self.SetIssue(parsed_issue_arg.issue)
2094 self.SetPatchset(patchset)
2095 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2096 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2097 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2098 else:
2099 print('WARNING: You are in detached HEAD state.\n'
2100 'The patch has been applied to your checkout, but you will not be '
2101 'able to upload a new patch set to the gerrit issue.\n'
2102 'Try using the \'-b\' option if you would like to work on a '
2103 'branch and/or upload a new patch set.')
2104
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002105 return 0
2106
tandrii16e0b4e2016-06-07 10:34:28 -07002107 def _GerritCommitMsgHookCheck(self, offer_removal):
2108 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2109 if not os.path.exists(hook):
2110 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002111 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2112 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002113 data = gclient_utils.FileRead(hook)
2114 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2115 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002116 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002117 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002118 'and may interfere with it in subtle ways.\n'
2119 'We recommend you remove the commit-msg hook.')
2120 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002121 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002122 gclient_utils.rm_file_or_tree(hook)
2123 print('Gerrit commit-msg hook removed.')
2124 else:
2125 print('OK, will keep Gerrit commit-msg hook in place.')
2126
Edward Lemur1b52d872019-05-09 21:12:12 +00002127 def _CleanUpOldTraces(self):
2128 """Keep only the last |MAX_TRACES| traces."""
2129 try:
2130 traces = sorted([
2131 os.path.join(TRACES_DIR, f)
2132 for f in os.listdir(TRACES_DIR)
2133 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2134 and not f.startswith('tmp'))
2135 ])
2136 traces_to_delete = traces[:-MAX_TRACES]
2137 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002138 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002139 except OSError:
2140 print('WARNING: Failed to remove old git traces from\n'
2141 ' %s'
2142 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002143
Edward Lemur5737f022019-05-17 01:24:00 +00002144 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002145 """Zip and write the git push traces stored in traces_dir."""
2146 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002147 traces_zip = trace_name + '-traces'
2148 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002149 # Create a temporary dir to store git config and gitcookies in. It will be
2150 # compressed and stored next to the traces.
2151 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002152 git_info_zip = trace_name + '-git-info'
2153
Edward Lemur5737f022019-05-17 01:24:00 +00002154 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002155 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002156 git_push_metadata['now'] = git_push_metadata['now'].decode(
2157 sys.stdin.encoding)
2158
Edward Lemur1b52d872019-05-09 21:12:12 +00002159 git_push_metadata['trace_name'] = trace_name
2160 gclient_utils.FileWrite(
2161 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2162
2163 # Keep only the first 6 characters of the git hashes on the packet
2164 # trace. This greatly decreases size after compression.
2165 packet_traces = os.path.join(traces_dir, 'trace-packet')
2166 if os.path.isfile(packet_traces):
2167 contents = gclient_utils.FileRead(packet_traces)
2168 gclient_utils.FileWrite(
2169 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2170 shutil.make_archive(traces_zip, 'zip', traces_dir)
2171
2172 # Collect and compress the git config and gitcookies.
2173 git_config = RunGit(['config', '-l'])
2174 gclient_utils.FileWrite(
2175 os.path.join(git_info_dir, 'git-config'),
2176 git_config)
2177
2178 cookie_auth = gerrit_util.Authenticator.get()
2179 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2180 gitcookies_path = cookie_auth.get_gitcookies_path()
2181 if os.path.isfile(gitcookies_path):
2182 gitcookies = gclient_utils.FileRead(gitcookies_path)
2183 gclient_utils.FileWrite(
2184 os.path.join(git_info_dir, 'gitcookies'),
2185 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2186 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2187
Edward Lemur1b52d872019-05-09 21:12:12 +00002188 gclient_utils.rmtree(git_info_dir)
2189
2190 def _RunGitPushWithTraces(
2191 self, change_desc, refspec, refspec_opts, git_push_metadata):
2192 """Run git push and collect the traces resulting from the execution."""
2193 # Create a temporary directory to store traces in. Traces will be compressed
2194 # and stored in a 'traces' dir inside depot_tools.
2195 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002196 trace_name = os.path.join(
2197 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002198
2199 env = os.environ.copy()
2200 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2201 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002202 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002203 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2204 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2205 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2206
2207 try:
2208 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002209 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002210 before_push = time_time()
2211 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002212 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002213 env=env,
2214 print_stdout=True,
2215 # Flush after every line: useful for seeing progress when running as
2216 # recipe.
2217 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002218 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002219 except subprocess2.CalledProcessError as e:
2220 push_returncode = e.returncode
2221 DieWithError('Failed to create a change. Please examine output above '
2222 'for the reason of the failure.\n'
2223 'Hint: run command below to diagnose common Git/Gerrit '
2224 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002225 ' git cl creds-check\n'
2226 '\n'
2227 'If git-cl is not working correctly, file a bug under the '
2228 'Infra>SDK component including the files below.\n'
2229 'Review the files before upload, since they might contain '
2230 'sensitive information.\n'
2231 'Set the Restrict-View-Google label so that they are not '
2232 'publicly accessible.\n'
2233 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002234 change_desc)
2235 finally:
2236 execution_time = time_time() - before_push
2237 metrics.collector.add_repeated('sub_commands', {
2238 'command': 'git push',
2239 'execution_time': execution_time,
2240 'exit_code': push_returncode,
2241 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2242 })
2243
Edward Lemur1b52d872019-05-09 21:12:12 +00002244 git_push_metadata['execution_time'] = execution_time
2245 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002246 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002247
Edward Lemur1b52d872019-05-09 21:12:12 +00002248 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002249 gclient_utils.rmtree(traces_dir)
2250
2251 return push_stdout
2252
Edward Lemura12175c2020-03-09 16:58:26 +00002253 def CMDUploadChange(
2254 self, options, git_diff_args, custom_cl_base, change, message):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002255 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002256 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002257 # Load default for user, repo, squash=true, in this order.
2258 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002259
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002260 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002261 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002262 # This may be None; default fallback value is determined in logic below.
2263 title = options.title
2264
Dominic Battre7d1c4842017-10-27 09:17:28 +02002265 # Extract bug number from branch name.
2266 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002267 fixed = options.fixed
2268 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2269 self.GetBranch())
2270 if not bug and not fixed and match:
2271 if match.group('type') == 'bug':
2272 bug = match.group('bugnum')
2273 else:
2274 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002275
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002276 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002277 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002278 if self.GetIssue():
Aaron Gableb56ad332017-01-06 15:24:31 -08002279 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002280 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002281 # When uploading a subsequent patchset, -m|--message is taken
2282 # as the patchset title if --title was not provided.
2283 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002284 else:
2285 default_title = RunGit(
2286 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002287 if options.force:
2288 title = default_title
2289 else:
2290 title = ask_for_data(
2291 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002292
2293 # User requested to change description
2294 if options.edit_description:
2295 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2296 change_desc.prompt()
2297 message = change_desc.description
2298
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002299 change_id = self._GetChangeDetail()['change_id']
2300 while True:
2301 footer_change_ids = git_footers.get_footer_change_id(message)
2302 if footer_change_ids == [change_id]:
2303 break
2304 if not footer_change_ids:
2305 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002306 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002307 continue
2308 # There is already a valid footer but with different or several ids.
2309 # Doing this automatically is non-trivial as we don't want to lose
2310 # existing other footers, yet we want to append just 1 desired
2311 # Change-Id. Thus, just create a new footer, but let user verify the
2312 # new description.
2313 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002314 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002315 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002316 print(
2317 'WARNING: change %s has Change-Id footer(s):\n'
2318 ' %s\n'
2319 'but change has Change-Id %s, according to Gerrit.\n'
2320 'Please, check the proposed correction to the description, '
2321 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2322 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2323 change_id))
2324 confirm_or_exit(action='edit')
2325 change_desc.prompt()
2326
2327 message = change_desc.description
2328 if not message:
2329 DieWithError("Description is empty. Aborting...")
2330
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002331 # Continue the while loop.
2332 # Sanity check of this code - we should end up with proper message
2333 # footer.
2334 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002335 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002336 else: # if not self.GetIssue()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002337 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002338 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002339 change_desc.prompt()
2340
Aaron Gableb56ad332017-01-06 15:24:31 -08002341 # On first upload, patchset title is always this string, while
2342 # --title flag gets converted to first line of message.
2343 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002344 if not change_desc.description:
2345 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002346 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002347 if len(change_ids) > 1:
2348 DieWithError('too many Change-Id footers, at most 1 allowed.')
2349 if not change_ids:
2350 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002351 change_desc.set_description(git_footers.add_footer_change_id(
2352 change_desc.description,
2353 GenerateGerritChangeId(change_desc.description)))
2354 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002355 assert len(change_ids) == 1
2356 change_id = change_ids[0]
2357
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002358 if options.reviewers or options.tbrs or options.add_owners_to:
2359 change_desc.update_reviewers(options.reviewers, options.tbrs,
2360 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002361 if options.preserve_tryjobs:
2362 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002363
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002364 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002365 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2366 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002367 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002368 with gclient_utils.temporary_file() as desc_tempfile:
2369 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2370 ref_to_push = RunGit(
2371 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002372 else: # if not options.squash
Edward Lemura12175c2020-03-09 16:58:26 +00002373 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002374 if not change_desc.description:
2375 DieWithError("Description is empty. Aborting...")
2376
2377 if not git_footers.get_footer_change_id(change_desc.description):
2378 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002379 change_desc.set_description(
Edward Lemura12175c2020-03-09 16:58:26 +00002380 self._AddChangeIdToCommitMessage(message, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002381 if options.reviewers or options.tbrs or options.add_owners_to:
2382 change_desc.update_reviewers(options.reviewers, options.tbrs,
2383 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002384 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002385 # For no-squash mode, we assume the remote called "origin" is the one we
2386 # want. It is not worthwhile to support different workflows for
2387 # no-squash mode.
2388 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002389 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2390
2391 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002392 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002393 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2394 ref_to_push)]).splitlines()
2395 if len(commits) > 1:
2396 print('WARNING: This will upload %d commits. Run the following command '
2397 'to see which commits will be uploaded: ' % len(commits))
2398 print('git log %s..%s' % (parent, ref_to_push))
2399 print('You can also use `git squash-branch` to squash these into a '
2400 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002401 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002402
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002403 if options.reviewers or options.tbrs or options.add_owners_to:
2404 change_desc.update_reviewers(options.reviewers, options.tbrs,
2405 options.add_owners_to, change)
2406
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002407 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002408 cc = []
2409 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2410 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2411 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002412 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002413 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002414 if options.cc:
2415 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002416 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002417 if change_desc.get_cced():
2418 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002419 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2420 valid_accounts = set(reviewers + cc)
2421 # TODO(crbug/877717): relax this for all hosts.
2422 else:
2423 valid_accounts = gerrit_util.ValidAccounts(
2424 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002425 logging.info('accounts %s are recognized, %s invalid',
2426 sorted(valid_accounts),
2427 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002428
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002429 # Extra options that can be specified at push time. Doc:
2430 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002431 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002432
Aaron Gable844cf292017-06-28 11:32:59 -07002433 # By default, new changes are started in WIP mode, and subsequent patchsets
2434 # don't send email. At any time, passing --send-mail will mark the change
2435 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002436 if options.send_mail:
2437 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002438 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002439 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002440 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002441 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002442 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002443
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002444 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002445 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002446
Aaron Gable9b713dd2016-12-14 16:04:21 -08002447 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002448 # Punctuation and whitespace in |title| must be percent-encoded.
2449 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002450
agablec6787972016-09-09 16:13:34 -07002451 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002452 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002453
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002454 for r in sorted(reviewers):
2455 if r in valid_accounts:
2456 refspec_opts.append('r=%s' % r)
2457 reviewers.remove(r)
2458 else:
2459 # TODO(tandrii): this should probably be a hard failure.
2460 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2461 % r)
2462 for c in sorted(cc):
2463 # refspec option will be rejected if cc doesn't correspond to an
2464 # account, even though REST call to add such arbitrary cc may succeed.
2465 if c in valid_accounts:
2466 refspec_opts.append('cc=%s' % c)
2467 cc.remove(c)
2468
rmistry9eadede2016-09-19 11:22:43 -07002469 if options.topic:
2470 # Documentation on Gerrit topics is here:
2471 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002472 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002473
Edward Lemur687ca902018-12-05 02:30:30 +00002474 if options.enable_auto_submit:
2475 refspec_opts.append('l=Auto-Submit+1')
2476 if options.use_commit_queue:
2477 refspec_opts.append('l=Commit-Queue+2')
2478 elif options.cq_dry_run:
2479 refspec_opts.append('l=Commit-Queue+1')
2480
2481 if change_desc.get_reviewers(tbr_only=True):
2482 score = gerrit_util.GetCodeReviewTbrScore(
2483 self._GetGerritHost(),
2484 self._GetGerritProject())
2485 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002486
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002487 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002488 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002489 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002490 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002491 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2492
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002493 refspec_suffix = ''
2494 if refspec_opts:
2495 refspec_suffix = '%' + ','.join(refspec_opts)
2496 assert ' ' not in refspec_suffix, (
2497 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2498 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2499
Edward Lemur1b52d872019-05-09 21:12:12 +00002500 git_push_metadata = {
2501 'gerrit_host': self._GetGerritHost(),
2502 'title': title or '<untitled>',
2503 'change_id': change_id,
2504 'description': change_desc.description,
2505 }
2506 push_stdout = self._RunGitPushWithTraces(
2507 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002508
2509 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002510 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002511 change_numbers = [m.group(1)
2512 for m in map(regex.match, push_stdout.splitlines())
2513 if m]
2514 if len(change_numbers) != 1:
2515 DieWithError(
2516 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002517 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002518 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002519 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002520
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002521 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002522 # GetIssue() is not set in case of non-squash uploads according to tests.
2523 # TODO(agable): non-squash uploads in git cl should be removed.
2524 gerrit_util.AddReviewers(
2525 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002526 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002527 reviewers, cc,
2528 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002529
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002530 return 0
2531
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002532 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2533 change_desc):
2534 """Computes parent of the generated commit to be uploaded to Gerrit.
2535
2536 Returns revision or a ref name.
2537 """
2538 if custom_cl_base:
2539 # Try to avoid creating additional unintended CLs when uploading, unless
2540 # user wants to take this risk.
2541 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2542 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2543 local_ref_of_target_remote])
2544 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002545 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002546 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2547 'If you proceed with upload, more than 1 CL may be created by '
2548 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2549 'If you are certain that specified base `%s` has already been '
2550 'uploaded to Gerrit as another CL, you may proceed.\n' %
2551 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2552 if not force:
2553 confirm_or_exit(
2554 'Do you take responsibility for cleaning up potential mess '
2555 'resulting from proceeding with upload?',
2556 action='upload')
2557 return custom_cl_base
2558
Aaron Gablef97e33d2017-03-30 15:44:27 -07002559 if remote != '.':
2560 return self.GetCommonAncestorWithUpstream()
2561
2562 # If our upstream branch is local, we base our squashed commit on its
2563 # squashed version.
2564 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2565
Aaron Gablef97e33d2017-03-30 15:44:27 -07002566 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002567 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002568
2569 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002570 # TODO(tandrii): consider checking parent change in Gerrit and using its
2571 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2572 # the tree hash of the parent branch. The upside is less likely bogus
2573 # requests to reupload parent change just because it's uploadhash is
2574 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002575 parent = RunGit(['config',
2576 'branch.%s.gerritsquashhash' % upstream_branch_name],
2577 error_ok=True).strip()
2578 # Verify that the upstream branch has been uploaded too, otherwise
2579 # Gerrit will create additional CLs when uploading.
2580 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2581 RunGitSilent(['rev-parse', parent + ':'])):
2582 DieWithError(
2583 '\nUpload upstream branch %s first.\n'
2584 'It is likely that this branch has been rebased since its last '
2585 'upload, so you just need to upload it again.\n'
2586 '(If you uploaded it with --no-squash, then branch dependencies '
2587 'are not supported, and you should reupload with --squash.)'
2588 % upstream_branch_name,
2589 change_desc)
2590 return parent
2591
Edward Lemura12175c2020-03-09 16:58:26 +00002592 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002593 """Re-commits using the current message, assumes the commit hook is in
2594 place.
2595 """
Edward Lemura12175c2020-03-09 16:58:26 +00002596 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002597 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002598 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002599 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002600 return new_log_desc
2601 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002602 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002603
tandriie113dfd2016-10-11 10:20:12 -07002604 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002605 try:
2606 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002607 except GerritChangeNotExists:
2608 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002609
2610 if data['status'] in ('ABANDONED', 'MERGED'):
2611 return 'CL %s is closed' % self.GetIssue()
2612
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002613 def GetGerritChange(self, patchset=None):
2614 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002615 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002616 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002617 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002618 data = self._GetChangeDetail(['ALL_REVISIONS'])
2619
2620 assert host and issue and patchset, 'CL must be uploaded first'
2621
2622 has_patchset = any(
2623 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002624 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002625 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002626 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002627 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002628
tandrii8c5a3532016-11-04 07:52:02 -07002629 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002630 'host': host,
2631 'change': issue,
2632 'project': data['project'],
2633 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002634 }
tandriie113dfd2016-10-11 10:20:12 -07002635
tandriide281ae2016-10-12 06:02:30 -07002636 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002637 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002638
Edward Lemur707d70b2018-02-07 00:50:14 +01002639 def GetReviewers(self):
2640 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002641 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002642
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002643
tandriif9aefb72016-07-01 09:06:51 -07002644def _get_bug_line_values(default_project, bugs):
2645 """Given default_project and comma separated list of bugs, yields bug line
2646 values.
2647
2648 Each bug can be either:
2649 * a number, which is combined with default_project
2650 * string, which is left as is.
2651
2652 This function may produce more than one line, because bugdroid expects one
2653 project per line.
2654
2655 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2656 ['v8:123', 'chromium:789']
2657 """
2658 default_bugs = []
2659 others = []
2660 for bug in bugs.split(','):
2661 bug = bug.strip()
2662 if bug:
2663 try:
2664 default_bugs.append(int(bug))
2665 except ValueError:
2666 others.append(bug)
2667
2668 if default_bugs:
2669 default_bugs = ','.join(map(str, default_bugs))
2670 if default_project:
2671 yield '%s:%s' % (default_project, default_bugs)
2672 else:
2673 yield default_bugs
2674 for other in sorted(others):
2675 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2676 yield other
2677
2678
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002679class ChangeDescription(object):
2680 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002681 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002682 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002683 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002684 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002685 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002686 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2687 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002688 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002689 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002690
Dan Beamd8b04ca2019-10-10 21:23:26 +00002691 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002692 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002693 if bug:
2694 regexp = re.compile(self.BUG_LINE)
2695 prefix = settings.GetBugPrefix()
2696 if not any((regexp.match(line) for line in self._description_lines)):
2697 values = list(_get_bug_line_values(prefix, bug))
2698 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002699 if fixed:
2700 regexp = re.compile(self.FIXED_LINE)
2701 prefix = settings.GetBugPrefix()
2702 if not any((regexp.match(line) for line in self._description_lines)):
2703 values = list(_get_bug_line_values(prefix, fixed))
2704 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002705
agable@chromium.org42c20792013-09-12 17:34:49 +00002706 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002707 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002708 return '\n'.join(self._description_lines)
2709
2710 def set_description(self, desc):
2711 if isinstance(desc, basestring):
2712 lines = desc.splitlines()
2713 else:
2714 lines = [line.rstrip() for line in desc]
2715 while lines and not lines[0]:
2716 lines.pop(0)
2717 while lines and not lines[-1]:
2718 lines.pop(-1)
2719 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002720
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002721 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2722 """Rewrites the R=/TBR= line(s) as a single line each.
2723
2724 Args:
2725 reviewers (list(str)) - list of additional emails to use for reviewers.
2726 tbrs (list(str)) - list of additional emails to use for TBRs.
2727 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2728 the change that are missing OWNER coverage. If this is not None, you
2729 must also pass a value for `change`.
2730 change (Change) - The Change that should be used for OWNERS lookups.
2731 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002732 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002733 assert isinstance(tbrs, list), tbrs
2734
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002735 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002736 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002737
2738 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002739 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002740
2741 reviewers = set(reviewers)
2742 tbrs = set(tbrs)
2743 LOOKUP = {
2744 'TBR': tbrs,
2745 'R': reviewers,
2746 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002747
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002748 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002749 regexp = re.compile(self.R_LINE)
2750 matches = [regexp.match(line) for line in self._description_lines]
2751 new_desc = [l for i, l in enumerate(self._description_lines)
2752 if not matches[i]]
2753 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002754
agable@chromium.org42c20792013-09-12 17:34:49 +00002755 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002756
2757 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002758 for match in matches:
2759 if not match:
2760 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002761 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2762
2763 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002764 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002765 owners_db = owners.Database(change.RepositoryRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002766 fopen=open, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002767 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002768 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002769 LOOKUP[add_owners_to].update(
2770 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002771
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002772 # If any folks ended up in both groups, remove them from tbrs.
2773 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002774
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002775 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2776 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002777
2778 # Put the new lines in the description where the old first R= line was.
2779 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2780 if 0 <= line_loc < len(self._description_lines):
2781 if new_tbr_line:
2782 self._description_lines.insert(line_loc, new_tbr_line)
2783 if new_r_line:
2784 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002785 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002786 if new_r_line:
2787 self.append_footer(new_r_line)
2788 if new_tbr_line:
2789 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002790
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002791 def set_preserve_tryjobs(self):
2792 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2793 footers = git_footers.parse_footers(self.description)
2794 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2795 if v.lower() == 'true':
2796 return
2797 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2798
Anthony Polito8b955342019-09-24 19:01:36 +00002799 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002800 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002801 self.set_description([
2802 '# Enter a description of the change.',
2803 '# This will be displayed on the codereview site.',
2804 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002805 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002806 '--------------------',
2807 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002808 bug_regexp = re.compile(self.BUG_LINE)
2809 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002810 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002811 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2812 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002813 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002814
agable@chromium.org42c20792013-09-12 17:34:49 +00002815 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002816 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002817 if not content:
2818 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002819 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002820
Bruce Dawson2377b012018-01-11 16:46:49 -08002821 # Strip off comments and default inserted "Bug:" line.
2822 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002823 (line.startswith('#') or
2824 line.rstrip() == "Bug:" or
2825 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002826 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002827 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002828 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002829
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002830 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002831 """Adds a footer line to the description.
2832
2833 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2834 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2835 that Gerrit footers are always at the end.
2836 """
2837 parsed_footer_line = git_footers.parse_footer(line)
2838 if parsed_footer_line:
2839 # Line is a gerrit footer in the form: Footer-Key: any value.
2840 # Thus, must be appended observing Gerrit footer rules.
2841 self.set_description(
2842 git_footers.add_footer(self.description,
2843 key=parsed_footer_line[0],
2844 value=parsed_footer_line[1]))
2845 return
2846
2847 if not self._description_lines:
2848 self._description_lines.append(line)
2849 return
2850
2851 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2852 if gerrit_footers:
2853 # git_footers.split_footers ensures that there is an empty line before
2854 # actual (gerrit) footers, if any. We have to keep it that way.
2855 assert top_lines and top_lines[-1] == ''
2856 top_lines, separator = top_lines[:-1], top_lines[-1:]
2857 else:
2858 separator = [] # No need for separator if there are no gerrit_footers.
2859
2860 prev_line = top_lines[-1] if top_lines else ''
2861 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2862 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2863 top_lines.append('')
2864 top_lines.append(line)
2865 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002866
tandrii99a72f22016-08-17 14:33:24 -07002867 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002868 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002869 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002870 reviewers = [match.group(2).strip()
2871 for match in matches
2872 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002873 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002874
bradnelsond975b302016-10-23 12:20:23 -07002875 def get_cced(self):
2876 """Retrieves the list of reviewers."""
2877 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2878 cced = [match.group(2).strip() for match in matches if match]
2879 return cleanup_list(cced)
2880
Nodir Turakulov23b82142017-11-16 11:04:25 -08002881 def get_hash_tags(self):
2882 """Extracts and sanitizes a list of Gerrit hashtags."""
2883 subject = (self._description_lines or ('',))[0]
2884 subject = re.sub(
2885 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2886
2887 tags = []
2888 start = 0
2889 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2890 while True:
2891 m = bracket_exp.match(subject, start)
2892 if not m:
2893 break
2894 tags.append(self.sanitize_hash_tag(m.group(1)))
2895 start = m.end()
2896
2897 if not tags:
2898 # Try "Tag: " prefix.
2899 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2900 if m:
2901 tags.append(self.sanitize_hash_tag(m.group(1)))
2902 return tags
2903
2904 @classmethod
2905 def sanitize_hash_tag(cls, tag):
2906 """Returns a sanitized Gerrit hash tag.
2907
2908 A sanitized hashtag can be used as a git push refspec parameter value.
2909 """
2910 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2911
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002912 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2913 """Updates this commit description given the parent.
2914
2915 This is essentially what Gnumbd used to do.
2916 Consult https://goo.gl/WMmpDe for more details.
2917 """
2918 assert parent_msg # No, orphan branch creation isn't supported.
2919 assert parent_hash
2920 assert dest_ref
2921 parent_footer_map = git_footers.parse_footers(parent_msg)
2922 # This will also happily parse svn-position, which GnumbD is no longer
2923 # supporting. While we'd generate correct footers, the verifier plugin
2924 # installed in Gerrit will block such commit (ie git push below will fail).
2925 parent_position = git_footers.get_position(parent_footer_map)
2926
2927 # Cherry-picks may have last line obscuring their prior footers,
2928 # from git_footers perspective. This is also what Gnumbd did.
2929 cp_line = None
2930 if (self._description_lines and
2931 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2932 cp_line = self._description_lines.pop()
2933
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002934 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002935
2936 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2937 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002938 for i, line in enumerate(footer_lines):
2939 k, v = git_footers.parse_footer(line) or (None, None)
2940 if k and k.startswith('Cr-'):
2941 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002942
2943 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002944 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002945 if parent_position[0] == dest_ref:
2946 # Same branch as parent.
2947 number = int(parent_position[1]) + 1
2948 else:
2949 number = 1 # New branch, and extra lineage.
2950 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2951 int(parent_position[1])))
2952
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002953 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2954 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002955
2956 self._description_lines = top_lines
2957 if cp_line:
2958 self._description_lines.append(cp_line)
2959 if self._description_lines[-1] != '':
2960 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002961 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002962
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002963
Aaron Gablea1bab272017-04-11 16:38:18 -07002964def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002965 """Retrieves the reviewers that approved a CL from the issue properties with
2966 messages.
2967
2968 Note that the list may contain reviewers that are not committer, thus are not
2969 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002970
2971 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002972 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002973 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002974 return sorted(
2975 set(
2976 message['sender']
2977 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07002978 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002979 )
2980 )
2981
2982
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002983def FindCodereviewSettingsFile(filename='codereview.settings'):
2984 """Finds the given file starting in the cwd and going up.
2985
2986 Only looks up to the top of the repository unless an
2987 'inherit-review-settings-ok' file exists in the root of the repository.
2988 """
2989 inherit_ok_file = 'inherit-review-settings-ok'
2990 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002991 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002992 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2993 root = '/'
2994 while True:
2995 if filename in os.listdir(cwd):
2996 if os.path.isfile(os.path.join(cwd, filename)):
2997 return open(os.path.join(cwd, filename))
2998 if cwd == root:
2999 break
3000 cwd = os.path.dirname(cwd)
3001
3002
3003def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003004 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003005 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003006
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003007 def SetProperty(name, setting, unset_error_ok=False):
3008 fullname = 'rietveld.' + name
3009 if setting in keyvals:
3010 RunGit(['config', fullname, keyvals[setting]])
3011 else:
3012 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3013
tandrii48df5812016-10-17 03:55:37 -07003014 if not keyvals.get('GERRIT_HOST', False):
3015 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003016 # Only server setting is required. Other settings can be absent.
3017 # In that case, we ignore errors raised during option deletion attempt.
3018 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3019 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3020 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003021 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003022 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3023 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003024 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3025 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003026 SetProperty(
3027 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003028
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003029 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003030 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003031
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003032 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003033 RunGit(['config', 'gerrit.squash-uploads',
3034 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003035
tandrii@chromium.org28253532016-04-14 13:46:56 +00003036 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003037 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003038 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3039
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003040 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003041 # should be of the form
3042 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3043 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003044 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3045 keyvals['ORIGIN_URL_CONFIG']])
3046
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003047
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003048def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003049 """Downloads a network object to a local file, like urllib.urlretrieve.
3050
3051 This is necessary because urllib is broken for SSL connections via a proxy.
3052 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003053 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003054 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003055
3056
ukai@chromium.org712d6102013-11-27 00:52:58 +00003057def hasSheBang(fname):
3058 """Checks fname is a #! script."""
3059 with open(fname) as f:
3060 return f.read(2).startswith('#!')
3061
3062
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003063# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3064def DownloadHooks(*args, **kwargs):
3065 pass
3066
3067
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003068def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003069 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003070
3071 Args:
3072 force: True to update hooks. False to install hooks if not present.
3073 """
3074 if not settings.GetIsGerrit():
3075 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003076 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003077 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3078 if not os.access(dst, os.X_OK):
3079 if os.path.exists(dst):
3080 if not force:
3081 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003082 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003083 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003084 if not hasSheBang(dst):
3085 DieWithError('Not a script: %s\n'
3086 'You need to download from\n%s\n'
3087 'into .git/hooks/commit-msg and '
3088 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003089 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3090 except Exception:
3091 if os.path.exists(dst):
3092 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003093 DieWithError('\nFailed to download hooks.\n'
3094 'You need to download from\n%s\n'
3095 'into .git/hooks/commit-msg and '
3096 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003097
3098
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003099class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003100 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003101
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003102 _GOOGLESOURCE = 'googlesource.com'
3103
3104 def __init__(self):
3105 # Cached list of [host, identity, source], where source is either
3106 # .gitcookies or .netrc.
3107 self._all_hosts = None
3108
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003109 def ensure_configured_gitcookies(self):
3110 """Runs checks and suggests fixes to make git use .gitcookies from default
3111 path."""
3112 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3113 configured_path = RunGitSilent(
3114 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003115 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003116 if configured_path:
3117 self._ensure_default_gitcookies_path(configured_path, default)
3118 else:
3119 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003120
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003121 @staticmethod
3122 def _ensure_default_gitcookies_path(configured_path, default_path):
3123 assert configured_path
3124 if configured_path == default_path:
3125 print('git is already configured to use your .gitcookies from %s' %
3126 configured_path)
3127 return
3128
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003129 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003130 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3131 (configured_path, default_path))
3132
3133 if not os.path.exists(configured_path):
3134 print('However, your configured .gitcookies file is missing.')
3135 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3136 action='reconfigure')
3137 RunGit(['config', '--global', 'http.cookiefile', default_path])
3138 return
3139
3140 if os.path.exists(default_path):
3141 print('WARNING: default .gitcookies file already exists %s' %
3142 default_path)
3143 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3144 default_path)
3145
3146 confirm_or_exit('Move existing .gitcookies to default location?',
3147 action='move')
3148 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003149 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003150 print('Moved and reconfigured git to use .gitcookies from %s' %
3151 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003152
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003153 @staticmethod
3154 def _configure_gitcookies_path(default_path):
3155 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3156 if os.path.exists(netrc_path):
3157 print('You seem to be using outdated .netrc for git credentials: %s' %
3158 netrc_path)
3159 print('This tool will guide you through setting up recommended '
3160 '.gitcookies store for git credentials.\n'
3161 '\n'
3162 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3163 ' git config --global --unset http.cookiefile\n'
3164 ' mv %s %s.backup\n\n' % (default_path, default_path))
3165 confirm_or_exit(action='setup .gitcookies')
3166 RunGit(['config', '--global', 'http.cookiefile', default_path])
3167 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003168
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003169 def get_hosts_with_creds(self, include_netrc=False):
3170 if self._all_hosts is None:
3171 a = gerrit_util.CookiesAuthenticator()
3172 self._all_hosts = [
3173 (h, u, s)
3174 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003175 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3176 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003177 )
3178 if h.endswith(self._GOOGLESOURCE)
3179 ]
3180
3181 if include_netrc:
3182 return self._all_hosts
3183 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3184
3185 def print_current_creds(self, include_netrc=False):
3186 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3187 if not hosts:
3188 print('No Git/Gerrit credentials found')
3189 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003190 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003191 header = [('Host', 'User', 'Which file'),
3192 ['=' * l for l in lengths]]
3193 for row in (header + hosts):
3194 print('\t'.join((('%%+%ds' % l) % s)
3195 for l, s in zip(lengths, row)))
3196
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003197 @staticmethod
3198 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003199 """Parses identity "git-<username>.domain" into <username> and domain."""
3200 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003201 # distinguishable from sub-domains. But we do know typical domains:
3202 if identity.endswith('.chromium.org'):
3203 domain = 'chromium.org'
3204 username = identity[:-len('.chromium.org')]
3205 else:
3206 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003207 if username.startswith('git-'):
3208 username = username[len('git-'):]
3209 return username, domain
3210
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003211 def _canonical_git_googlesource_host(self, host):
3212 """Normalizes Gerrit hosts (with '-review') to Git host."""
3213 assert host.endswith(self._GOOGLESOURCE)
3214 # Prefix doesn't include '.' at the end.
3215 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3216 if prefix.endswith('-review'):
3217 prefix = prefix[:-len('-review')]
3218 return prefix + '.' + self._GOOGLESOURCE
3219
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003220 def _canonical_gerrit_googlesource_host(self, host):
3221 git_host = self._canonical_git_googlesource_host(host)
3222 prefix = git_host.split('.', 1)[0]
3223 return prefix + '-review.' + self._GOOGLESOURCE
3224
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003225 def _get_counterpart_host(self, host):
3226 assert host.endswith(self._GOOGLESOURCE)
3227 git = self._canonical_git_googlesource_host(host)
3228 gerrit = self._canonical_gerrit_googlesource_host(git)
3229 return git if gerrit == host else gerrit
3230
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003231 def has_generic_host(self):
3232 """Returns whether generic .googlesource.com has been configured.
3233
3234 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3235 """
3236 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3237 if host == '.' + self._GOOGLESOURCE:
3238 return True
3239 return False
3240
3241 def _get_git_gerrit_identity_pairs(self):
3242 """Returns map from canonic host to pair of identities (Git, Gerrit).
3243
3244 One of identities might be None, meaning not configured.
3245 """
3246 host_to_identity_pairs = {}
3247 for host, identity, _ in self.get_hosts_with_creds():
3248 canonical = self._canonical_git_googlesource_host(host)
3249 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3250 idx = 0 if canonical == host else 1
3251 pair[idx] = identity
3252 return host_to_identity_pairs
3253
3254 def get_partially_configured_hosts(self):
3255 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003256 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003257 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003258 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003259
3260 def get_conflicting_hosts(self):
3261 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003262 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003263 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003264 if None not in (i1, i2) and i1 != i2)
3265
3266 def get_duplicated_hosts(self):
3267 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003268 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003269
3270 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3271 'chromium.googlesource.com': 'chromium.org',
3272 'chrome-internal.googlesource.com': 'google.com',
3273 }
3274
3275 def get_hosts_with_wrong_identities(self):
3276 """Finds hosts which **likely** reference wrong identities.
3277
3278 Note: skips hosts which have conflicting identities for Git and Gerrit.
3279 """
3280 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003281 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003282 pair = self._get_git_gerrit_identity_pairs().get(host)
3283 if pair and pair[0] == pair[1]:
3284 _, domain = self._parse_identity(pair[0])
3285 if domain != expected:
3286 hosts.add(host)
3287 return hosts
3288
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003289 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003290 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003291 hosts = sorted(hosts)
3292 assert hosts
3293 if extra_column_func is None:
3294 extras = [''] * len(hosts)
3295 else:
3296 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003297 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3298 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003299 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003300 lines.append(tmpl % he)
3301 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003302
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003303 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003304 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003305 yield ('.googlesource.com wildcard record detected',
3306 ['Chrome Infrastructure team recommends to list full host names '
3307 'explicitly.'],
3308 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003309
3310 dups = self.get_duplicated_hosts()
3311 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003312 yield ('The following hosts were defined twice',
3313 self._format_hosts(dups),
3314 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003315
3316 partial = self.get_partially_configured_hosts()
3317 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003318 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3319 'These hosts are missing',
3320 self._format_hosts(partial, lambda host: 'but %s defined' %
3321 self._get_counterpart_host(host)),
3322 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003323
3324 conflicting = self.get_conflicting_hosts()
3325 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003326 yield ('The following Git hosts have differing credentials from their '
3327 'Gerrit counterparts',
3328 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3329 tuple(self._get_git_gerrit_identity_pairs()[host])),
3330 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003331
3332 wrong = self.get_hosts_with_wrong_identities()
3333 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003334 yield ('These hosts likely use wrong identity',
3335 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3336 (self._get_git_gerrit_identity_pairs()[host][0],
3337 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3338 wrong)
3339
3340 def find_and_report_problems(self):
3341 """Returns True if there was at least one problem, else False."""
3342 found = False
3343 bad_hosts = set()
3344 for title, sublines, hosts in self._find_problems():
3345 if not found:
3346 found = True
3347 print('\n\n.gitcookies problem report:\n')
3348 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003349 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003350 if sublines:
3351 print()
3352 print(' %s' % '\n '.join(sublines))
3353 print()
3354
3355 if bad_hosts:
3356 assert found
3357 print(' You can manually remove corresponding lines in your %s file and '
3358 'visit the following URLs with correct account to generate '
3359 'correct credential lines:\n' %
3360 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3361 print(' %s' % '\n '.join(sorted(set(
3362 gerrit_util.CookiesAuthenticator().get_new_password_url(
3363 self._canonical_git_googlesource_host(host))
3364 for host in bad_hosts
3365 ))))
3366 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003367
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003368
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003369@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003370def CMDcreds_check(parser, args):
3371 """Checks credentials and suggests changes."""
3372 _, _ = parser.parse_args(args)
3373
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003374 # Code below checks .gitcookies. Abort if using something else.
3375 authn = gerrit_util.Authenticator.get()
3376 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003377 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003378 'This command is not designed for bot environment. It checks '
3379 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003380 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3381 if isinstance(authn, gerrit_util.GceAuthenticator):
3382 message += (
3383 '\n'
3384 'If you need to run this on GCE or a cloudtop instance, '
3385 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3386 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003387
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003388 checker = _GitCookiesChecker()
3389 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003390
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003391 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003392 checker.print_current_creds(include_netrc=True)
3393
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003394 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003395 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003396 return 0
3397 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003398
3399
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003400@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003401def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003402 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003403 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003404 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003405 _, args = parser.parse_args(args)
3406 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003407 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003408 return RunGit(['config', 'branch.%s.base-url' % branch],
3409 error_ok=False).strip()
3410 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003411 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003412 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3413 error_ok=False).strip()
3414
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003415
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003416def color_for_status(status):
3417 """Maps a Changelist status to color, for CMDstatus and other tools."""
3418 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003419 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003420 'waiting': Fore.BLUE,
3421 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003422 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003423 'lgtm': Fore.GREEN,
3424 'commit': Fore.MAGENTA,
3425 'closed': Fore.CYAN,
3426 'error': Fore.WHITE,
3427 }.get(status, Fore.WHITE)
3428
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003429
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003430def get_cl_statuses(changes, fine_grained, max_processes=None):
3431 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003432
3433 If fine_grained is true, this will fetch CL statuses from the server.
3434 Otherwise, simply indicate if there's a matching url for the given branches.
3435
3436 If max_processes is specified, it is used as the maximum number of processes
3437 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3438 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003439
3440 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003441 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003442 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003443 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003444
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003445 if not fine_grained:
3446 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003447 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003448 for cl in changes:
3449 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003450 return
3451
3452 # First, sort out authentication issues.
3453 logging.debug('ensuring credentials exist')
3454 for cl in changes:
3455 cl.EnsureAuthenticated(force=False, refresh=True)
3456
3457 def fetch(cl):
3458 try:
3459 return (cl, cl.GetStatus())
3460 except:
3461 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003462 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003463 raise
3464
3465 threads_count = len(changes)
3466 if max_processes:
3467 threads_count = max(1, min(threads_count, max_processes))
3468 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3469
Edward Lemur61bf4172020-02-24 23:22:37 +00003470 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003471 fetched_cls = set()
3472 try:
3473 it = pool.imap_unordered(fetch, changes).__iter__()
3474 while True:
3475 try:
3476 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003477 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003478 break
3479 fetched_cls.add(cl)
3480 yield cl, status
3481 finally:
3482 pool.close()
3483
3484 # Add any branches that failed to fetch.
3485 for cl in set(changes) - fetched_cls:
3486 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003487
rmistry@google.com2dd99862015-06-22 12:22:18 +00003488
3489def upload_branch_deps(cl, args):
3490 """Uploads CLs of local branches that are dependents of the current branch.
3491
3492 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003493
3494 test1 -> test2.1 -> test3.1
3495 -> test3.2
3496 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003497
3498 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3499 run on the dependent branches in this order:
3500 test2.1, test3.1, test3.2, test2.2, test3.3
3501
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003502 Note: This function does not rebase your local dependent branches. Use it
3503 when you make a change to the parent branch that will not conflict
3504 with its dependent branches, and you would like their dependencies
3505 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003506 """
3507 if git_common.is_dirty_git_tree('upload-branch-deps'):
3508 return 1
3509
3510 root_branch = cl.GetBranch()
3511 if root_branch is None:
3512 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3513 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003514 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003515 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3516 'patchset dependencies without an uploaded CL.')
3517
3518 branches = RunGit(['for-each-ref',
3519 '--format=%(refname:short) %(upstream:short)',
3520 'refs/heads'])
3521 if not branches:
3522 print('No local branches found.')
3523 return 0
3524
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003525 # Create a dictionary of all local branches to the branches that are
3526 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003527 tracked_to_dependents = collections.defaultdict(list)
3528 for b in branches.splitlines():
3529 tokens = b.split()
3530 if len(tokens) == 2:
3531 branch_name, tracked = tokens
3532 tracked_to_dependents[tracked].append(branch_name)
3533
vapiera7fbd5a2016-06-16 09:17:49 -07003534 print()
3535 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003536 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003537
rmistry@google.com2dd99862015-06-22 12:22:18 +00003538 def traverse_dependents_preorder(branch, padding=''):
3539 dependents_to_process = tracked_to_dependents.get(branch, [])
3540 padding += ' '
3541 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003542 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003543 dependents.append(dependent)
3544 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003545
rmistry@google.com2dd99862015-06-22 12:22:18 +00003546 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003547 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003548
3549 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003550 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003551 return 0
3552
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003553 confirm_or_exit('This command will checkout all dependent branches and run '
3554 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003555
rmistry@google.com2dd99862015-06-22 12:22:18 +00003556 # Record all dependents that failed to upload.
3557 failures = {}
3558 # Go through all dependents, checkout the branch and upload.
3559 try:
3560 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003561 print()
3562 print('--------------------------------------')
3563 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003564 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003565 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003566 try:
3567 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003568 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003569 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003570 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003571 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003572 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003573 finally:
3574 # Swap back to the original root branch.
3575 RunGit(['checkout', '-q', root_branch])
3576
vapiera7fbd5a2016-06-16 09:17:49 -07003577 print()
3578 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003579 for dependent_branch in dependents:
3580 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003581 print(' %s : %s' % (dependent_branch, upload_status))
3582 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003583
3584 return 0
3585
3586
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003587def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3588 """Given a proposed tag name, returns a tag name that is guaranteed to be
3589 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3590 or 'foo-3', and so on."""
3591
3592 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3593 for suffix_num in itertools.count(1):
3594 if suffix_num == 1:
3595 to_check = proposed_tag
3596 else:
3597 to_check = '%s-%d' % (proposed_tag, suffix_num)
3598
3599 if to_check not in existing_tags:
3600 return to_check
3601
3602
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003603@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003604def CMDarchive(parser, args):
3605 """Archives and deletes branches associated with closed changelists."""
3606 parser.add_option(
3607 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003608 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003609 parser.add_option(
3610 '-f', '--force', action='store_true',
3611 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003612 parser.add_option(
3613 '-d', '--dry-run', action='store_true',
3614 help='Skip the branch tagging and removal steps.')
3615 parser.add_option(
3616 '-t', '--notags', action='store_true',
3617 help='Do not tag archived branches. '
3618 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003619
kmarshall3bff56b2016-06-06 18:31:47 -07003620 options, args = parser.parse_args(args)
3621 if args:
3622 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003623
3624 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3625 if not branches:
3626 return 0
3627
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003628 tags = RunGit(['for-each-ref', '--format=%(refname)',
3629 'refs/tags']).splitlines() or []
3630 tags = [t.split('/')[-1] for t in tags]
3631
vapiera7fbd5a2016-06-16 09:17:49 -07003632 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003633 changes = [Changelist(branchref=b)
3634 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003635 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3636 statuses = get_cl_statuses(changes,
3637 fine_grained=True,
3638 max_processes=options.maxjobs)
3639 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003640 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3641 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003642 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003643 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003644 proposal.sort()
3645
3646 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003647 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003648 return 0
3649
Edward Lemur85153282020-02-14 22:06:29 +00003650 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003651
vapiera7fbd5a2016-06-16 09:17:49 -07003652 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003653 if options.notags:
3654 for next_item in proposal:
3655 print(' ' + next_item[0])
3656 else:
3657 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3658 for next_item in proposal:
3659 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003660
kmarshall9249e012016-08-23 12:02:16 -07003661 # Quit now on precondition failure or if instructed by the user, either
3662 # via an interactive prompt or by command line flags.
3663 if options.dry_run:
3664 print('\nNo changes were made (dry run).\n')
3665 return 0
3666 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003667 print('You are currently on a branch \'%s\' which is associated with a '
3668 'closed codereview issue, so archive cannot proceed. Please '
3669 'checkout another branch and run this command again.' %
3670 current_branch)
3671 return 1
kmarshall9249e012016-08-23 12:02:16 -07003672 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003673 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3674 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003675 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003676 return 1
3677
3678 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003679 if not options.notags:
3680 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003681
3682 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3683 # Clean up the tag if we failed to delete the branch.
3684 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003685
vapiera7fbd5a2016-06-16 09:17:49 -07003686 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003687
3688 return 0
3689
3690
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003691@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003692def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003693 """Show status of changelists.
3694
3695 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003696 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003697 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003698 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003699 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003700 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003701 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003702 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003703
3704 Also see 'git cl comments'.
3705 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003706 parser.add_option(
3707 '--no-branch-color',
3708 action='store_true',
3709 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003710 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003711 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003712 parser.add_option('-f', '--fast', action='store_true',
3713 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003714 parser.add_option(
3715 '-j', '--maxjobs', action='store', type=int,
3716 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003717 parser.add_option(
3718 '-i', '--issue', type=int,
3719 help='Operate on this issue instead of the current branch\'s implicit '
3720 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003721 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003722 if args:
3723 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003724
iannuccie53c9352016-08-17 14:40:40 -07003725 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003726 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003727
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003728 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003729 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003730 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003731 if cl.GetIssue():
3732 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003733 elif options.field == 'id':
3734 issueid = cl.GetIssue()
3735 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003736 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003737 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003738 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003739 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003740 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003741 elif options.field == 'status':
3742 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003743 elif options.field == 'url':
3744 url = cl.GetIssueURL()
3745 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003746 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003747 return 0
3748
3749 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3750 if not branches:
3751 print('No local branch found.')
3752 return 0
3753
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003754 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003755 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003756 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003757 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003758 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003759 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003760 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003761
Edward Lemur85153282020-02-14 22:06:29 +00003762 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003763
3764 def FormatBranchName(branch, colorize=False):
3765 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3766 an asterisk when it is the current branch."""
3767
3768 asterisk = ""
3769 color = Fore.RESET
3770 if branch == current_branch:
3771 asterisk = "* "
3772 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003773 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003774
3775 if colorize:
3776 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003777 return asterisk + branch_name
3778
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003779 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003780
3781 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003782 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3783 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003784 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003785 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003786 branch_statuses[c.GetBranch()] = status
3787 status = branch_statuses.pop(branch)
3788 url = cl.GetIssueURL()
3789 if url and (not status or status == 'error'):
3790 # The issue probably doesn't exist anymore.
3791 url += ' (broken)'
3792
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003793 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003794 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003795 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003796 color = ''
3797 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003798 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003799
Alan Cuttera3be9a52019-03-04 18:50:33 +00003800 branch_display = FormatBranchName(branch)
3801 padding = ' ' * (alignment - len(branch_display))
3802 if not options.no_branch_color:
3803 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003804
Alan Cuttera3be9a52019-03-04 18:50:33 +00003805 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3806 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003807
vapiera7fbd5a2016-06-16 09:17:49 -07003808 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003809 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003810 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003811 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003812 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003813 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003814 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003815 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003816 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003817 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003818 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003819 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003820 return 0
3821
3822
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003823def colorize_CMDstatus_doc():
3824 """To be called once in main() to add colors to git cl status help."""
3825 colors = [i for i in dir(Fore) if i[0].isupper()]
3826
3827 def colorize_line(line):
3828 for color in colors:
3829 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003830 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003831 indent = len(line) - len(line.lstrip(' ')) + 1
3832 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3833 return line
3834
3835 lines = CMDstatus.__doc__.splitlines()
3836 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3837
3838
phajdan.jre328cf92016-08-22 04:12:17 -07003839def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003840 if path == '-':
3841 json.dump(contents, sys.stdout)
3842 else:
3843 with open(path, 'w') as f:
3844 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003845
3846
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003847@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003848@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003849def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003850 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003851
3852 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003853 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003854 parser.add_option('-r', '--reverse', action='store_true',
3855 help='Lookup the branch(es) for the specified issues. If '
3856 'no issues are specified, all branches with mapped '
3857 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003858 parser.add_option('--json',
3859 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003860 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003861
dnj@chromium.org406c4402015-03-03 17:22:28 +00003862 if options.reverse:
3863 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003864 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003865 # Reverse issue lookup.
3866 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003867
3868 git_config = {}
3869 for config in RunGit(['config', '--get-regexp',
3870 r'branch\..*issue']).splitlines():
3871 name, _space, val = config.partition(' ')
3872 git_config[name] = val
3873
dnj@chromium.org406c4402015-03-03 17:22:28 +00003874 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003875 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003876 Changelist.IssueConfigKey())
3877 issue = git_config.get(config_key)
3878 if issue:
3879 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003880 if not args:
3881 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003882 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003883 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003884 try:
3885 issue_num = int(issue)
3886 except ValueError:
3887 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003888 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003889 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003890 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003891 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003892 if options.json:
3893 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003894 return 0
3895
3896 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003897 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003898 if not issue.valid:
3899 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3900 'or no argument to list it.\n'
3901 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003902 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003903 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003904 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003905 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003906 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3907 if options.json:
3908 write_json(options.json, {
3909 'issue': cl.GetIssue(),
3910 'issue_url': cl.GetIssueURL(),
3911 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003912 return 0
3913
3914
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003915@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003916def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003917 """Shows or posts review comments for any changelist."""
3918 parser.add_option('-a', '--add-comment', dest='comment',
3919 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003920 parser.add_option('-p', '--publish', action='store_true',
3921 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003922 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003923 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003924 parser.add_option('-m', '--machine-readable', dest='readable',
3925 action='store_false', default=True,
3926 help='output comments in a format compatible with '
3927 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003928 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003929 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003930 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003931
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003932 issue = None
3933 if options.issue:
3934 try:
3935 issue = int(options.issue)
3936 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003937 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003938
Edward Lemur934836a2019-09-09 20:16:54 +00003939 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003940
3941 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003942 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003943 return 0
3944
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003945 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3946 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003947 for comment in summary:
3948 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003949 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003950 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003951 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003952 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003953 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003954 elif comment.autogenerated:
3955 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003956 else:
3957 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003958 print('\n%s%s %s%s\n%s' % (
3959 color,
3960 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3961 comment.sender,
3962 Fore.RESET,
3963 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3964
smut@google.comc85ac942015-09-15 16:34:43 +00003965 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003966 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003967 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003968 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3969 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003970 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003971 return 0
3972
3973
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003974@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003975@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003976def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003977 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003978 parser.add_option('-d', '--display', action='store_true',
3979 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003980 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003981 help='New description to set for this issue (- for stdin, '
3982 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003983 parser.add_option('-f', '--force', action='store_true',
3984 help='Delete any unpublished Gerrit edits for this issue '
3985 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003986
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003987 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003988
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003989 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003990 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003991 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003992 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003993 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003994
Edward Lemur934836a2019-09-09 20:16:54 +00003995 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003996 if target_issue_arg:
3997 kwargs['issue'] = target_issue_arg.issue
3998 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003999
4000 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004001 if not cl.GetIssue():
4002 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004003
Edward Lemur678a6842019-10-03 22:25:05 +00004004 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004005 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004006
Edward Lemur6c6827c2020-02-06 21:15:18 +00004007 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004008
smut@google.com34fb6b12015-07-13 20:03:26 +00004009 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004010 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004011 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004012
4013 if options.new_description:
4014 text = options.new_description
4015 if text == '-':
4016 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004017 elif text == '+':
4018 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004019 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004020
4021 description.set_description(text)
4022 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004023 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004024 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004025 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004026 return 0
4027
4028
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004029@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004030def CMDlint(parser, args):
4031 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004032 parser.add_option('--filter', action='append', metavar='-x,+y',
4033 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004034 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004035
4036 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004037 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004038 try:
4039 import cpplint
4040 import cpplint_chromium
4041 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004042 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004043 return 1
4044
4045 # Change the current working directory before calling lint so that it
4046 # shows the correct base.
4047 previous_cwd = os.getcwd()
4048 os.chdir(settings.GetRoot())
4049 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004050 cl = Changelist()
Edward Lemura12175c2020-03-09 16:58:26 +00004051 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), '')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004052 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004053 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004054 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004055 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004056
4057 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004058 command = args + files
4059 if options.filter:
4060 command = ['--filter=' + ','.join(options.filter)] + command
4061 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004062
4063 white_regex = re.compile(settings.GetLintRegex())
4064 black_regex = re.compile(settings.GetLintIgnoreRegex())
4065 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4066 for filename in filenames:
4067 if white_regex.match(filename):
4068 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004069 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004070 else:
4071 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4072 extra_check_functions)
4073 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004074 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004075 finally:
4076 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004077 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004078 if cpplint._cpplint_state.error_count != 0:
4079 return 1
4080 return 0
4081
4082
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004083@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004084def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004085 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004086 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004087 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004088 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004089 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004090 parser.add_option('--all', action='store_true',
4091 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004092 parser.add_option('--parallel', action='store_true',
4093 help='Run all tests specified by input_api.RunTests in all '
4094 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004095 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004096
sbc@chromium.org71437c02015-04-09 19:29:40 +00004097 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004098 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004099 return 1
4100
Edward Lemur934836a2019-09-09 20:16:54 +00004101 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004102 if args:
4103 base_branch = args[0]
4104 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004105 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004106 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004107
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004108 if cl.GetIssue():
4109 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004110 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004111 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004112
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004113 cl.RunHook(
4114 committing=not options.upload,
4115 may_prompt=False,
4116 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004117 parallel=options.parallel,
4118 upstream=base_branch,
4119 description=description,
4120 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004121 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004122
4123
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004124def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004125 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004126
4127 Works the same way as
4128 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4129 but can be called on demand on all platforms.
4130
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004131 The basic idea is to generate git hash of a state of the tree, original
4132 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004133 """
4134 lines = []
4135 tree_hash = RunGitSilent(['write-tree'])
4136 lines.append('tree %s' % tree_hash.strip())
4137 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4138 if code == 0:
4139 lines.append('parent %s' % parent.strip())
4140 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4141 lines.append('author %s' % author.strip())
4142 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4143 lines.append('committer %s' % committer.strip())
4144 lines.append('')
4145 # Note: Gerrit's commit-hook actually cleans message of some lines and
4146 # whitespace. This code is not doing this, but it clearly won't decrease
4147 # entropy.
4148 lines.append(message)
4149 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004150 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004151 return 'I%s' % change_hash.strip()
4152
4153
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004154def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004155 """Computes the remote branch ref to use for the CL.
4156
4157 Args:
4158 remote (str): The git remote for the CL.
4159 remote_branch (str): The git remote branch for the CL.
4160 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004161 """
4162 if not (remote and remote_branch):
4163 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004164
wittman@chromium.org455dc922015-01-26 20:15:50 +00004165 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004166 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004167 # refs, which are then translated into the remote full symbolic refs
4168 # below.
4169 if '/' not in target_branch:
4170 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4171 else:
4172 prefix_replacements = (
4173 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4174 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4175 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4176 )
4177 match = None
4178 for regex, replacement in prefix_replacements:
4179 match = re.search(regex, target_branch)
4180 if match:
4181 remote_branch = target_branch.replace(match.group(0), replacement)
4182 break
4183 if not match:
4184 # This is a branch path but not one we recognize; use as-is.
4185 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004186 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4187 # Handle the refs that need to land in different refs.
4188 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004189
wittman@chromium.org455dc922015-01-26 20:15:50 +00004190 # Create the true path to the remote branch.
4191 # Does the following translation:
4192 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4193 # * refs/remotes/origin/master -> refs/heads/master
4194 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4195 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4196 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4197 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4198 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4199 'refs/heads/')
4200 elif remote_branch.startswith('refs/remotes/branch-heads'):
4201 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004202
wittman@chromium.org455dc922015-01-26 20:15:50 +00004203 return remote_branch
4204
4205
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004206def cleanup_list(l):
4207 """Fixes a list so that comma separated items are put as individual items.
4208
4209 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4210 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4211 """
4212 items = sum((i.split(',') for i in l), [])
4213 stripped_items = (i.strip() for i in items)
4214 return sorted(filter(None, stripped_items))
4215
4216
Aaron Gable4db38df2017-11-03 14:59:07 -07004217@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004218@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004219def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004220 """Uploads the current changelist to codereview.
4221
4222 Can skip dependency patchset uploads for a branch by running:
4223 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004224 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004225 git config --unset branch.branch_name.skip-deps-uploads
4226 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004227
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004228 If the name of the checked out branch starts with "bug-" or "fix-" followed
4229 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004230 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004231
4232 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004233 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004234 [git-cl] add support for hashtags
4235 Foo bar: implement foo
4236 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004237 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004238 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4239 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004240 parser.add_option('--bypass-watchlists', action='store_true',
4241 dest='bypass_watchlists',
4242 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004243 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004244 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004245 parser.add_option('--message', '-m', dest='message',
4246 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004247 parser.add_option('-b', '--bug',
4248 help='pre-populate the bug number(s) for this issue. '
4249 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004250 parser.add_option('--message-file', dest='message_file',
4251 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004252 parser.add_option('--title', '-t', dest='title',
4253 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004254 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004255 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004256 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004257 parser.add_option('--tbrs',
4258 action='append', default=[],
4259 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004260 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004261 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004262 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004263 parser.add_option('--hashtag', dest='hashtags',
4264 action='append', default=[],
4265 help=('Gerrit hashtag for new CL; '
4266 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004267 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004268 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004269 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004270 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004271 metavar='TARGET',
4272 help='Apply CL to remote ref TARGET. ' +
4273 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004274 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004275 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004276 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004277 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004278 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004279 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004280 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4281 const='TBR', help='add a set of OWNERS to TBR')
4282 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4283 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004284 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004285 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004286 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004287 'implies --send-mail')
4288 parser.add_option('-d', '--cq-dry-run',
4289 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004290 help='Send the patchset to do a CQ dry run right after '
4291 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004292 parser.add_option('--preserve-tryjobs', action='store_true',
4293 help='instruct the CQ to let tryjobs running even after '
4294 'new patchsets are uploaded instead of canceling '
4295 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004296 parser.add_option('--dependencies', action='store_true',
4297 help='Uploads CLs of all the local branches that depend on '
4298 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004299 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4300 help='Sends your change to the CQ after an approval. Only '
4301 'works on repos that have the Auto-Submit label '
4302 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004303 parser.add_option('--parallel', action='store_true',
4304 help='Run all tests specified by input_api.RunTests in all '
4305 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004306 parser.add_option('--no-autocc', action='store_true',
4307 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004308 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004309 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004310 parser.add_option('-R', '--retry-failed', action='store_true',
4311 help='Retry failed tryjobs from old patchset immediately '
4312 'after uploading new patchset. Cannot be used with '
4313 '--use-commit-queue or --cq-dry-run.')
4314 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4315 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004316 parser.add_option('--fixed', '-x',
4317 help='List of bugs that will be commented on and marked '
4318 'fixed (pre-populates "Fixed:" tag). Same format as '
4319 '-b option / "Bug:" tag. If fixing several issues, '
4320 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004321 parser.add_option('--edit-description', action='store_true', default=False,
4322 help='Modify description before upload. Cannot be used '
4323 'with --force. It is a noop when --no-squash is set '
4324 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004325
rmistry@google.com2dd99862015-06-22 12:22:18 +00004326 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004327 (options, args) = parser.parse_args(args)
4328
sbc@chromium.org71437c02015-04-09 19:29:40 +00004329 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004330 return 1
4331
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004332 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004333 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004334 options.cc = cleanup_list(options.cc)
4335
Josipe827b0f2020-01-30 00:07:20 +00004336 if options.edit_description and options.force:
4337 parser.error('Only one of --force and --edit-description allowed')
4338
tandriib80458a2016-06-23 12:20:07 -07004339 if options.message_file:
4340 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004341 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004342 options.message = gclient_utils.FileRead(options.message_file)
4343 options.message_file = None
4344
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004345 if ([options.cq_dry_run,
4346 options.use_commit_queue,
4347 options.retry_failed].count(True) > 1):
4348 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4349 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004350
Aaron Gableedbc4132017-09-11 13:22:28 -07004351 if options.use_commit_queue:
4352 options.send_mail = True
4353
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004354 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4355 settings.GetIsGerrit()
4356
Edward Lemur934836a2019-09-09 20:16:54 +00004357 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004358 # Warm change details cache now to avoid RPCs later, reducing latency for
4359 # developers.
4360 if cl.GetIssue():
4361 cl._GetChangeDetail(
4362 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4363
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004364 if options.retry_failed and not cl.GetIssue():
4365 print('No previous patchsets, so --retry-failed has no effect.')
4366 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004367
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004368 # cl.GetMostRecentPatchset uses cached information, and can return the last
4369 # patchset before upload. Calling it here makes it clear that it's the
4370 # last patchset before upload. Note that GetMostRecentPatchset will fail
4371 # if no CL has been uploaded yet.
4372 if options.retry_failed:
4373 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004374
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004375 ret = cl.CMDUpload(options, args, orig_args)
4376
4377 if options.retry_failed:
4378 if ret != 0:
4379 print('Upload failed, so --retry-failed has no effect.')
4380 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004381 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004382 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004383 jobs = _filter_failed_for_retry(builds)
4384 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004385 print('No failed tryjobs, so --retry-failed has no effect.')
4386 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004387 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004388
4389 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004390
4391
Francois Dorayd42c6812017-05-30 15:10:20 -04004392@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004393@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004394def CMDsplit(parser, args):
4395 """Splits a branch into smaller branches and uploads CLs.
4396
4397 Creates a branch and uploads a CL for each group of files modified in the
4398 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004399 comment, the string '$directory', is replaced with the directory containing
4400 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004401 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004402 parser.add_option('-d', '--description', dest='description_file',
4403 help='A text file containing a CL description in which '
4404 '$directory will be replaced by each CL\'s directory.')
4405 parser.add_option('-c', '--comment', dest='comment_file',
4406 help='A text file containing a CL comment.')
4407 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004408 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004409 help='List the files and reviewers for each CL that would '
4410 'be created, but don\'t create branches or CLs.')
4411 parser.add_option('--cq-dry-run', action='store_true',
4412 help='If set, will do a cq dry run for each uploaded CL. '
4413 'Please be careful when doing this; more than ~10 CLs '
4414 'has the potential to overload our build '
4415 'infrastructure. Try to upload these not during high '
4416 'load times (usually 11-3 Mountain View time). Email '
4417 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004418 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4419 default=True,
4420 help='Sends your change to the CQ after an approval. Only '
4421 'works on repos that have the Auto-Submit label '
4422 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004423 options, _ = parser.parse_args(args)
4424
4425 if not options.description_file:
4426 parser.error('No --description flag specified.')
4427
4428 def WrappedCMDupload(args):
4429 return CMDupload(OptionParser(), args)
4430
4431 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004432 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004433 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004434
4435
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004436@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004437@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004438def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004439 """DEPRECATED: Used to commit the current changelist via git-svn."""
4440 message = ('git-cl no longer supports committing to SVN repositories via '
4441 'git-svn. You probably want to use `git cl land` instead.')
4442 print(message)
4443 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004444
4445
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004446@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004447@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004448def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004449 """Commits the current changelist via git.
4450
4451 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4452 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004453 """
4454 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4455 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004456 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004457 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004458 parser.add_option('--parallel', action='store_true',
4459 help='Run all tests specified by input_api.RunTests in all '
4460 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004461 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004462
Edward Lemur934836a2019-09-09 20:16:54 +00004463 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004464
Robert Iannucci2e73d432018-03-14 01:10:47 -07004465 if not cl.GetIssue():
4466 DieWithError('You must upload the change first to Gerrit.\n'
4467 ' If you would rather have `git cl land` upload '
4468 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004469 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004470 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004471
4472
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004473@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004474@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004475def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004476 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004477 parser.add_option('-b', dest='newbranch',
4478 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004479 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004480 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004481 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004482 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004483
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004484 group = optparse.OptionGroup(
4485 parser,
4486 'Options for continuing work on the current issue uploaded from a '
4487 'different clone (e.g. different machine). Must be used independently '
4488 'from the other options. No issue number should be specified, and the '
4489 'branch must have an issue number associated with it')
4490 group.add_option('--reapply', action='store_true', dest='reapply',
4491 help='Reset the branch and reapply the issue.\n'
4492 'CAUTION: This will undo any local changes in this '
4493 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004494
4495 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004496 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004497 parser.add_option_group(group)
4498
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004499 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004500
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004501 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004502 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004503 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004504 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004505 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004506
Edward Lemur934836a2019-09-09 20:16:54 +00004507 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004508 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004509 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004510
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004511 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004512 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004513 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004514
4515 RunGit(['reset', '--hard', upstream])
4516 if options.pull:
4517 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004518
Edward Lemur678a6842019-10-03 22:25:05 +00004519 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4520 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004521
4522 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004523 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004524
Edward Lemurf38bc172019-09-03 21:02:13 +00004525 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004526 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004527 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004528
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004529 # We don't want uncommitted changes mixed up with the patch.
4530 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004531 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004532
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004533 if options.newbranch:
4534 if options.force:
4535 RunGit(['branch', '-D', options.newbranch],
4536 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004537 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004538
Edward Lemur678a6842019-10-03 22:25:05 +00004539 cl = Changelist(
4540 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004541
Edward Lemur678a6842019-10-03 22:25:05 +00004542 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004543 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004544
Edward Lemurf38bc172019-09-03 21:02:13 +00004545 return cl.CMDPatchWithParsedIssue(
4546 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004547
4548
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004549def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004550 """Fetches the tree status and returns either 'open', 'closed',
4551 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004552 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004553 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004554 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004555 if status.find('closed') != -1 or status == '0':
4556 return 'closed'
4557 elif status.find('open') != -1 or status == '1':
4558 return 'open'
4559 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004560 return 'unset'
4561
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004562
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004563def GetTreeStatusReason():
4564 """Fetches the tree status from a json url and returns the message
4565 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004566 url = settings.GetTreeStatusUrl()
4567 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004568 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004569 status = json.loads(connection.read())
4570 connection.close()
4571 return status['message']
4572
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004573
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004574@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004575def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004576 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004577 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578 status = GetTreeStatus()
4579 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004580 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004581 return 2
4582
vapiera7fbd5a2016-06-16 09:17:49 -07004583 print('The tree is %s' % status)
4584 print()
4585 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004586 if status != 'open':
4587 return 1
4588 return 0
4589
4590
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004591@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004592def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004593 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4594 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004595 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004596 '-b', '--bot', action='append',
4597 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4598 'times to specify multiple builders. ex: '
4599 '"-b win_rel -b win_layout". See '
4600 'the try server waterfall for the builders name and the tests '
4601 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004602 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004603 '-B', '--bucket', default='',
4604 help=('Buildbucket bucket to send the try requests.'))
4605 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004606 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004607 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004608 'be determined by the try recipe that builder runs, which usually '
4609 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004610 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004611 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004612 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004613 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004614 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004615 '--category', default='git_cl_try', help='Specify custom build category.')
4616 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004617 '--project',
4618 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004619 'in recipe to determine to which repository or directory to '
4620 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004621 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004622 '-p', '--property', dest='properties', action='append', default=[],
4623 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004624 'key2=value2 etc. The value will be treated as '
4625 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004626 'NOTE: using this may make your tryjob not usable for CQ, '
4627 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004628 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004629 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4630 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004631 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004632 parser.add_option(
4633 '-R', '--retry-failed', action='store_true', default=False,
4634 help='Retry failed jobs from the latest set of tryjobs. '
4635 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004636 parser.add_option(
4637 '-i', '--issue', type=int,
4638 help='Operate on this issue instead of the current branch\'s implicit '
4639 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004640 options, args = parser.parse_args(args)
4641
machenbach@chromium.org45453142015-09-15 08:45:22 +00004642 # Make sure that all properties are prop=value pairs.
4643 bad_params = [x for x in options.properties if '=' not in x]
4644 if bad_params:
4645 parser.error('Got properties with missing "=": %s' % bad_params)
4646
maruel@chromium.org15192402012-09-06 12:38:29 +00004647 if args:
4648 parser.error('Unknown arguments: %s' % args)
4649
Edward Lemur934836a2019-09-09 20:16:54 +00004650 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004651 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004652 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004653
Edward Lemurf38bc172019-09-03 21:02:13 +00004654 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004655 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004656
tandriie113dfd2016-10-11 10:20:12 -07004657 error_message = cl.CannotTriggerTryJobReason()
4658 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004659 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004660
Edward Lemur45768512020-03-02 19:03:14 +00004661 if options.bot:
4662 if options.retry_failed:
4663 parser.error('--bot is not compatible with --retry-failed.')
4664 if not options.bucket:
4665 parser.error('A bucket (e.g. "chromium/try") is required.')
4666
4667 triggered = [b for b in options.bot if 'triggered' in b]
4668 if triggered:
4669 parser.error(
4670 'Cannot schedule builds on triggered bots: %s.\n'
4671 'This type of bot requires an initial job from a parent (usually a '
4672 'builder). Schedule a job on the parent instead.\n' % triggered)
4673
4674 if options.bucket.startswith('.master'):
4675 parser.error('Buildbot masters are not supported.')
4676
4677 project, bucket = _parse_bucket(options.bucket)
4678 if project is None or bucket is None:
4679 parser.error('Invalid bucket: %s.' % options.bucket)
4680 jobs = sorted((project, bucket, bot) for bot in options.bot)
4681 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004682 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004683 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004684 if options.verbose:
4685 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004686 jobs = _filter_failed_for_retry(builds)
4687 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004688 print('There are no failed jobs in the latest set of jobs '
4689 '(patchset #%d), doing nothing.' % patchset)
4690 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004691 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004692 if num_builders > 10:
4693 confirm_or_exit('There are %d builders with failed builds.'
4694 % num_builders, action='continue')
4695 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004696 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004697 print('git cl try with no bots now defaults to CQ dry run.')
4698 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4699 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004700
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004701 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004702 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004703 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004704 except BuildbucketResponseException as ex:
4705 print('ERROR: %s' % ex)
4706 return 1
4707 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004708
4709
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004710@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004711def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004712 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004713 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004714 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004715 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004716 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004717 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004718 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004719 '--color', action='store_true', default=setup_color.IS_TTY,
4720 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004721 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004722 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4723 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004724 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004725 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004726 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004727 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004728 parser.add_option(
4729 '-i', '--issue', type=int,
4730 help='Operate on this issue instead of the current branch\'s implicit '
4731 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004732 options, args = parser.parse_args(args)
4733 if args:
4734 parser.error('Unrecognized args: %s' % ' '.join(args))
4735
Edward Lemur934836a2019-09-09 20:16:54 +00004736 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004737 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004738 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004739
tandrii221ab252016-10-06 08:12:04 -07004740 patchset = options.patchset
4741 if not patchset:
4742 patchset = cl.GetMostRecentPatchset()
4743 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004744 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004745 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004746 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004747 cl.GetIssue())
4748
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004749 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004750 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004751 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004752 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004753 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004754 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004755 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004756 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004757 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004758 return 0
4759
4760
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004761@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004762@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004763def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004764 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004765 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004766 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004767 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004768
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004769 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004770 if args:
4771 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004772 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004773 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004774 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004775 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004776
4777 # Clear configured merge-base, if there is one.
4778 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004779 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004780 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004781 return 0
4782
4783
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004784@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004785def CMDweb(parser, args):
4786 """Opens the current CL in the web browser."""
4787 _, args = parser.parse_args(args)
4788 if args:
4789 parser.error('Unrecognized args: %s' % ' '.join(args))
4790
4791 issue_url = Changelist().GetIssueURL()
4792 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004793 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004794 return 1
4795
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004796 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004797 # allows us to hide the "Created new window in existing browser session."
4798 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004799 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004800 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004801 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004802 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004803 os.open(os.devnull, os.O_RDWR)
4804 try:
4805 webbrowser.open(issue_url)
4806 finally:
4807 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004808 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004809 return 0
4810
4811
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004812@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004813def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004814 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004815 parser.add_option('-d', '--dry-run', action='store_true',
4816 help='trigger in dry run mode')
4817 parser.add_option('-c', '--clear', action='store_true',
4818 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004819 parser.add_option(
4820 '-i', '--issue', type=int,
4821 help='Operate on this issue instead of the current branch\'s implicit '
4822 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004823 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004824 if args:
4825 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004826 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004827 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004828
Edward Lemur934836a2019-09-09 20:16:54 +00004829 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004830 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004831 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004832 elif options.dry_run:
4833 state = _CQState.DRY_RUN
4834 else:
4835 state = _CQState.COMMIT
4836 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004837 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004838 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004839 return 0
4840
4841
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004842@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004843def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004844 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004845 parser.add_option(
4846 '-i', '--issue', type=int,
4847 help='Operate on this issue instead of the current branch\'s implicit '
4848 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004849 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004850 if args:
4851 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004852 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004853 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004854 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004855 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004856 cl.CloseIssue()
4857 return 0
4858
4859
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004860@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004861def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004862 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004863 parser.add_option(
4864 '--stat',
4865 action='store_true',
4866 dest='stat',
4867 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004868 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004869 if args:
4870 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004871
Edward Lemur934836a2019-09-09 20:16:54 +00004872 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004873 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004874 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004875 if not issue:
4876 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004877
Aaron Gablea718c3e2017-08-28 17:47:28 -07004878 base = cl._GitGetBranchConfigValue('last-upload-hash')
4879 if not base:
4880 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4881 if not base:
4882 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4883 revision_info = detail['revisions'][detail['current_revision']]
4884 fetch_info = revision_info['fetch']['http']
4885 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4886 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004887
Aaron Gablea718c3e2017-08-28 17:47:28 -07004888 cmd = ['git', 'diff']
4889 if options.stat:
4890 cmd.append('--stat')
4891 cmd.append(base)
4892 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004893
4894 return 0
4895
4896
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004897@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004898def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004899 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004900 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004901 '--ignore-current',
4902 action='store_true',
4903 help='Ignore the CL\'s current reviewers and start from scratch.')
4904 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004905 '--ignore-self',
4906 action='store_true',
4907 help='Do not consider CL\'s author as an owners.')
4908 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004909 '--no-color',
4910 action='store_true',
4911 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004912 parser.add_option(
4913 '--batch',
4914 action='store_true',
4915 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004916 # TODO: Consider moving this to another command, since other
4917 # git-cl owners commands deal with owners for a given CL.
4918 parser.add_option(
4919 '--show-all',
4920 action='store_true',
4921 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004922 options, args = parser.parse_args(args)
4923
4924 author = RunGit(['config', 'user.email']).strip() or None
4925
Edward Lemur934836a2019-09-09 20:16:54 +00004926 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004927
Yang Guo6e269a02019-06-26 11:17:02 +00004928 if options.show_all:
4929 for arg in args:
4930 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004931 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004932 database.load_data_needed_for([arg])
4933 print('Owners for %s:' % arg)
4934 for owner in sorted(database.all_possible_owners([arg], None)):
4935 print(' - %s' % owner)
4936 return 0
4937
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004938 if args:
4939 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004940 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004941 base_branch = args[0]
4942 else:
4943 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004944 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004945
Edward Lemura12175c2020-03-09 16:58:26 +00004946 change = cl.GetChange(base_branch, '')
Dirk Prankebf980882017-09-02 15:08:00 -07004947 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4948
4949 if options.batch:
Edward Lemurb7f759f2020-03-04 21:20:56 +00004950 db = owners.Database(change.RepositoryRoot(), open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004951 print('\n'.join(db.reviewers_for(affected_files, author)))
4952 return 0
4953
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004954 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004955 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004956 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004957 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004958 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00004959 fopen=open, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004960 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004961 override_files=change.OriginalOwnersFiles(),
4962 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004963
4964
Aiden Bennerc08566e2018-10-03 17:52:42 +00004965def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004966 """Generates a diff command."""
4967 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004968 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4969
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004970 if allow_prefix:
4971 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4972 # case that diff.noprefix is set in the user's git config.
4973 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4974 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004975 diff_cmd += ['--no-prefix']
4976
4977 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004978
4979 if args:
4980 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004981 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004982 diff_cmd.append(arg)
4983 else:
4984 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004985
4986 return diff_cmd
4987
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004988
Jamie Madill5e96ad12020-01-13 16:08:35 +00004989def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4990 """Runs clang-format-diff and sets a return value if necessary."""
4991
4992 if not clang_diff_files:
4993 return 0
4994
4995 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4996 # formatted. This is used to block during the presubmit.
4997 return_value = 0
4998
4999 # Locate the clang-format binary in the checkout
5000 try:
5001 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5002 except clang_format.NotFoundError as e:
5003 DieWithError(e)
5004
5005 if opts.full or settings.GetFormatFullByDefault():
5006 cmd = [clang_format_tool]
5007 if not opts.dry_run and not opts.diff:
5008 cmd.append('-i')
5009 if opts.dry_run:
5010 for diff_file in clang_diff_files:
5011 with open(diff_file, 'r') as myfile:
5012 code = myfile.read().replace('\r\n', '\n')
5013 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5014 stdout = stdout.replace('\r\n', '\n')
5015 if opts.diff:
5016 sys.stdout.write(stdout)
5017 if code != stdout:
5018 return_value = 2
5019 else:
5020 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5021 if opts.diff:
5022 sys.stdout.write(stdout)
5023 else:
5024 env = os.environ.copy()
5025 env['PATH'] = str(os.path.dirname(clang_format_tool))
5026 try:
5027 script = clang_format.FindClangFormatScriptInChromiumTree(
5028 'clang-format-diff.py')
5029 except clang_format.NotFoundError as e:
5030 DieWithError(e)
5031
5032 cmd = [sys.executable, script, '-p0']
5033 if not opts.dry_run and not opts.diff:
5034 cmd.append('-i')
5035
5036 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005037 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005038
5039 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5040 if opts.diff:
5041 sys.stdout.write(stdout)
5042 if opts.dry_run and len(stdout) > 0:
5043 return_value = 2
5044
5045 return return_value
5046
5047
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005048def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005049 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005050 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005051
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005052
enne@chromium.org555cfe42014-01-29 18:21:39 +00005053@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005054@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005055def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005056 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005057 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005058 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005059 parser.add_option('--full', action='store_true',
5060 help='Reformat the full content of all touched files')
5061 parser.add_option('--dry-run', action='store_true',
5062 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005063 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005064 '--no-clang-format',
5065 dest='clang_format',
5066 action='store_false',
5067 default=True,
5068 help='Disables formatting of various file types using clang-format.')
5069 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005070 '--python',
5071 action='store_true',
5072 default=None,
5073 help='Enables python formatting on all python files.')
5074 parser.add_option(
5075 '--no-python',
5076 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005077 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005078 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005079 'If neither --python or --no-python are set, python files that have a '
5080 '.style.yapf file in an ancestor directory will be formatted. '
5081 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005082 parser.add_option(
5083 '--js',
5084 action='store_true',
5085 help='Format javascript code with clang-format. '
5086 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005087 parser.add_option('--diff', action='store_true',
5088 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005089 parser.add_option('--presubmit', action='store_true',
5090 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005091 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005092
Garrett Beaty91a6f332020-01-06 16:57:24 +00005093 if opts.python is not None and opts.no_python:
5094 raise parser.error('Cannot set both --python and --no-python')
5095 if opts.no_python:
5096 opts.python = False
5097
Daniel Chengc55eecf2016-12-30 03:11:02 -08005098 # Normalize any remaining args against the current path, so paths relative to
5099 # the current directory are still resolved as expected.
5100 args = [os.path.join(os.getcwd(), arg) for arg in args]
5101
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005102 # git diff generates paths against the root of the repository. Change
5103 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005104 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005105 if rel_base_path:
5106 os.chdir(rel_base_path)
5107
digit@chromium.org29e47272013-05-17 17:01:46 +00005108 # Grab the merge-base commit, i.e. the upstream commit of the current
5109 # branch when it was created or the last time it was rebased. This is
5110 # to cover the case where the user may have called "git fetch origin",
5111 # moving the origin branch to a newer commit, but hasn't rebased yet.
5112 upstream_commit = None
5113 cl = Changelist()
5114 upstream_branch = cl.GetUpstreamBranch()
5115 if upstream_branch:
5116 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5117 upstream_commit = upstream_commit.strip()
5118
5119 if not upstream_commit:
5120 DieWithError('Could not find base commit for this branch. '
5121 'Are you in detached state?')
5122
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005123 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5124 diff_output = RunGit(changed_files_cmd)
5125 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005126 # Filter out files deleted by this CL
5127 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005128
Andreas Haas417d89c2020-02-06 10:24:27 +00005129 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005130 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005131
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005132 clang_diff_files = []
5133 if opts.clang_format:
5134 clang_diff_files = [
5135 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5136 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005137 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5138 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005139 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005140
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005141 top_dir = os.path.normpath(
5142 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5143
Jamie Madill5e96ad12020-01-13 16:08:35 +00005144 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5145 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005146
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005147 # Similar code to above, but using yapf on .py files rather than clang-format
5148 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005149 py_explicitly_disabled = opts.python is not None and not opts.python
5150 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005151 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5152 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5153 if sys.platform.startswith('win'):
5154 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005155
Aiden Bennerc08566e2018-10-03 17:52:42 +00005156 # Used for caching.
5157 yapf_configs = {}
5158 for f in python_diff_files:
5159 # Find the yapf style config for the current file, defaults to depot
5160 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005161 _FindYapfConfigFile(f, yapf_configs, top_dir)
5162
5163 # Turn on python formatting by default if a yapf config is specified.
5164 # This breaks in the case of this repo though since the specified
5165 # style file is also the global default.
5166 if opts.python is None:
5167 filtered_py_files = []
5168 for f in python_diff_files:
5169 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5170 filtered_py_files.append(f)
5171 else:
5172 filtered_py_files = python_diff_files
5173
5174 # Note: yapf still seems to fix indentation of the entire file
5175 # even if line ranges are specified.
5176 # See https://github.com/google/yapf/issues/499
5177 if not opts.full and filtered_py_files:
5178 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5179
Brian Sheedyb4307d52019-12-02 19:18:17 +00005180 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5181 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5182 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005183
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005184 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005185 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5186 # Default to pep8 if not .style.yapf is found.
5187 if not yapf_style:
5188 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005189
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005190 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005191
5192 has_formattable_lines = False
5193 if not opts.full:
5194 # Only run yapf over changed line ranges.
5195 for diff_start, diff_len in py_line_diffs[f]:
5196 diff_end = diff_start + diff_len - 1
5197 # Yapf errors out if diff_end < diff_start but this
5198 # is a valid line range diff for a removal.
5199 if diff_end >= diff_start:
5200 has_formattable_lines = True
5201 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5202 # If all line diffs were removals we have nothing to format.
5203 if not has_formattable_lines:
5204 continue
5205
5206 if opts.diff or opts.dry_run:
5207 cmd += ['--diff']
5208 # Will return non-zero exit code if non-empty diff.
5209 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5210 if opts.diff:
5211 sys.stdout.write(stdout)
5212 elif len(stdout) > 0:
5213 return_value = 2
5214 else:
5215 cmd += ['-i']
5216 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005217
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005218 # Dart's formatter does not have the nice property of only operating on
5219 # modified chunks, so hard code full.
5220 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005221 try:
5222 command = [dart_format.FindDartFmtToolInChromiumTree()]
5223 if not opts.dry_run and not opts.diff:
5224 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005225 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005226
ppi@chromium.org6593d932016-03-03 15:41:15 +00005227 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005228 if opts.dry_run and stdout:
5229 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005230 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005231 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5232 'found in this checkout. Files in other languages are still '
5233 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005234
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005235 # Format GN build files. Always run on full build files for canonical form.
5236 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005237 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005238 if opts.dry_run or opts.diff:
5239 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005240 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005241 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5242 shell=sys.platform == 'win32',
5243 cwd=top_dir)
5244 if opts.dry_run and gn_ret == 2:
5245 return_value = 2 # Not formatted.
5246 elif opts.diff and gn_ret == 2:
5247 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005248 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005249 elif gn_ret != 0:
5250 # For non-dry run cases (and non-2 return values for dry-run), a
5251 # nonzero error code indicates a failure, probably because the file
5252 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005253 DieWithError('gn format failed on ' + gn_diff_file +
5254 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005255
Ilya Shermane081cbe2017-08-15 17:51:04 -07005256 # Skip the metrics formatting from the global presubmit hook. These files have
5257 # a separate presubmit hook that issues an error if the files need formatting,
5258 # whereas the top-level presubmit script merely issues a warning. Formatting
5259 # these files is somewhat slow, so it's important not to duplicate the work.
5260 if not opts.presubmit:
5261 for xml_dir in GetDirtyMetricsDirs(diff_files):
5262 tool_dir = os.path.join(top_dir, xml_dir)
5263 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5264 if opts.dry_run or opts.diff:
5265 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005266 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005267 if opts.diff:
5268 sys.stdout.write(stdout)
5269 if opts.dry_run and stdout:
5270 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005271
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005272 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005273
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005274
Steven Holte2e664bf2017-04-21 13:10:47 -07005275def GetDirtyMetricsDirs(diff_files):
5276 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5277 metrics_xml_dirs = [
5278 os.path.join('tools', 'metrics', 'actions'),
5279 os.path.join('tools', 'metrics', 'histograms'),
5280 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005281 os.path.join('tools', 'metrics', 'ukm'),
5282 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005283 for xml_dir in metrics_xml_dirs:
5284 if any(file.startswith(xml_dir) for file in xml_diff_files):
5285 yield xml_dir
5286
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005287
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005288@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005289@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005290def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005291 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005292 _, args = parser.parse_args(args)
5293
5294 if len(args) != 1:
5295 parser.print_help()
5296 return 1
5297
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005298 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005299 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005300 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005301
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005302 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005303
Edward Lemur52969c92020-02-06 18:15:28 +00005304 issueprefix = Changelist.IssueConfigKey()
5305 output = RunGit(['config', '--local', '--get-regexp',
5306 r'branch\..*\.%s' % issueprefix],
5307 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005308
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005309 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005310 for key, issue in [x.split() for x in output.splitlines()]:
5311 if issue == target_issue:
5312 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5313
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005314 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005315 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005316 return 1
5317 if len(branches) == 1:
5318 RunGit(['checkout', branches[0]])
5319 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005320 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005321 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005322 print('%d: %s' % (i, branches[i]))
Edward Lemur1a83da12020-03-04 21:18:36 +00005323 which = ask_for_data('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005324 try:
5325 RunGit(['checkout', branches[int(which)]])
5326 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005327 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005328 return 1
5329
5330 return 0
5331
5332
maruel@chromium.org29404b52014-09-08 22:58:00 +00005333def CMDlol(parser, args):
5334 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005335 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005336 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5337 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5338 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005339 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005340 return 0
5341
5342
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005343class OptionParser(optparse.OptionParser):
5344 """Creates the option parse and add --verbose support."""
5345 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005346 optparse.OptionParser.__init__(
5347 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005348 self.add_option(
5349 '-v', '--verbose', action='count', default=0,
5350 help='Use 2 times for more debugging info')
5351
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005352 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005353 try:
5354 return self._parse_args(args)
5355 finally:
5356 # Regardless of success or failure of args parsing, we want to report
5357 # metrics, but only after logging has been initialized (if parsing
5358 # succeeded).
5359 global settings
5360 settings = Settings()
5361
5362 if not metrics.DISABLE_METRICS_COLLECTION:
5363 # GetViewVCUrl ultimately calls logging method.
5364 project_url = settings.GetViewVCUrl().strip('/+')
5365 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5366 metrics.collector.add('project_urls', [project_url])
5367
5368 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005369 # Create an optparse.Values object that will store only the actual passed
5370 # options, without the defaults.
5371 actual_options = optparse.Values()
5372 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5373 # Create an optparse.Values object with the default options.
5374 options = optparse.Values(self.get_default_values().__dict__)
5375 # Update it with the options passed by the user.
5376 options._update_careful(actual_options.__dict__)
5377 # Store the options passed by the user in an _actual_options attribute.
5378 # We store only the keys, and not the values, since the values can contain
5379 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005380 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005381
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005382 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005383 logging.basicConfig(
5384 level=levels[min(options.verbose, len(levels) - 1)],
5385 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5386 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005387
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005388 return options, args
5389
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005390
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005391def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005392 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005393 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005394 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005395 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005396
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005397 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005398 dispatcher = subcommand.CommandDispatcher(__name__)
5399 try:
5400 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005401 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005402 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005403 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005404 if e.code != 500:
5405 raise
5406 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005407 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005408 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005409 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005410
5411
5412if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005413 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5414 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005415 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005416 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005417 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005418 sys.exit(main(sys.argv[1:]))