blob: feabbad2fbd2e32b39acb98e54809eb37545f871 [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
maruel@chromium.org90541732011-04-01 17:54:18 +0000231def ask_for_data(prompt):
232 try:
233 return raw_input(prompt)
234 except KeyboardInterrupt:
235 # Hide the exception.
236 sys.exit(1)
237
238
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100239def confirm_or_exit(prefix='', action='confirm'):
240 """Asks user to press enter to continue or press Ctrl+C to abort."""
241 if not prefix or prefix.endswith('\n'):
242 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100243 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 mid = ' Press'
245 elif prefix.endswith(' '):
246 mid = 'press'
247 else:
248 mid = ' press'
249 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
250
251
252def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000253 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100254 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
255 while True:
256 if 'yes'.startswith(result):
257 return True
258 if 'no'.startswith(result):
259 return False
260 result = ask_for_data('Please, type yes or no: ').lower()
261
262
tandrii5d48c322016-08-18 16:19:37 -0700263def _git_branch_config_key(branch, key):
264 """Helper method to return Git config key for a branch."""
265 assert branch, 'branch name is required to set git config for it'
266 return 'branch.%s.%s' % (branch, key)
267
268
machenbach@chromium.org45453142015-09-15 08:45:22 +0000269def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000270 prop_list = getattr(options, 'properties', [])
271 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000272 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000273 try:
274 properties[key] = json.loads(val)
275 except ValueError:
276 pass # If a value couldn't be evaluated, treat it as a string.
277 return properties
278
279
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000280# TODO(crbug.com/976104): Remove this function once git-cl try-results has
281# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000282def _buildbucket_retry(operation_name, http, *args, **kwargs):
283 """Retries requests to buildbucket service and returns parsed json content."""
284 try_count = 0
285 while True:
286 response, content = http.request(*args, **kwargs)
287 try:
288 content_json = json.loads(content)
289 except ValueError:
290 content_json = None
291
292 # Buildbucket could return an error even if status==200.
293 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000294 error = content_json.get('error')
295 if error.get('code') == 403:
296 raise BuildbucketResponseException(
297 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000298 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000299 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000300 raise BuildbucketResponseException(msg)
301
302 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700303 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000304 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000305 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700306 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000307 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000308 content)
309 return content_json
310 if response.status < 500 or try_count >= 2:
311 raise httplib2.HttpLib2Error(content)
312
313 # status >= 500 means transient failures.
314 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000315 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000316 try_count += 1
317 assert False, 'unreachable'
318
319
Edward Lemur4c707a22019-09-24 21:13:43 +0000320def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000321 """Calls a buildbucket v2 method and returns the parsed json response."""
322 headers = {
323 'Accept': 'application/json',
324 'Content-Type': 'application/json',
325 }
326 request = json.dumps(request)
327 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
328
329 logging.info('POST %s with %s' % (url, request))
330
331 attempts = 1
332 time_to_sleep = 1
333 while True:
334 response, content = http.request(url, 'POST', body=request, headers=headers)
335 if response.status == 200:
336 return json.loads(content[4:])
337 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
338 msg = '%s error when calling POST %s with %s: %s' % (
339 response.status, url, request, content)
340 raise BuildbucketResponseException(msg)
341 logging.debug(
342 '%s error when calling POST %s with %s. '
343 'Sleeping for %d seconds and retrying...' % (
344 response.status, url, request, time_to_sleep))
345 time.sleep(time_to_sleep)
346 time_to_sleep *= 2
347 attempts += 1
348
349 assert False, 'unreachable'
350
351
Edward Lemur6215c792019-10-03 21:59:05 +0000352def _parse_bucket(raw_bucket):
353 legacy = True
354 project = bucket = None
355 if '/' in raw_bucket:
356 legacy = False
357 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000358 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000359 elif raw_bucket.startswith('luci.'):
360 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000361 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000362 elif '.' in raw_bucket:
363 project = raw_bucket.split('.')[0]
364 bucket = raw_bucket
365 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000366 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000367 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
368 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000369
370
Edward Lemur45768512020-03-02 19:03:14 +0000371def _trigger_try_jobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000372 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700373
374 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000375 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000376 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700377 options: Command-line options.
378 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000379 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000380 for project, bucket, builder in jobs:
381 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000382 print('To see results here, run: git cl try-results')
383 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700384
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000385 requests = _make_try_job_schedule_requests(
Edward Lemur45768512020-03-02 19:03:14 +0000386 changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000387 if not requests:
388 return
389
Edward Lemur5b929a42019-10-21 17:57:39 +0000390 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000391 http.force_exception_to_status_code = True
392
393 batch_request = {'requests': requests}
394 batch_response = _call_buildbucket(
395 http, options.buildbucket_host, 'Batch', batch_request)
396
397 errors = [
398 ' ' + response['error']['message']
399 for response in batch_response.get('responses', [])
400 if 'error' in response
401 ]
402 if errors:
403 raise BuildbucketResponseException(
404 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
405
406
Edward Lemur45768512020-03-02 19:03:14 +0000407def _make_try_job_schedule_requests(changelist, jobs, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000408 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000409 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000410 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000411 shared_properties['clobber'] = True
412 shared_properties.update(_get_properties_from_options(options) or {})
413
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000414 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
415 if options.retry_failed:
416 shared_tags.append({'key': 'retry_failed',
417 'value': '1'})
418
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000419 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000420 for (project, bucket, builder) in jobs:
421 properties = shared_properties.copy()
422 if 'presubmit' in builder.lower():
423 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000424
Edward Lemur45768512020-03-02 19:03:14 +0000425 requests.append({
426 'scheduleBuild': {
427 'requestId': str(uuid.uuid4()),
428 'builder': {
429 'project': getattr(options, 'project', None) or project,
430 'bucket': bucket,
431 'builder': builder,
432 },
433 'gerritChanges': gerrit_changes,
434 'properties': properties,
435 'tags': [
436 {'key': 'builder', 'value': builder},
437 ] + shared_tags,
438 }
439 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000440
Edward Lemur45768512020-03-02 19:03:14 +0000441 if options.revision:
442 requests[-1]['scheduleBuild']['gitilesCommit'] = {
443 'host': gerrit_changes[0]['host'],
444 'project': gerrit_changes[0]['project'],
445 'id': options.revision
446 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000447
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000448 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000449
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000450
Edward Lemur5b929a42019-10-21 17:57:39 +0000451def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000452 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000453
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000454 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000455 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000456 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000457 request = {
458 'predicate': {
459 'gerritChanges': [changelist.GetGerritChange(patchset)],
460 },
461 'fields': ','.join('builds.*.' + field for field in fields),
462 }
tandrii221ab252016-10-06 08:12:04 -0700463
Edward Lemur5b929a42019-10-21 17:57:39 +0000464 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000465 if authenticator.has_cached_credentials():
466 http = authenticator.authorize(httplib2.Http())
467 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700468 print('Warning: Some results might be missing because %s' %
469 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000470 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000471 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000472 http.force_exception_to_status_code = True
473
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000474 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
475 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000476
Edward Lemur45768512020-03-02 19:03:14 +0000477
Edward Lemur5b929a42019-10-21 17:57:39 +0000478def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000479 """Fetches builds from the latest patchset that has builds (within
480 the last few patchsets).
481
482 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000483 changelist (Changelist): The CL to fetch builds for
484 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000485 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
486 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000487 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000488 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
489 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000490 """
491 assert buildbucket_host
492 assert changelist.GetIssue(), 'CL must be uploaded first'
493 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000494 if latest_patchset is None:
495 assert changelist.GetMostRecentPatchset()
496 ps = changelist.GetMostRecentPatchset()
497 else:
498 assert latest_patchset > 0, latest_patchset
499 ps = latest_patchset
500
Quinten Yearsley983111f2019-09-26 17:18:48 +0000501 min_ps = max(1, ps - 5)
502 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000503 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000504 if len(builds):
505 return builds, ps
506 ps -= 1
507 return [], 0
508
509
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000510def _filter_failed_for_retry(all_builds):
511 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000512
513 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000514 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000515 i.e. a list of buildbucket.v2.Builds which includes status and builder
516 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000517
518 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000519 A dict {(proj, bucket): [builders]}. This is the same format accepted by
520 _trigger_try_jobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000521 """
Edward Lemur45768512020-03-02 19:03:14 +0000522 grouped = {}
523 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000524 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000525 key = (builder['project'], builder['bucket'], builder['builder'])
526 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000527
Edward Lemur45768512020-03-02 19:03:14 +0000528 jobs = []
529 for (project, bucket, builder), builds in grouped.items():
530 if 'triggered' in builder:
531 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
532 'from a parent. Please schedule a manual job for the parent '
533 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000534 continue
535 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
536 # Don't retry if any are running.
537 continue
Edward Lemur45768512020-03-02 19:03:14 +0000538 # If builder had several builds, retry only if the last one failed.
539 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
540 # build, but in case of retrying failed jobs retrying a flaky one makes
541 # sense.
542 builds = sorted(builds, key=lambda b: b['createTime'])
543 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
544 continue
545 # Don't retry experimental build previously triggered by CQ.
546 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
547 for t in builds[-1]['tags']):
548 continue
549 jobs.append((project, bucket, builder))
550
551 # Sort the jobs to make testing easier.
552 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000553
554
qyearsleyeab3c042016-08-24 09:18:28 -0700555def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 """Prints nicely result of fetch_try_jobs."""
557 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000558 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000559 return
560
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000561 longest_builder = max(len(b['builder']['builder']) for b in builds)
562 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000563 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000564 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
565 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000567 builds_by_status = {}
568 for b in builds:
569 builds_by_status.setdefault(b['status'], []).append({
570 'id': b['id'],
571 'name': name_fmt.format(
572 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
573 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000574
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000575 sort_key = lambda b: (b['name'], b['id'])
576
577 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000578 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000579 if not builds:
580 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000582 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000583 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000584 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585 else:
586 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
587
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000588 print(colorize(title))
589 for b in sorted(builds, key=sort_key):
590 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591
592 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 print_builds(
594 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
595 print_builds(
596 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
597 color=Fore.MAGENTA)
598 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
599 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
600 color=Fore.MAGENTA)
601 print_builds('Started:', builds_by_status.pop('STARTED', []))
602 print_builds(
603 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000604 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000605 print_builds(
606 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000607 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000608
609
Aiden Bennerc08566e2018-10-03 17:52:42 +0000610def _ComputeDiffLineRanges(files, upstream_commit):
611 """Gets the changed line ranges for each file since upstream_commit.
612
613 Parses a git diff on provided files and returns a dict that maps a file name
614 to an ordered list of range tuples in the form (start_line, count).
615 Ranges are in the same format as a git diff.
616 """
617 # If files is empty then diff_output will be a full diff.
618 if len(files) == 0:
619 return {}
620
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000621 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000622 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 diff_output = RunGit(diff_cmd)
624
625 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
626 # 2 capture groups
627 # 0 == fname of diff file
628 # 1 == 'diff_start,diff_count' or 'diff_start'
629 # will match each of
630 # diff --git a/foo.foo b/foo.py
631 # @@ -12,2 +14,3 @@
632 # @@ -12,2 +17 @@
633 # running re.findall on the above string with pattern will give
634 # [('foo.py', ''), ('', '14,3'), ('', '17')]
635
636 curr_file = None
637 line_diffs = {}
638 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
639 if match[0] != '':
640 # Will match the second filename in diff --git a/a.py b/b.py.
641 curr_file = match[0]
642 line_diffs[curr_file] = []
643 else:
644 # Matches +14,3
645 if ',' in match[1]:
646 diff_start, diff_count = match[1].split(',')
647 else:
648 # Single line changes are of the form +12 instead of +12,1.
649 diff_start = match[1]
650 diff_count = 1
651
652 diff_start = int(diff_start)
653 diff_count = int(diff_count)
654
655 # If diff_count == 0 this is a removal we can ignore.
656 line_diffs[curr_file].append((diff_start, diff_count))
657
658 return line_diffs
659
660
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000661def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000662 """Checks if a yapf file is in any parent directory of fpath until top_dir.
663
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000664 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000665 is found returns None. Uses yapf_config_cache as a cache for previously found
666 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000667 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000668 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000669 # Return result if we've already computed it.
670 if fpath in yapf_config_cache:
671 return yapf_config_cache[fpath]
672
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000673 parent_dir = os.path.dirname(fpath)
674 if os.path.isfile(fpath):
675 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000677 # Otherwise fpath is a directory
678 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
679 if os.path.isfile(yapf_file):
680 ret = yapf_file
681 elif fpath == top_dir or parent_dir == fpath:
682 # If we're at the top level directory, or if we're at root
683 # there is no provided style.
684 ret = None
685 else:
686 # Otherwise recurse on the current directory.
687 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000688 yapf_config_cache[fpath] = ret
689 return ret
690
691
Brian Sheedyb4307d52019-12-02 19:18:17 +0000692def _GetYapfIgnorePatterns(top_dir):
693 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000694
695 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
696 but this functionality appears to break when explicitly passing files to
697 yapf for formatting. According to
698 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
699 the .yapfignore file should be in the directory that yapf is invoked from,
700 which we assume to be the top level directory in this case.
701
702 Args:
703 top_dir: The top level directory for the repository being formatted.
704
705 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000706 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000707 """
708 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000709 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000710 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000711 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000712
Brian Sheedyb4307d52019-12-02 19:18:17 +0000713 with open(yapfignore_file) as f:
714 for line in f.readlines():
715 stripped_line = line.strip()
716 # Comments and blank lines should be ignored.
717 if stripped_line.startswith('#') or stripped_line == '':
718 continue
719 ignore_patterns.add(stripped_line)
720 return ignore_patterns
721
722
723def _FilterYapfIgnoredFiles(filepaths, patterns):
724 """Filters out any filepaths that match any of the given patterns.
725
726 Args:
727 filepaths: An iterable of strings containing filepaths to filter.
728 patterns: An iterable of strings containing fnmatch patterns to filter on.
729
730 Returns:
731 A list of strings containing all the elements of |filepaths| that did not
732 match any of the patterns in |patterns|.
733 """
734 # Not inlined so that tests can use the same implementation.
735 return [f for f in filepaths
736 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000737
738
Aaron Gable13101a62018-02-09 13:20:41 -0800739def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000740 """Prints statistics about the change to the user."""
741 # --no-ext-diff is broken in some versions of Git, so try to work around
742 # this by overriding the environment (but there is still a problem if the
743 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000744 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000745 if 'GIT_EXTERNAL_DIFF' in env:
746 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000747
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000748 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800749 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000750 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751
752
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000753class BuildbucketResponseException(Exception):
754 pass
755
756
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000757class Settings(object):
758 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000759 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000760 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000761 self.tree_status_url = None
762 self.viewvc_url = None
763 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000764 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000765 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000766 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000767 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000768 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769
Edward Lemur26964072020-02-19 19:18:51 +0000770 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000771 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000772 if self.updated:
773 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000774
Edward Lemur26964072020-02-19 19:18:51 +0000775 # The only value that actually changes the behavior is
776 # autoupdate = "false". Everything else means "true".
777 autoupdate = (
778 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
779
780 cr_settings_file = FindCodereviewSettingsFile()
781 if autoupdate != 'false' and cr_settings_file:
782 LoadCodereviewSettingsFromFile(cr_settings_file)
783 cr_settings_file.close()
784
785 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000786
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000787 @staticmethod
788 def GetRelativeRoot():
789 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000790
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000791 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000792 if self.root is None:
793 self.root = os.path.abspath(self.GetRelativeRoot())
794 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000796 def GetTreeStatusUrl(self, error_ok=False):
797 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000798 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
799 if self.tree_status_url is None and not error_ok:
800 DieWithError(
801 'You must configure your tree status URL by running '
802 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000803 return self.tree_status_url
804
805 def GetViewVCUrl(self):
806 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000807 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000808 return self.viewvc_url
809
rmistry@google.com90752582014-01-14 21:04:50 +0000810 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000811 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000812
rmistry@google.com5626a922015-02-26 14:03:30 +0000813 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000814 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000815 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000816 return run_post_upload_hook == "True"
817
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000818 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000819 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000820
ukai@chromium.orge8077812012-02-03 03:41:46 +0000821 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000822 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000823 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000824 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000825 return self.is_gerrit
826
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000827 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000828 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000829 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700830 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000831 if self.squash_gerrit_uploads is None:
832 # Default is squash now (http://crbug.com/611892#c23).
833 self.squash_gerrit_uploads = self._GetConfig(
834 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000835 return self.squash_gerrit_uploads
836
tandriia60502f2016-06-20 02:01:53 -0700837 def GetSquashGerritUploadsOverride(self):
838 """Return True or False if codereview.settings should be overridden.
839
840 Returns None if no override has been defined.
841 """
842 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000843 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700844 if result == 'true':
845 return True
846 if result == 'false':
847 return False
848 return None
849
tandrii@chromium.org28253532016-04-14 13:46:56 +0000850 def GetGerritSkipEnsureAuthenticated(self):
851 """Return True if EnsureAuthenticated should not be done for Gerrit
852 uploads."""
853 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000854 self.gerrit_skip_ensure_authenticated = self._GetConfig(
855 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000856 return self.gerrit_skip_ensure_authenticated
857
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000858 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000859 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000860 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000861 # Git requires single quotes for paths with spaces. We need to replace
862 # them with double quotes for Windows to treat such paths as a single
863 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000864 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000865 return self.git_editor or None
866
thestig@chromium.org44202a22014-03-11 19:22:18 +0000867 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000868 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000869
870 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000871 return self._GetConfig(
872 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000873
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000874 def GetFormatFullByDefault(self):
875 if self.format_full_by_default is None:
876 result = (
877 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
878 error_ok=True).strip())
879 self.format_full_by_default = (result == 'true')
880 return self.format_full_by_default
881
Edward Lemur26964072020-02-19 19:18:51 +0000882 def _GetConfig(self, key, default=''):
883 self._LazyUpdateIfNeeded()
884 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000885
886
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000887class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000888 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000889 NONE = 'none'
890 DRY_RUN = 'dry_run'
891 COMMIT = 'commit'
892
893 ALL_STATES = [NONE, DRY_RUN, COMMIT]
894
895
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000896class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000897 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000898 self.issue = issue
899 self.patchset = patchset
900 self.hostname = hostname
901
902 @property
903 def valid(self):
904 return self.issue is not None
905
906
Edward Lemurf38bc172019-09-03 21:02:13 +0000907def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000908 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
909 fail_result = _ParsedIssueNumberArgument()
910
Edward Lemur678a6842019-10-03 22:25:05 +0000911 if isinstance(arg, int):
912 return _ParsedIssueNumberArgument(issue=arg)
913 if not isinstance(arg, basestring):
914 return fail_result
915
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000916 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000917 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000918 if not arg.startswith('http'):
919 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700920
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000921 url = gclient_utils.UpgradeToHttps(arg)
922 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000923 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000924 except ValueError:
925 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200926
Edward Lemur678a6842019-10-03 22:25:05 +0000927 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
928 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
929 # Short urls like https://domain/<issue_number> can be used, but don't allow
930 # specifying the patchset (you'd 404), but we allow that here.
931 if parsed_url.path == '/':
932 part = parsed_url.fragment
933 else:
934 part = parsed_url.path
935
936 match = re.match(
937 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
938 if not match:
939 return fail_result
940
941 issue = int(match.group('issue'))
942 patchset = match.group('patchset')
943 return _ParsedIssueNumberArgument(
944 issue=issue,
945 patchset=int(patchset) if patchset else None,
946 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000947
948
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000949def _create_description_from_log(args):
950 """Pulls out the commit log to use as a base for the CL description."""
951 log_args = []
952 if len(args) == 1 and not args[0].endswith('.'):
953 log_args = [args[0] + '..']
954 elif len(args) == 1 and args[0].endswith('...'):
955 log_args = [args[0][:-1]]
956 elif len(args) == 2:
957 log_args = [args[0] + '..' + args[1]]
958 else:
959 log_args = args[:] # Hope for the best!
960 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
961
962
Aaron Gablea45ee112016-11-22 15:14:38 -0800963class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700964 def __init__(self, issue, url):
965 self.issue = issue
966 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800967 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700968
969 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800970 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700971 self.issue, self.url)
972
973
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100974_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000975 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100976 # TODO(tandrii): these two aren't known in Gerrit.
977 'approval', 'disapproval'])
978
979
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000980class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000981 """Changelist works with one changelist in local branch.
982
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000983 Notes:
984 * Not safe for concurrent multi-{thread,process} use.
985 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700986 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000987 """
988
Edward Lemur125d60a2019-09-13 18:25:41 +0000989 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000990 """Create a new ChangeList instance.
991
Edward Lemurf38bc172019-09-03 21:02:13 +0000992 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000993 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000994 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000995 global settings
996 if not settings:
997 # Happens when git_cl.py is used as a utility library.
998 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000999
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001000 self.branchref = branchref
1001 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001002 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001003 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001004 else:
1005 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001006 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001007 self.lookedup_issue = False
1008 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009 self.description = None
Edward Lemur9aa1a962020-02-25 00:58:38 +00001010 self.local_description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001011 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001012 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001013 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001014 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001015 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001016 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001017
Edward Lemur125d60a2019-09-13 18:25:41 +00001018 # Lazily cached values.
1019 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1020 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1021 # Map from change number (issue) to its detail cache.
1022 self._detail_cache = {}
1023
1024 if codereview_host is not None:
1025 assert not codereview_host.startswith('https://'), codereview_host
1026 self._gerrit_host = codereview_host
1027 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001028
1029 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001030 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001031
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001032 The return value is a string suitable for passing to git cl with the --cc
1033 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001034 """
1035 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001036 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001037 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001038 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1039 return self.cc
1040
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001041 def GetCCListWithoutDefault(self):
1042 """Return the users cc'd on this CL excluding default ones."""
1043 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001044 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001045 return self.cc
1046
Daniel Cheng7227d212017-11-17 08:12:37 -08001047 def ExtendCC(self, more_cc):
1048 """Extends the list of users to cc on this CL based on the changed files."""
1049 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001050
1051 def GetBranch(self):
1052 """Returns the short branch name, e.g. 'master'."""
1053 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001054 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001055 if not branchref:
1056 return None
1057 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001058 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059 return self.branch
1060
1061 def GetBranchRef(self):
1062 """Returns the full branch name, e.g. 'refs/heads/master'."""
1063 self.GetBranch() # Poke the lazy loader.
1064 return self.branchref
1065
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001066 def ClearBranch(self):
1067 """Clears cached branch data of this object."""
1068 self.branch = self.branchref = None
1069
Edward Lemur85153282020-02-14 22:06:29 +00001070 def _GitGetBranchConfigValue(self, key, default=None):
1071 return scm.GIT.GetBranchConfig(
1072 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001073
Edward Lemur85153282020-02-14 22:06:29 +00001074 def _GitSetBranchConfigValue(self, key, value):
1075 action = 'set %s to %r' % (key, value)
1076 if not value:
1077 action = 'unset %s' % key
1078 assert self.GetBranch(), 'a branch is needed to ' + action
1079 return scm.GIT.SetBranchConfig(
1080 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001081
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001082 @staticmethod
1083 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001084 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085 e.g. 'origin', 'refs/heads/master'
1086 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001087 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1088 settings.GetRoot(), branch)
1089 if not remote or not upstream_branch:
1090 DieWithError(
1091 'Unable to determine default branch to diff against.\n'
1092 'Either pass complete "git diff"-style arguments, like\n'
1093 ' git cl upload origin/master\n'
1094 'or verify this branch is set up to track another \n'
1095 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001096
1097 return remote, upstream_branch
1098
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001099 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001100 upstream_branch = self.GetUpstreamBranch()
1101 if not BranchExists(upstream_branch):
1102 DieWithError('The upstream for the current branch (%s) does not exist '
1103 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001104 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001105 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001106
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001107 def GetUpstreamBranch(self):
1108 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001109 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001110 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001111 upstream_branch = upstream_branch.replace('refs/heads/',
1112 'refs/remotes/%s/' % remote)
1113 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1114 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001115 self.upstream_branch = upstream_branch
1116 return self.upstream_branch
1117
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001118 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001119 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001120 remote, branch = None, self.GetBranch()
1121 seen_branches = set()
1122 while branch not in seen_branches:
1123 seen_branches.add(branch)
1124 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001125 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001126 if remote != '.' or branch.startswith('refs/remotes'):
1127 break
1128 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001129 remotes = RunGit(['remote'], error_ok=True).split()
1130 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001131 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001132 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001133 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001134 logging.warn('Could not determine which remote this change is '
1135 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001136 else:
1137 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001138 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001139 branch = 'HEAD'
1140 if branch.startswith('refs/remotes'):
1141 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001142 elif branch.startswith('refs/branch-heads/'):
1143 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001144 else:
1145 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001146 return self._remote
1147
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001148 def GitSanityChecks(self, upstream_git_obj):
1149 """Checks git repo status and ensures diff is from local commits."""
1150
sbc@chromium.org79706062015-01-14 21:18:12 +00001151 if upstream_git_obj is None:
1152 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001153 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001154 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001155 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001156 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001157 return False
1158
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001159 # Verify the commit we're diffing against is in our current branch.
1160 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1161 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1162 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001163 print('ERROR: %s is not in the current branch. You may need to rebase '
1164 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 return False
1166
1167 # List the commits inside the diff, and verify they are all local.
1168 commits_in_diff = RunGit(
1169 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1170 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1171 remote_branch = remote_branch.strip()
1172 if code != 0:
1173 _, remote_branch = self.GetRemoteBranch()
1174
1175 commits_in_remote = RunGit(
1176 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1177
1178 common_commits = set(commits_in_diff) & set(commits_in_remote)
1179 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001180 print('ERROR: Your diff contains %d commits already in %s.\n'
1181 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1182 'the diff. If you are using a custom git flow, you can override'
1183 ' the reference used for this check with "git config '
1184 'gitcl.remotebranch <git-ref>".' % (
1185 len(common_commits), remote_branch, upstream_git_obj),
1186 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001187 return False
1188 return True
1189
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001190 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001191 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001192
1193 Returns None if it is not set.
1194 """
tandrii5d48c322016-08-18 16:19:37 -07001195 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001196
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001197 def GetRemoteUrl(self):
1198 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1199
1200 Returns None if there is no remote.
1201 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001202 is_cached, value = self._cached_remote_url
1203 if is_cached:
1204 return value
1205
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001206 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001207 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001208
Edward Lemur298f2cf2019-02-22 21:40:39 +00001209 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001210 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001211 if host:
1212 self._cached_remote_url = (True, url)
1213 return url
1214
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001215 # If it cannot be parsed as an url, assume it is a local directory,
1216 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001217 logging.warning('"%s" doesn\'t appear to point to a git host. '
1218 'Interpreting it as a local directory.', url)
1219 if not os.path.isdir(url):
1220 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001221 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1222 'but it doesn\'t exist.',
1223 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001224 return None
1225
1226 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001227 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001228
Edward Lemur79d4f992019-11-11 23:49:02 +00001229 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001230 if not host:
1231 logging.error(
1232 'Remote "%(remote)s" for branch "%(branch)s" points to '
1233 '"%(cache_path)s", but it is misconfigured.\n'
1234 '"%(cache_path)s" must be a git repo and must have a remote named '
1235 '"%(remote)s" pointing to the git host.', {
1236 'remote': remote,
1237 'cache_path': cache_path,
1238 'branch': self.GetBranch()})
1239 return None
1240
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001241 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001242 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001243
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001244 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001245 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001246 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001247 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1248 if self.issue is not None:
1249 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001250 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001251 return self.issue
1252
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 def GetIssueURL(self):
1254 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001255 issue = self.GetIssue()
1256 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001257 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001258 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259
Edward Lemur7f6dec02020-02-06 20:23:58 +00001260 def GetLocalDescription(self, upstream_branch):
1261 """Return the log messages of all commits up to the branch point."""
Edward Lemur9aa1a962020-02-25 00:58:38 +00001262 if self.local_description is None:
1263 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1264 self.local_description = RunGitWithCode(args)[1].strip()
1265 return self.local_description
Edward Lemur7f6dec02020-02-06 20:23:58 +00001266
Edward Lemur6c6827c2020-02-06 21:15:18 +00001267 def FetchDescription(self, pretty=False):
1268 assert self.GetIssue(), 'issue is required to query Gerrit'
1269
Edward Lemur9aa1a962020-02-25 00:58:38 +00001270 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001271 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1272 current_rev = data['current_revision']
1273 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001274
1275 if not pretty:
1276 return self.description
1277
1278 # Set width to 72 columns + 2 space indent.
1279 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1280 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1281 lines = self.description.splitlines()
1282 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283
1284 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001285 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001286 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001287 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1288 if self.patchset is not None:
1289 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001290 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001291 return self.patchset
1292
Edward Lemur9aa1a962020-02-25 00:58:38 +00001293 def GetAuthor(self):
1294 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1295
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001296 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001297 """Set this branch's patchset. If patchset=0, clears the patchset."""
1298 assert self.GetBranch()
1299 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001300 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001301 else:
1302 self.patchset = int(patchset)
1303 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001304 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001305
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001306 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001307 """Set this branch's issue. If issue isn't given, clears the issue."""
1308 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001310 issue = int(issue)
1311 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001312 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001313 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001314 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001315 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001316 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001317 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001318 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001319 else:
tandrii5d48c322016-08-18 16:19:37 -07001320 # Reset all of these just to be clean.
1321 reset_suffixes = [
1322 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001323 self.IssueConfigKey(),
1324 self.PatchsetConfigKey(),
1325 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001326 ] + self._PostUnsetIssueProperties()
1327 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001328 try:
1329 self._GitSetBranchConfigValue(prop, None)
1330 except subprocess2.CalledProcessError:
1331 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001332 msg = RunGit(['log', '-1', '--format=%B']).strip()
1333 if msg and git_footers.get_footer_change_id(msg):
1334 print('WARNING: The change patched into this branch has a Change-Id. '
1335 'Removing it.')
1336 RunGit(['commit', '--amend', '-m',
1337 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001338 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001339 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001340 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001341
Edward Lemur7f6dec02020-02-06 20:23:58 +00001342 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001343 if not self.GitSanityChecks(upstream_branch):
1344 DieWithError('\nGit sanity check failure')
1345
Edward Lemur7f6dec02020-02-06 20:23:58 +00001346 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001347 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001348 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001349 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001350 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001351 except subprocess2.CalledProcessError:
1352 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001353 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001354 'This branch probably doesn\'t exist anymore. To reset the\n'
1355 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001356 ' git branch --set-upstream-to origin/master %s\n'
1357 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001358 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001359
maruel@chromium.org52424302012-08-29 15:14:30 +00001360 issue = self.GetIssue()
1361 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001362 if issue:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001363 description = self.FetchDescription()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001364 else:
1365 # If the change was never uploaded, use the log messages of all commits
1366 # up to the branch point, as git cl upload will prefill the description
1367 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001368 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001369
Edward Lemur9aa1a962020-02-25 00:58:38 +00001370 author = self.GetAuthor()
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001371 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001372 name,
1373 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001374 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001375 files,
1376 issue,
1377 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001378 author,
1379 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001380
dsansomee2d6fd92016-09-08 00:10:47 -07001381 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001382 assert self.GetIssue(), 'issue is required to update description'
1383
1384 if gerrit_util.HasPendingChangeEdit(
1385 self._GetGerritHost(), self._GerritChangeIdentifier()):
1386 if not force:
1387 confirm_or_exit(
1388 'The description cannot be modified while the issue has a pending '
1389 'unpublished edit. Either publish the edit in the Gerrit web UI '
1390 'or delete it.\n\n', action='delete the unpublished edit')
1391
1392 gerrit_util.DeletePendingChangeEdit(
1393 self._GetGerritHost(), self._GerritChangeIdentifier())
1394 gerrit_util.SetCommitMessage(
1395 self._GetGerritHost(), self._GerritChangeIdentifier(),
1396 description, notify='NONE')
1397
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001398 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001399
Edward Lemur75526302020-02-27 22:31:05 +00001400 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001401 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001402 '--author', self.GetAuthor(),
1403 '--root', settings.GetRoot(),
1404 '--upstream', upstream,
1405 ]
1406
1407 args.extend(['--verbose'] * verbose)
1408
1409 issue = self.GetIssue()
1410 patchset = self.GetPatchset()
1411 gerrit_url = self.GetCodereviewServer()
1412 if issue:
1413 args.extend(['--issue', str(issue)])
1414 if patchset:
1415 args.extend(['--patchset', str(patchset)])
1416 if gerrit_url:
1417 args.extend(['--gerrit_url', gerrit_url])
1418
Edward Lemur75526302020-02-27 22:31:05 +00001419 return args
1420
1421 def RunHook(
1422 self, committing, may_prompt, verbose, parallel, upstream, description,
1423 all_files):
1424 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1425 args = self._GetCommonPresubmitArgs(verbose, upstream)
1426 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001427 if may_prompt:
1428 args.append('--may_prompt')
1429 if parallel:
1430 args.append('--parallel')
1431 if all_files:
1432 args.append('--all_files')
1433
1434 with gclient_utils.temporary_file() as description_file:
1435 with gclient_utils.temporary_file() as json_output:
1436 gclient_utils.FileWrite(
1437 description_file, description.encode('utf-8'), mode='wb')
1438 args.extend(['--json_output', json_output])
1439 args.extend(['--description_file', description_file])
1440
1441 start = time_time()
1442 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1443 exit_code = p.wait()
1444 metrics.collector.add_repeated('sub_commands', {
1445 'command': 'presubmit',
1446 'execution_time': time_time() - start,
1447 'exit_code': exit_code,
1448 })
1449
1450 if exit_code:
1451 sys.exit(exit_code)
1452
1453 json_results = gclient_utils.FileRead(json_output)
1454 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001455
Edward Lemur75526302020-02-27 22:31:05 +00001456 def RunPostUploadHook(self, verbose, upstream, description):
1457 args = self._GetCommonPresubmitArgs(verbose, upstream)
1458 args.append('--post_upload')
1459
1460 with gclient_utils.temporary_file() as description_file:
1461 gclient_utils.FileWrite(
1462 description_file, description.encode('utf-8'), mode='wb')
1463 args.extend(['--description_file', description_file])
1464 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1465 p.wait()
1466
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001467 def CMDUpload(self, options, git_diff_args, orig_args):
1468 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001469 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001470 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001471 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001472 else:
1473 if self.GetBranch() is None:
1474 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1475
1476 # Default to diffing against common ancestor of upstream branch
1477 base_branch = self.GetCommonAncestorWithUpstream()
1478 git_diff_args = [base_branch, 'HEAD']
1479
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001480 # Fast best-effort checks to abort before running potentially expensive
1481 # hooks if uploading is likely to fail anyway. Passing these checks does
1482 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001483 self.EnsureAuthenticated(force=options.force)
1484 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001485
1486 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001487 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001488 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1489 files = [f.LocalPath() for f in change.AffectedFiles()]
1490 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001491 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001492
Edward Lemur75526302020-02-27 22:31:05 +00001493 description = change.FullDescriptionText()
1494 if options.reviewers or options.tbrs or options.add_owners_to:
1495 # Set the reviewer list now so that presubmit checks can access it.
1496 change_description = ChangeDescription(description)
1497 change_description.update_reviewers(options.reviewers,
1498 options.tbrs,
1499 options.add_owners_to,
1500 change)
1501 description = change_description.description
1502
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001503 if not options.bypass_hooks:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001504 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001505 may_prompt=not options.force,
1506 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001507 parallel=options.parallel,
1508 upstream=base_branch,
1509 description=description,
1510 all_files=False)
1511 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001512
Aaron Gable13101a62018-02-09 13:20:41 -08001513 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001514 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001515 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001516 self._GitSetBranchConfigValue(
1517 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001518 # Run post upload hooks, if specified.
1519 if settings.GetRunPostUploadHook():
Edward Lemur75526302020-02-27 22:31:05 +00001520 self.RunPostUploadHook(options.verbose, base_branch, description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001521
1522 # Upload all dependencies if specified.
1523 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001524 print()
1525 print('--dependencies has been specified.')
1526 print('All dependent local branches will be re-uploaded.')
1527 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001528 # Remove the dependencies flag from args so that we do not end up in a
1529 # loop.
1530 orig_args.remove('--dependencies')
1531 ret = upload_branch_deps(self, orig_args)
1532 return ret
1533
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001534 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001535 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001536
1537 Issue must have been already uploaded and known.
1538 """
1539 assert new_state in _CQState.ALL_STATES
1540 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001541 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001542 vote_map = {
1543 _CQState.NONE: 0,
1544 _CQState.DRY_RUN: 1,
1545 _CQState.COMMIT: 2,
1546 }
1547 labels = {'Commit-Queue': vote_map[new_state]}
1548 notify = False if new_state == _CQState.DRY_RUN else None
1549 gerrit_util.SetReview(
1550 self._GetGerritHost(), self._GerritChangeIdentifier(),
1551 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001552 return 0
1553 except KeyboardInterrupt:
1554 raise
1555 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001556 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001557 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001558 ' * Your project has no CQ,\n'
1559 ' * You don\'t have permission to change the CQ state,\n'
1560 ' * There\'s a bug in this code (see stack trace below).\n'
1561 'Consider specifying which bots to trigger manually or asking your '
1562 'project owners for permissions or contacting Chrome Infra at:\n'
1563 'https://www.chromium.org/infra\n\n' %
1564 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001565 # Still raise exception so that stack trace is printed.
1566 raise
1567
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001568 def _GetGerritHost(self):
1569 # Lazy load of configs.
1570 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001571 if self._gerrit_host and '.' not in self._gerrit_host:
1572 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1573 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001574 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001575 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001576 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001577 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001578 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1579 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001580 return self._gerrit_host
1581
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001582 def _GetGitHost(self):
1583 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001584 remote_url = self.GetRemoteUrl()
1585 if not remote_url:
1586 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001587 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001588
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001589 def GetCodereviewServer(self):
1590 if not self._gerrit_server:
1591 # If we're on a branch then get the server potentially associated
1592 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001593 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001594 self._gerrit_server = self._GitGetBranchConfigValue(
1595 self.CodereviewServerConfigKey())
1596 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001597 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001598 if not self._gerrit_server:
1599 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1600 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001601 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001602 parts[0] = parts[0] + '-review'
1603 self._gerrit_host = '.'.join(parts)
1604 self._gerrit_server = 'https://%s' % self._gerrit_host
1605 return self._gerrit_server
1606
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001607 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001608 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001609 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001610 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001611 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001612 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001613 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001614 if project.endswith('.git'):
1615 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001616 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1617 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1618 # gitiles/git-over-https protocol. E.g.,
1619 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1620 # as
1621 # https://chromium.googlesource.com/v8/v8
1622 if project.startswith('a/'):
1623 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001624 return project
1625
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001626 def _GerritChangeIdentifier(self):
1627 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1628
1629 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001630 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001631 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001632 project = self._GetGerritProject()
1633 if project:
1634 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1635 # Fall back on still unique, but less efficient change number.
1636 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001637
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001638 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001639 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001640 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001641
tandrii5d48c322016-08-18 16:19:37 -07001642 @classmethod
1643 def PatchsetConfigKey(cls):
1644 return 'gerritpatchset'
1645
1646 @classmethod
1647 def CodereviewServerConfigKey(cls):
1648 return 'gerritserver'
1649
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001650 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001651 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001652 if settings.GetGerritSkipEnsureAuthenticated():
1653 # For projects with unusual authentication schemes.
1654 # See http://crbug.com/603378.
1655 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001656
1657 # Check presence of cookies only if using cookies-based auth method.
1658 cookie_auth = gerrit_util.Authenticator.get()
1659 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001660 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001661
Florian Mayerae510e82020-01-30 21:04:48 +00001662 remote_url = self.GetRemoteUrl()
1663 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001664 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001665 return
1666 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001667 logging.warning('Ignoring branch %(branch)s with non-https remote '
1668 '%(remote)s', {
1669 'branch': self.branch,
1670 'remote': self.GetRemoteUrl()
1671 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001672 return
1673
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001674 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001675 self.GetCodereviewServer()
1676 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001677 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001678
1679 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1680 git_auth = cookie_auth.get_auth_header(git_host)
1681 if gerrit_auth and git_auth:
1682 if gerrit_auth == git_auth:
1683 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001684 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001685 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001686 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001687 ' %s\n'
1688 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001689 ' Consider running the following command:\n'
1690 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001691 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001692 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001693 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001694 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001695 cookie_auth.get_new_password_message(git_host)))
1696 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001697 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001698 return
1699 else:
1700 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001701 ([] if gerrit_auth else [self._gerrit_host]) +
1702 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001703 DieWithError('Credentials for the following hosts are required:\n'
1704 ' %s\n'
1705 'These are read from %s (or legacy %s)\n'
1706 '%s' % (
1707 '\n '.join(missing),
1708 cookie_auth.get_gitcookies_path(),
1709 cookie_auth.get_netrc_path(),
1710 cookie_auth.get_new_password_message(git_host)))
1711
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001712 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001713 if not self.GetIssue():
1714 return
1715
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001716 status = self._GetChangeDetail()['status']
1717 if status in ('MERGED', 'ABANDONED'):
1718 DieWithError('Change %s has been %s, new uploads are not allowed' %
1719 (self.GetIssueURL(),
1720 'submitted' if status == 'MERGED' else 'abandoned'))
1721
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001722 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1723 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1724 # Apparently this check is not very important? Otherwise get_auth_email
1725 # could have been added to other implementations of Authenticator.
1726 cookies_auth = gerrit_util.Authenticator.get()
1727 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001728 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001729
1730 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001731 if self.GetIssueOwner() == cookies_user:
1732 return
1733 logging.debug('change %s owner is %s, cookies user is %s',
1734 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001735 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001736 # so ask what Gerrit thinks of this user.
1737 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1738 if details['email'] == self.GetIssueOwner():
1739 return
1740 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001741 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001742 'as %s.\n'
1743 'Uploading may fail due to lack of permissions.' %
1744 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1745 confirm_or_exit(action='upload')
1746
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001747 def _PostUnsetIssueProperties(self):
1748 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001749 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001750
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001751 def GetGerritObjForPresubmit(self):
1752 return presubmit_support.GerritAccessor(self._GetGerritHost())
1753
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001754 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001755 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001756 or CQ status, assuming adherence to a common workflow.
1757
1758 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001759 * 'error' - error from review tool (including deleted issues)
1760 * 'unsent' - no reviewers added
1761 * 'waiting' - waiting for review
1762 * 'reply' - waiting for uploader to reply to review
1763 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001764 * 'dry-run' - dry-running in the CQ
1765 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001766 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001767 """
1768 if not self.GetIssue():
1769 return None
1770
1771 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001772 data = self._GetChangeDetail([
1773 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001774 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001775 return 'error'
1776
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001777 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001778 return 'closed'
1779
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001780 cq_label = data['labels'].get('Commit-Queue', {})
1781 max_cq_vote = 0
1782 for vote in cq_label.get('all', []):
1783 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1784 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001785 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001786 if max_cq_vote == 1:
1787 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001788
Aaron Gable9ab38c62017-04-06 14:36:33 -07001789 if data['labels'].get('Code-Review', {}).get('approved'):
1790 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001791
1792 if not data.get('reviewers', {}).get('REVIEWER', []):
1793 return 'unsent'
1794
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001795 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001796 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001797 last_message_author = messages.pop().get('author', {})
1798 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001799 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1800 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001801 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001802 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001803 if last_message_author.get('_account_id') == owner:
1804 # Most recent message was by owner.
1805 return 'waiting'
1806 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001807 # Some reply from non-owner.
1808 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001809
1810 # Somehow there are no messages even though there are reviewers.
1811 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001812
1813 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001814 if not self.GetIssue():
1815 return None
1816
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001817 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001818 patchset = data['revisions'][data['current_revision']]['_number']
1819 self.SetPatchset(patchset)
1820 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001821
Aaron Gable636b13f2017-07-14 10:42:48 -07001822 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001823 gerrit_util.SetReview(
1824 self._GetGerritHost(), self._GerritChangeIdentifier(),
1825 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001826
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001827 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001828 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001829 # CURRENT_REVISION is included to get the latest patchset so that
1830 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001831 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001832 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1833 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001834 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001835 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001836 robot_file_comments = gerrit_util.GetChangeRobotComments(
1837 self._GetGerritHost(), self._GerritChangeIdentifier())
1838
1839 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001840 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001841 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001842 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001843 line_comments = file_comments.setdefault(path, [])
1844 line_comments.extend(
1845 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001846
1847 # Build dictionary of file comments for easy access and sorting later.
1848 # {author+date: {path: {patchset: {line: url+message}}}}
1849 comments = collections.defaultdict(
1850 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001851 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001852 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001853 tag = comment.get('tag', '')
1854 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001855 continue
1856 key = (comment['author']['email'], comment['updated'])
1857 if comment.get('side', 'REVISION') == 'PARENT':
1858 patchset = 'Base'
1859 else:
1860 patchset = 'PS%d' % comment['patch_set']
1861 line = comment.get('line', 0)
1862 url = ('https://%s/c/%s/%s/%s#%s%s' %
1863 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1864 'b' if comment.get('side') == 'PARENT' else '',
1865 str(line) if line else ''))
1866 comments[key][path][patchset][line] = (url, comment['message'])
1867
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001868 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001869 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001870 summary = self._BuildCommentSummary(msg, comments, readable)
1871 if summary:
1872 summaries.append(summary)
1873 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001874
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001875 @staticmethod
1876 def _BuildCommentSummary(msg, comments, readable):
1877 key = (msg['author']['email'], msg['date'])
1878 # Don't bother showing autogenerated messages that don't have associated
1879 # file or line comments. this will filter out most autogenerated
1880 # messages, but will keep robot comments like those from Tricium.
1881 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1882 if is_autogenerated and not comments.get(key):
1883 return None
1884 message = msg['message']
1885 # Gerrit spits out nanoseconds.
1886 assert len(msg['date'].split('.')[-1]) == 9
1887 date = datetime.datetime.strptime(msg['date'][:-3],
1888 '%Y-%m-%d %H:%M:%S.%f')
1889 if key in comments:
1890 message += '\n'
1891 for path, patchsets in sorted(comments.get(key, {}).items()):
1892 if readable:
1893 message += '\n%s' % path
1894 for patchset, lines in sorted(patchsets.items()):
1895 for line, (url, content) in sorted(lines.items()):
1896 if line:
1897 line_str = 'Line %d' % line
1898 path_str = '%s:%d:' % (path, line)
1899 else:
1900 line_str = 'File comment'
1901 path_str = '%s:0:' % path
1902 if readable:
1903 message += '\n %s, %s: %s' % (patchset, line_str, url)
1904 message += '\n %s\n' % content
1905 else:
1906 message += '\n%s ' % path_str
1907 message += '\n%s\n' % content
1908
1909 return _CommentSummary(
1910 date=date,
1911 message=message,
1912 sender=msg['author']['email'],
1913 autogenerated=is_autogenerated,
1914 # These could be inferred from the text messages and correlated with
1915 # Code-Review label maximum, however this is not reliable.
1916 # Leaving as is until the need arises.
1917 approval=False,
1918 disapproval=False,
1919 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001920
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001921 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001922 gerrit_util.AbandonChange(
1923 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001924
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001925 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001926 gerrit_util.SubmitChange(
1927 self._GetGerritHost(), self._GerritChangeIdentifier(),
1928 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001929
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001930 def _GetChangeDetail(self, options=None):
1931 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001932 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001933 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001934
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001935 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001936 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001937 options.append('CURRENT_COMMIT')
1938
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001939 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001940 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001941 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001942
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001943 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1944 # Assumption: data fetched before with extra options is suitable
1945 # for return for a smaller set of options.
1946 # For example, if we cached data for
1947 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1948 # and request is for options=[CURRENT_REVISION],
1949 # THEN we can return prior cached data.
1950 if options_set.issubset(cached_options_set):
1951 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001952
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001953 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001954 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001955 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001956 except gerrit_util.GerritError as e:
1957 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001958 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001959 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001960
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001961 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001962 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001963
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001964 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001965 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001966 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001967 data = gerrit_util.GetChangeCommit(
1968 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001969 except gerrit_util.GerritError as e:
1970 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001971 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001972 raise
agable32978d92016-11-01 12:55:02 -07001973 return data
1974
Karen Qian40c19422019-03-13 21:28:29 +00001975 def _IsCqConfigured(self):
1976 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001977 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001978
Olivier Robin75ee7252018-04-13 10:02:56 +02001979 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001980 if git_common.is_dirty_git_tree('land'):
1981 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001982
tandriid60367b2016-06-22 05:25:12 -07001983 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001984 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001985 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001986 'which can test and land changes for you. '
1987 'Are you sure you wish to bypass it?\n',
1988 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001989 differs = True
tandriic4344b52016-08-29 06:04:54 -07001990 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001991 # Note: git diff outputs nothing if there is no diff.
1992 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001993 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001994 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001995 if detail['current_revision'] == last_upload:
1996 differs = False
1997 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001998 print('WARNING: Local branch contents differ from latest uploaded '
1999 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002000 if differs:
2001 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002002 confirm_or_exit(
2003 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2004 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002005 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002006 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002007 upstream = self.GetCommonAncestorWithUpstream()
2008 if self.GetIssue():
2009 description = self.FetchDescription()
2010 else:
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00002011 description = self.GetLocalDescription(upstream)
Edward Lemur227d5102020-02-25 23:45:35 +00002012 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002013 committing=True,
2014 may_prompt=not force,
2015 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002016 parallel=parallel,
2017 upstream=upstream,
2018 description=description,
2019 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002020
2021 self.SubmitIssue(wait_for_merge=True)
2022 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002023 links = self._GetChangeCommit().get('web_links', [])
2024 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002025 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002026 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002027 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002028 return 0
2029
Edward Lemurf38bc172019-09-03 21:02:13 +00002030 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002031 assert parsed_issue_arg.valid
2032
Edward Lemur125d60a2019-09-13 18:25:41 +00002033 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002034
2035 if parsed_issue_arg.hostname:
2036 self._gerrit_host = parsed_issue_arg.hostname
2037 self._gerrit_server = 'https://%s' % self._gerrit_host
2038
tandriic2405f52016-10-10 08:13:15 -07002039 try:
2040 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002041 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002042 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002043
2044 if not parsed_issue_arg.patchset:
2045 # Use current revision by default.
2046 revision_info = detail['revisions'][detail['current_revision']]
2047 patchset = int(revision_info['_number'])
2048 else:
2049 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002050 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002051 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2052 break
2053 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002054 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002055 (parsed_issue_arg.patchset, self.GetIssue()))
2056
Edward Lemur125d60a2019-09-13 18:25:41 +00002057 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002058 if remote_url.endswith('.git'):
2059 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002060 remote_url = remote_url.rstrip('/')
2061
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002062 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002063 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002064
2065 if remote_url != fetch_info['url']:
2066 DieWithError('Trying to patch a change from %s but this repo appears '
2067 'to be %s.' % (fetch_info['url'], remote_url))
2068
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002069 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002070
Aaron Gable62619a32017-06-16 08:22:09 -07002071 if force:
2072 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2073 print('Checked out commit for change %i patchset %i locally' %
2074 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002075 elif nocommit:
2076 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2077 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002078 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002079 RunGit(['cherry-pick', 'FETCH_HEAD'])
2080 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002081 (parsed_issue_arg.issue, patchset))
2082 print('Note: this created a local commit which does not have '
2083 'the same hash as the one uploaded for review. This will make '
2084 'uploading changes based on top of this branch difficult.\n'
2085 'If you want to do that, use "git cl patch --force" instead.')
2086
Stefan Zagerd08043c2017-10-12 12:07:02 -07002087 if self.GetBranch():
2088 self.SetIssue(parsed_issue_arg.issue)
2089 self.SetPatchset(patchset)
2090 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2091 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2092 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2093 else:
2094 print('WARNING: You are in detached HEAD state.\n'
2095 'The patch has been applied to your checkout, but you will not be '
2096 'able to upload a new patch set to the gerrit issue.\n'
2097 'Try using the \'-b\' option if you would like to work on a '
2098 'branch and/or upload a new patch set.')
2099
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002100 return 0
2101
tandrii16e0b4e2016-06-07 10:34:28 -07002102 def _GerritCommitMsgHookCheck(self, offer_removal):
2103 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2104 if not os.path.exists(hook):
2105 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002106 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2107 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002108 data = gclient_utils.FileRead(hook)
2109 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2110 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002111 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002112 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002113 'and may interfere with it in subtle ways.\n'
2114 'We recommend you remove the commit-msg hook.')
2115 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002116 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002117 gclient_utils.rm_file_or_tree(hook)
2118 print('Gerrit commit-msg hook removed.')
2119 else:
2120 print('OK, will keep Gerrit commit-msg hook in place.')
2121
Edward Lemur1b52d872019-05-09 21:12:12 +00002122 def _CleanUpOldTraces(self):
2123 """Keep only the last |MAX_TRACES| traces."""
2124 try:
2125 traces = sorted([
2126 os.path.join(TRACES_DIR, f)
2127 for f in os.listdir(TRACES_DIR)
2128 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2129 and not f.startswith('tmp'))
2130 ])
2131 traces_to_delete = traces[:-MAX_TRACES]
2132 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002133 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002134 except OSError:
2135 print('WARNING: Failed to remove old git traces from\n'
2136 ' %s'
2137 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002138
Edward Lemur5737f022019-05-17 01:24:00 +00002139 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002140 """Zip and write the git push traces stored in traces_dir."""
2141 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002142 traces_zip = trace_name + '-traces'
2143 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002144 # Create a temporary dir to store git config and gitcookies in. It will be
2145 # compressed and stored next to the traces.
2146 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002147 git_info_zip = trace_name + '-git-info'
2148
Edward Lemur5737f022019-05-17 01:24:00 +00002149 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002150 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002151 git_push_metadata['now'] = git_push_metadata['now'].decode(
2152 sys.stdin.encoding)
2153
Edward Lemur1b52d872019-05-09 21:12:12 +00002154 git_push_metadata['trace_name'] = trace_name
2155 gclient_utils.FileWrite(
2156 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2157
2158 # Keep only the first 6 characters of the git hashes on the packet
2159 # trace. This greatly decreases size after compression.
2160 packet_traces = os.path.join(traces_dir, 'trace-packet')
2161 if os.path.isfile(packet_traces):
2162 contents = gclient_utils.FileRead(packet_traces)
2163 gclient_utils.FileWrite(
2164 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2165 shutil.make_archive(traces_zip, 'zip', traces_dir)
2166
2167 # Collect and compress the git config and gitcookies.
2168 git_config = RunGit(['config', '-l'])
2169 gclient_utils.FileWrite(
2170 os.path.join(git_info_dir, 'git-config'),
2171 git_config)
2172
2173 cookie_auth = gerrit_util.Authenticator.get()
2174 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2175 gitcookies_path = cookie_auth.get_gitcookies_path()
2176 if os.path.isfile(gitcookies_path):
2177 gitcookies = gclient_utils.FileRead(gitcookies_path)
2178 gclient_utils.FileWrite(
2179 os.path.join(git_info_dir, 'gitcookies'),
2180 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2181 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2182
Edward Lemur1b52d872019-05-09 21:12:12 +00002183 gclient_utils.rmtree(git_info_dir)
2184
2185 def _RunGitPushWithTraces(
2186 self, change_desc, refspec, refspec_opts, git_push_metadata):
2187 """Run git push and collect the traces resulting from the execution."""
2188 # Create a temporary directory to store traces in. Traces will be compressed
2189 # and stored in a 'traces' dir inside depot_tools.
2190 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002191 trace_name = os.path.join(
2192 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002193
2194 env = os.environ.copy()
2195 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2196 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002197 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002198 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2199 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2200 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2201
2202 try:
2203 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002204 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002205 before_push = time_time()
2206 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002207 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002208 env=env,
2209 print_stdout=True,
2210 # Flush after every line: useful for seeing progress when running as
2211 # recipe.
2212 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002213 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002214 except subprocess2.CalledProcessError as e:
2215 push_returncode = e.returncode
2216 DieWithError('Failed to create a change. Please examine output above '
2217 'for the reason of the failure.\n'
2218 'Hint: run command below to diagnose common Git/Gerrit '
2219 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002220 ' git cl creds-check\n'
2221 '\n'
2222 'If git-cl is not working correctly, file a bug under the '
2223 'Infra>SDK component including the files below.\n'
2224 'Review the files before upload, since they might contain '
2225 'sensitive information.\n'
2226 'Set the Restrict-View-Google label so that they are not '
2227 'publicly accessible.\n'
2228 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002229 change_desc)
2230 finally:
2231 execution_time = time_time() - before_push
2232 metrics.collector.add_repeated('sub_commands', {
2233 'command': 'git push',
2234 'execution_time': execution_time,
2235 'exit_code': push_returncode,
2236 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2237 })
2238
Edward Lemur1b52d872019-05-09 21:12:12 +00002239 git_push_metadata['execution_time'] = execution_time
2240 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002241 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002242
Edward Lemur1b52d872019-05-09 21:12:12 +00002243 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002244 gclient_utils.rmtree(traces_dir)
2245
2246 return push_stdout
2247
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002248 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002249 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002250 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002251 # Load default for user, repo, squash=true, in this order.
2252 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002253
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002254 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002255 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002256 # This may be None; default fallback value is determined in logic below.
2257 title = options.title
2258
Dominic Battre7d1c4842017-10-27 09:17:28 +02002259 # Extract bug number from branch name.
2260 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002261 fixed = options.fixed
2262 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2263 self.GetBranch())
2264 if not bug and not fixed and match:
2265 if match.group('type') == 'bug':
2266 bug = match.group('bugnum')
2267 else:
2268 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002269
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002270 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002271 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002272 if self.GetIssue():
2273 # Try to get the message from a previous upload.
Edward Lemur6c6827c2020-02-06 21:15:18 +00002274 message = self.FetchDescription()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002275 if not message:
2276 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002277 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002278 '%s' % (self.GetIssue(), self.GetIssueURL()))
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()
2337 if options.message:
2338 message = options.message
2339 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002340 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002341 if options.title:
2342 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002343 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002344 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002345 change_desc.prompt()
2346
Aaron Gableb56ad332017-01-06 15:24:31 -08002347 # On first upload, patchset title is always this string, while
2348 # --title flag gets converted to first line of message.
2349 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002350 if not change_desc.description:
2351 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002352 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002353 if len(change_ids) > 1:
2354 DieWithError('too many Change-Id footers, at most 1 allowed.')
2355 if not change_ids:
2356 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002357 change_desc.set_description(git_footers.add_footer_change_id(
2358 change_desc.description,
2359 GenerateGerritChangeId(change_desc.description)))
2360 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002361 assert len(change_ids) == 1
2362 change_id = change_ids[0]
2363
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002364 if options.reviewers or options.tbrs or options.add_owners_to:
2365 change_desc.update_reviewers(options.reviewers, options.tbrs,
2366 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002367 if options.preserve_tryjobs:
2368 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002369
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002370 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002371 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2372 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002373 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002374 with gclient_utils.temporary_file() as desc_tempfile:
2375 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2376 ref_to_push = RunGit(
2377 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002378 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002380 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002381 if not change_desc.description:
2382 DieWithError("Description is empty. Aborting...")
2383
2384 if not git_footers.get_footer_change_id(change_desc.description):
2385 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002386 change_desc.set_description(
2387 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002388 if options.reviewers or options.tbrs or options.add_owners_to:
2389 change_desc.update_reviewers(options.reviewers, options.tbrs,
2390 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002391 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002392 # For no-squash mode, we assume the remote called "origin" is the one we
2393 # want. It is not worthwhile to support different workflows for
2394 # no-squash mode.
2395 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002396 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2397
2398 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002399 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002400 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2401 ref_to_push)]).splitlines()
2402 if len(commits) > 1:
2403 print('WARNING: This will upload %d commits. Run the following command '
2404 'to see which commits will be uploaded: ' % len(commits))
2405 print('git log %s..%s' % (parent, ref_to_push))
2406 print('You can also use `git squash-branch` to squash these into a '
2407 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002408 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002410 if options.reviewers or options.tbrs or options.add_owners_to:
2411 change_desc.update_reviewers(options.reviewers, options.tbrs,
2412 options.add_owners_to, change)
2413
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002414 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002415 cc = []
2416 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2417 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2418 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002419 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002420 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002421 if options.cc:
2422 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002423 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002424 if change_desc.get_cced():
2425 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002426 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2427 valid_accounts = set(reviewers + cc)
2428 # TODO(crbug/877717): relax this for all hosts.
2429 else:
2430 valid_accounts = gerrit_util.ValidAccounts(
2431 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002432 logging.info('accounts %s are recognized, %s invalid',
2433 sorted(valid_accounts),
2434 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002435
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002436 # Extra options that can be specified at push time. Doc:
2437 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002438 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002439
Aaron Gable844cf292017-06-28 11:32:59 -07002440 # By default, new changes are started in WIP mode, and subsequent patchsets
2441 # don't send email. At any time, passing --send-mail will mark the change
2442 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002443 if options.send_mail:
2444 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002445 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002446 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002447 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002448 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002449 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002450
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002451 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002452 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002453
Aaron Gable9b713dd2016-12-14 16:04:21 -08002454 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002455 # Punctuation and whitespace in |title| must be percent-encoded.
2456 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002457
agablec6787972016-09-09 16:13:34 -07002458 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002459 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002460
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002461 for r in sorted(reviewers):
2462 if r in valid_accounts:
2463 refspec_opts.append('r=%s' % r)
2464 reviewers.remove(r)
2465 else:
2466 # TODO(tandrii): this should probably be a hard failure.
2467 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2468 % r)
2469 for c in sorted(cc):
2470 # refspec option will be rejected if cc doesn't correspond to an
2471 # account, even though REST call to add such arbitrary cc may succeed.
2472 if c in valid_accounts:
2473 refspec_opts.append('cc=%s' % c)
2474 cc.remove(c)
2475
rmistry9eadede2016-09-19 11:22:43 -07002476 if options.topic:
2477 # Documentation on Gerrit topics is here:
2478 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002479 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002480
Edward Lemur687ca902018-12-05 02:30:30 +00002481 if options.enable_auto_submit:
2482 refspec_opts.append('l=Auto-Submit+1')
2483 if options.use_commit_queue:
2484 refspec_opts.append('l=Commit-Queue+2')
2485 elif options.cq_dry_run:
2486 refspec_opts.append('l=Commit-Queue+1')
2487
2488 if change_desc.get_reviewers(tbr_only=True):
2489 score = gerrit_util.GetCodeReviewTbrScore(
2490 self._GetGerritHost(),
2491 self._GetGerritProject())
2492 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002493
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002494 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002495 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002496 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002497 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002498 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2499
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002500 refspec_suffix = ''
2501 if refspec_opts:
2502 refspec_suffix = '%' + ','.join(refspec_opts)
2503 assert ' ' not in refspec_suffix, (
2504 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2505 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2506
Edward Lemur1b52d872019-05-09 21:12:12 +00002507 git_push_metadata = {
2508 'gerrit_host': self._GetGerritHost(),
2509 'title': title or '<untitled>',
2510 'change_id': change_id,
2511 'description': change_desc.description,
2512 }
2513 push_stdout = self._RunGitPushWithTraces(
2514 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002515
2516 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002517 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002518 change_numbers = [m.group(1)
2519 for m in map(regex.match, push_stdout.splitlines())
2520 if m]
2521 if len(change_numbers) != 1:
2522 DieWithError(
2523 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002524 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002525 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002526 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002527
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002528 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002529 # GetIssue() is not set in case of non-squash uploads according to tests.
2530 # TODO(agable): non-squash uploads in git cl should be removed.
2531 gerrit_util.AddReviewers(
2532 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002533 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002534 reviewers, cc,
2535 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002536
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002537 return 0
2538
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002539 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2540 change_desc):
2541 """Computes parent of the generated commit to be uploaded to Gerrit.
2542
2543 Returns revision or a ref name.
2544 """
2545 if custom_cl_base:
2546 # Try to avoid creating additional unintended CLs when uploading, unless
2547 # user wants to take this risk.
2548 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2549 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2550 local_ref_of_target_remote])
2551 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002552 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002553 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2554 'If you proceed with upload, more than 1 CL may be created by '
2555 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2556 'If you are certain that specified base `%s` has already been '
2557 'uploaded to Gerrit as another CL, you may proceed.\n' %
2558 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2559 if not force:
2560 confirm_or_exit(
2561 'Do you take responsibility for cleaning up potential mess '
2562 'resulting from proceeding with upload?',
2563 action='upload')
2564 return custom_cl_base
2565
Aaron Gablef97e33d2017-03-30 15:44:27 -07002566 if remote != '.':
2567 return self.GetCommonAncestorWithUpstream()
2568
2569 # If our upstream branch is local, we base our squashed commit on its
2570 # squashed version.
2571 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2572
Aaron Gablef97e33d2017-03-30 15:44:27 -07002573 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002574 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002575
2576 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002577 # TODO(tandrii): consider checking parent change in Gerrit and using its
2578 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2579 # the tree hash of the parent branch. The upside is less likely bogus
2580 # requests to reupload parent change just because it's uploadhash is
2581 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002582 parent = RunGit(['config',
2583 'branch.%s.gerritsquashhash' % upstream_branch_name],
2584 error_ok=True).strip()
2585 # Verify that the upstream branch has been uploaded too, otherwise
2586 # Gerrit will create additional CLs when uploading.
2587 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2588 RunGitSilent(['rev-parse', parent + ':'])):
2589 DieWithError(
2590 '\nUpload upstream branch %s first.\n'
2591 'It is likely that this branch has been rebased since its last '
2592 'upload, so you just need to upload it again.\n'
2593 '(If you uploaded it with --no-squash, then branch dependencies '
2594 'are not supported, and you should reupload with --squash.)'
2595 % upstream_branch_name,
2596 change_desc)
2597 return parent
2598
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002599 def _AddChangeIdToCommitMessage(self, options, args):
2600 """Re-commits using the current message, assumes the commit hook is in
2601 place.
2602 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002603 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002604 git_command = ['commit', '--amend', '-m', log_desc]
2605 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002606 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002607 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002608 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002609 return new_log_desc
2610 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002611 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002612
tandriie113dfd2016-10-11 10:20:12 -07002613 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002614 try:
2615 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002616 except GerritChangeNotExists:
2617 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002618
2619 if data['status'] in ('ABANDONED', 'MERGED'):
2620 return 'CL %s is closed' % self.GetIssue()
2621
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002622 def GetGerritChange(self, patchset=None):
2623 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002624 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002625 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002626 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002627 data = self._GetChangeDetail(['ALL_REVISIONS'])
2628
2629 assert host and issue and patchset, 'CL must be uploaded first'
2630
2631 has_patchset = any(
2632 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002633 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002634 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002635 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002636 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002637
tandrii8c5a3532016-11-04 07:52:02 -07002638 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002639 'host': host,
2640 'change': issue,
2641 'project': data['project'],
2642 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002643 }
tandriie113dfd2016-10-11 10:20:12 -07002644
tandriide281ae2016-10-12 06:02:30 -07002645 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002646 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002647
Edward Lemur707d70b2018-02-07 00:50:14 +01002648 def GetReviewers(self):
2649 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002650 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002651
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002652
tandriif9aefb72016-07-01 09:06:51 -07002653def _get_bug_line_values(default_project, bugs):
2654 """Given default_project and comma separated list of bugs, yields bug line
2655 values.
2656
2657 Each bug can be either:
2658 * a number, which is combined with default_project
2659 * string, which is left as is.
2660
2661 This function may produce more than one line, because bugdroid expects one
2662 project per line.
2663
2664 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2665 ['v8:123', 'chromium:789']
2666 """
2667 default_bugs = []
2668 others = []
2669 for bug in bugs.split(','):
2670 bug = bug.strip()
2671 if bug:
2672 try:
2673 default_bugs.append(int(bug))
2674 except ValueError:
2675 others.append(bug)
2676
2677 if default_bugs:
2678 default_bugs = ','.join(map(str, default_bugs))
2679 if default_project:
2680 yield '%s:%s' % (default_project, default_bugs)
2681 else:
2682 yield default_bugs
2683 for other in sorted(others):
2684 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2685 yield other
2686
2687
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002688class ChangeDescription(object):
2689 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002690 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002691 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002692 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002693 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002694 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002695 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2696 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002697 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002698 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002699
Dan Beamd8b04ca2019-10-10 21:23:26 +00002700 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002701 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002702 if bug:
2703 regexp = re.compile(self.BUG_LINE)
2704 prefix = settings.GetBugPrefix()
2705 if not any((regexp.match(line) for line in self._description_lines)):
2706 values = list(_get_bug_line_values(prefix, bug))
2707 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002708 if fixed:
2709 regexp = re.compile(self.FIXED_LINE)
2710 prefix = settings.GetBugPrefix()
2711 if not any((regexp.match(line) for line in self._description_lines)):
2712 values = list(_get_bug_line_values(prefix, fixed))
2713 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002714
agable@chromium.org42c20792013-09-12 17:34:49 +00002715 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002716 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002717 return '\n'.join(self._description_lines)
2718
2719 def set_description(self, desc):
2720 if isinstance(desc, basestring):
2721 lines = desc.splitlines()
2722 else:
2723 lines = [line.rstrip() for line in desc]
2724 while lines and not lines[0]:
2725 lines.pop(0)
2726 while lines and not lines[-1]:
2727 lines.pop(-1)
2728 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002729
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002730 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2731 """Rewrites the R=/TBR= line(s) as a single line each.
2732
2733 Args:
2734 reviewers (list(str)) - list of additional emails to use for reviewers.
2735 tbrs (list(str)) - list of additional emails to use for TBRs.
2736 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2737 the change that are missing OWNER coverage. If this is not None, you
2738 must also pass a value for `change`.
2739 change (Change) - The Change that should be used for OWNERS lookups.
2740 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002741 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002742 assert isinstance(tbrs, list), tbrs
2743
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002744 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002745 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002746
2747 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002748 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002749
2750 reviewers = set(reviewers)
2751 tbrs = set(tbrs)
2752 LOOKUP = {
2753 'TBR': tbrs,
2754 'R': reviewers,
2755 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002756
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002757 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002758 regexp = re.compile(self.R_LINE)
2759 matches = [regexp.match(line) for line in self._description_lines]
2760 new_desc = [l for i, l in enumerate(self._description_lines)
2761 if not matches[i]]
2762 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002763
agable@chromium.org42c20792013-09-12 17:34:49 +00002764 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002765
2766 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002767 for match in matches:
2768 if not match:
2769 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002770 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2771
2772 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002773 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002774 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002775 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002776 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002777 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002778 LOOKUP[add_owners_to].update(
2779 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002780
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002781 # If any folks ended up in both groups, remove them from tbrs.
2782 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002783
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002784 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2785 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002786
2787 # Put the new lines in the description where the old first R= line was.
2788 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2789 if 0 <= line_loc < len(self._description_lines):
2790 if new_tbr_line:
2791 self._description_lines.insert(line_loc, new_tbr_line)
2792 if new_r_line:
2793 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002794 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002795 if new_r_line:
2796 self.append_footer(new_r_line)
2797 if new_tbr_line:
2798 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002799
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002800 def set_preserve_tryjobs(self):
2801 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2802 footers = git_footers.parse_footers(self.description)
2803 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2804 if v.lower() == 'true':
2805 return
2806 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2807
Anthony Polito8b955342019-09-24 19:01:36 +00002808 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002809 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002810 self.set_description([
2811 '# Enter a description of the change.',
2812 '# This will be displayed on the codereview site.',
2813 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002814 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002815 '--------------------',
2816 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002817 bug_regexp = re.compile(self.BUG_LINE)
2818 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002819 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002820 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2821 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002822 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002823
agable@chromium.org42c20792013-09-12 17:34:49 +00002824 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002825 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002826 if not content:
2827 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002828 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002829
Bruce Dawson2377b012018-01-11 16:46:49 -08002830 # Strip off comments and default inserted "Bug:" line.
2831 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002832 (line.startswith('#') or
2833 line.rstrip() == "Bug:" or
2834 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002835 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002836 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002837 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002838
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002839 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002840 """Adds a footer line to the description.
2841
2842 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2843 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2844 that Gerrit footers are always at the end.
2845 """
2846 parsed_footer_line = git_footers.parse_footer(line)
2847 if parsed_footer_line:
2848 # Line is a gerrit footer in the form: Footer-Key: any value.
2849 # Thus, must be appended observing Gerrit footer rules.
2850 self.set_description(
2851 git_footers.add_footer(self.description,
2852 key=parsed_footer_line[0],
2853 value=parsed_footer_line[1]))
2854 return
2855
2856 if not self._description_lines:
2857 self._description_lines.append(line)
2858 return
2859
2860 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2861 if gerrit_footers:
2862 # git_footers.split_footers ensures that there is an empty line before
2863 # actual (gerrit) footers, if any. We have to keep it that way.
2864 assert top_lines and top_lines[-1] == ''
2865 top_lines, separator = top_lines[:-1], top_lines[-1:]
2866 else:
2867 separator = [] # No need for separator if there are no gerrit_footers.
2868
2869 prev_line = top_lines[-1] if top_lines else ''
2870 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2871 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2872 top_lines.append('')
2873 top_lines.append(line)
2874 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002875
tandrii99a72f22016-08-17 14:33:24 -07002876 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002877 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002878 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002879 reviewers = [match.group(2).strip()
2880 for match in matches
2881 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002882 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002883
bradnelsond975b302016-10-23 12:20:23 -07002884 def get_cced(self):
2885 """Retrieves the list of reviewers."""
2886 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2887 cced = [match.group(2).strip() for match in matches if match]
2888 return cleanup_list(cced)
2889
Nodir Turakulov23b82142017-11-16 11:04:25 -08002890 def get_hash_tags(self):
2891 """Extracts and sanitizes a list of Gerrit hashtags."""
2892 subject = (self._description_lines or ('',))[0]
2893 subject = re.sub(
2894 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2895
2896 tags = []
2897 start = 0
2898 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2899 while True:
2900 m = bracket_exp.match(subject, start)
2901 if not m:
2902 break
2903 tags.append(self.sanitize_hash_tag(m.group(1)))
2904 start = m.end()
2905
2906 if not tags:
2907 # Try "Tag: " prefix.
2908 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2909 if m:
2910 tags.append(self.sanitize_hash_tag(m.group(1)))
2911 return tags
2912
2913 @classmethod
2914 def sanitize_hash_tag(cls, tag):
2915 """Returns a sanitized Gerrit hash tag.
2916
2917 A sanitized hashtag can be used as a git push refspec parameter value.
2918 """
2919 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2920
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002921 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2922 """Updates this commit description given the parent.
2923
2924 This is essentially what Gnumbd used to do.
2925 Consult https://goo.gl/WMmpDe for more details.
2926 """
2927 assert parent_msg # No, orphan branch creation isn't supported.
2928 assert parent_hash
2929 assert dest_ref
2930 parent_footer_map = git_footers.parse_footers(parent_msg)
2931 # This will also happily parse svn-position, which GnumbD is no longer
2932 # supporting. While we'd generate correct footers, the verifier plugin
2933 # installed in Gerrit will block such commit (ie git push below will fail).
2934 parent_position = git_footers.get_position(parent_footer_map)
2935
2936 # Cherry-picks may have last line obscuring their prior footers,
2937 # from git_footers perspective. This is also what Gnumbd did.
2938 cp_line = None
2939 if (self._description_lines and
2940 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2941 cp_line = self._description_lines.pop()
2942
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002943 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002944
2945 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2946 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002947 for i, line in enumerate(footer_lines):
2948 k, v = git_footers.parse_footer(line) or (None, None)
2949 if k and k.startswith('Cr-'):
2950 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002951
2952 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002953 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002954 if parent_position[0] == dest_ref:
2955 # Same branch as parent.
2956 number = int(parent_position[1]) + 1
2957 else:
2958 number = 1 # New branch, and extra lineage.
2959 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2960 int(parent_position[1])))
2961
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002962 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2963 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002964
2965 self._description_lines = top_lines
2966 if cp_line:
2967 self._description_lines.append(cp_line)
2968 if self._description_lines[-1] != '':
2969 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002970 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002971
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002972
Aaron Gablea1bab272017-04-11 16:38:18 -07002973def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002974 """Retrieves the reviewers that approved a CL from the issue properties with
2975 messages.
2976
2977 Note that the list may contain reviewers that are not committer, thus are not
2978 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002979
2980 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002981 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002982 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002983 return sorted(
2984 set(
2985 message['sender']
2986 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07002987 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002988 )
2989 )
2990
2991
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002992def FindCodereviewSettingsFile(filename='codereview.settings'):
2993 """Finds the given file starting in the cwd and going up.
2994
2995 Only looks up to the top of the repository unless an
2996 'inherit-review-settings-ok' file exists in the root of the repository.
2997 """
2998 inherit_ok_file = 'inherit-review-settings-ok'
2999 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003000 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003001 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3002 root = '/'
3003 while True:
3004 if filename in os.listdir(cwd):
3005 if os.path.isfile(os.path.join(cwd, filename)):
3006 return open(os.path.join(cwd, filename))
3007 if cwd == root:
3008 break
3009 cwd = os.path.dirname(cwd)
3010
3011
3012def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003013 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003014 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003015
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003016 def SetProperty(name, setting, unset_error_ok=False):
3017 fullname = 'rietveld.' + name
3018 if setting in keyvals:
3019 RunGit(['config', fullname, keyvals[setting]])
3020 else:
3021 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3022
tandrii48df5812016-10-17 03:55:37 -07003023 if not keyvals.get('GERRIT_HOST', False):
3024 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003025 # Only server setting is required. Other settings can be absent.
3026 # In that case, we ignore errors raised during option deletion attempt.
3027 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3028 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3029 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003030 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003031 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3032 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003033 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3034 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003035 SetProperty(
3036 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003037
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003038 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003039 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003040
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003041 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003042 RunGit(['config', 'gerrit.squash-uploads',
3043 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003044
tandrii@chromium.org28253532016-04-14 13:46:56 +00003045 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003046 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003047 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3048
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003049 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003050 # should be of the form
3051 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3052 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003053 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3054 keyvals['ORIGIN_URL_CONFIG']])
3055
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003056
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003057def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003058 """Downloads a network object to a local file, like urllib.urlretrieve.
3059
3060 This is necessary because urllib is broken for SSL connections via a proxy.
3061 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003062 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003063 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003064
3065
ukai@chromium.org712d6102013-11-27 00:52:58 +00003066def hasSheBang(fname):
3067 """Checks fname is a #! script."""
3068 with open(fname) as f:
3069 return f.read(2).startswith('#!')
3070
3071
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003072# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3073def DownloadHooks(*args, **kwargs):
3074 pass
3075
3076
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003077def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003078 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003079
3080 Args:
3081 force: True to update hooks. False to install hooks if not present.
3082 """
3083 if not settings.GetIsGerrit():
3084 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003085 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003086 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3087 if not os.access(dst, os.X_OK):
3088 if os.path.exists(dst):
3089 if not force:
3090 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003091 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003092 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003093 if not hasSheBang(dst):
3094 DieWithError('Not a script: %s\n'
3095 'You need to download from\n%s\n'
3096 'into .git/hooks/commit-msg and '
3097 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003098 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3099 except Exception:
3100 if os.path.exists(dst):
3101 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003102 DieWithError('\nFailed to download hooks.\n'
3103 'You need to download from\n%s\n'
3104 'into .git/hooks/commit-msg and '
3105 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003106
3107
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003108class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003109 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003110
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003111 _GOOGLESOURCE = 'googlesource.com'
3112
3113 def __init__(self):
3114 # Cached list of [host, identity, source], where source is either
3115 # .gitcookies or .netrc.
3116 self._all_hosts = None
3117
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003118 def ensure_configured_gitcookies(self):
3119 """Runs checks and suggests fixes to make git use .gitcookies from default
3120 path."""
3121 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3122 configured_path = RunGitSilent(
3123 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003124 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003125 if configured_path:
3126 self._ensure_default_gitcookies_path(configured_path, default)
3127 else:
3128 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003129
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003130 @staticmethod
3131 def _ensure_default_gitcookies_path(configured_path, default_path):
3132 assert configured_path
3133 if configured_path == default_path:
3134 print('git is already configured to use your .gitcookies from %s' %
3135 configured_path)
3136 return
3137
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003138 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003139 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3140 (configured_path, default_path))
3141
3142 if not os.path.exists(configured_path):
3143 print('However, your configured .gitcookies file is missing.')
3144 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3145 action='reconfigure')
3146 RunGit(['config', '--global', 'http.cookiefile', default_path])
3147 return
3148
3149 if os.path.exists(default_path):
3150 print('WARNING: default .gitcookies file already exists %s' %
3151 default_path)
3152 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3153 default_path)
3154
3155 confirm_or_exit('Move existing .gitcookies to default location?',
3156 action='move')
3157 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003158 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003159 print('Moved and reconfigured git to use .gitcookies from %s' %
3160 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003161
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003162 @staticmethod
3163 def _configure_gitcookies_path(default_path):
3164 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3165 if os.path.exists(netrc_path):
3166 print('You seem to be using outdated .netrc for git credentials: %s' %
3167 netrc_path)
3168 print('This tool will guide you through setting up recommended '
3169 '.gitcookies store for git credentials.\n'
3170 '\n'
3171 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3172 ' git config --global --unset http.cookiefile\n'
3173 ' mv %s %s.backup\n\n' % (default_path, default_path))
3174 confirm_or_exit(action='setup .gitcookies')
3175 RunGit(['config', '--global', 'http.cookiefile', default_path])
3176 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003177
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003178 def get_hosts_with_creds(self, include_netrc=False):
3179 if self._all_hosts is None:
3180 a = gerrit_util.CookiesAuthenticator()
3181 self._all_hosts = [
3182 (h, u, s)
3183 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003184 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3185 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003186 )
3187 if h.endswith(self._GOOGLESOURCE)
3188 ]
3189
3190 if include_netrc:
3191 return self._all_hosts
3192 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3193
3194 def print_current_creds(self, include_netrc=False):
3195 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3196 if not hosts:
3197 print('No Git/Gerrit credentials found')
3198 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003199 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003200 header = [('Host', 'User', 'Which file'),
3201 ['=' * l for l in lengths]]
3202 for row in (header + hosts):
3203 print('\t'.join((('%%+%ds' % l) % s)
3204 for l, s in zip(lengths, row)))
3205
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003206 @staticmethod
3207 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003208 """Parses identity "git-<username>.domain" into <username> and domain."""
3209 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003210 # distinguishable from sub-domains. But we do know typical domains:
3211 if identity.endswith('.chromium.org'):
3212 domain = 'chromium.org'
3213 username = identity[:-len('.chromium.org')]
3214 else:
3215 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003216 if username.startswith('git-'):
3217 username = username[len('git-'):]
3218 return username, domain
3219
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003220 def _canonical_git_googlesource_host(self, host):
3221 """Normalizes Gerrit hosts (with '-review') to Git host."""
3222 assert host.endswith(self._GOOGLESOURCE)
3223 # Prefix doesn't include '.' at the end.
3224 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3225 if prefix.endswith('-review'):
3226 prefix = prefix[:-len('-review')]
3227 return prefix + '.' + self._GOOGLESOURCE
3228
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003229 def _canonical_gerrit_googlesource_host(self, host):
3230 git_host = self._canonical_git_googlesource_host(host)
3231 prefix = git_host.split('.', 1)[0]
3232 return prefix + '-review.' + self._GOOGLESOURCE
3233
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003234 def _get_counterpart_host(self, host):
3235 assert host.endswith(self._GOOGLESOURCE)
3236 git = self._canonical_git_googlesource_host(host)
3237 gerrit = self._canonical_gerrit_googlesource_host(git)
3238 return git if gerrit == host else gerrit
3239
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003240 def has_generic_host(self):
3241 """Returns whether generic .googlesource.com has been configured.
3242
3243 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3244 """
3245 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3246 if host == '.' + self._GOOGLESOURCE:
3247 return True
3248 return False
3249
3250 def _get_git_gerrit_identity_pairs(self):
3251 """Returns map from canonic host to pair of identities (Git, Gerrit).
3252
3253 One of identities might be None, meaning not configured.
3254 """
3255 host_to_identity_pairs = {}
3256 for host, identity, _ in self.get_hosts_with_creds():
3257 canonical = self._canonical_git_googlesource_host(host)
3258 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3259 idx = 0 if canonical == host else 1
3260 pair[idx] = identity
3261 return host_to_identity_pairs
3262
3263 def get_partially_configured_hosts(self):
3264 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003265 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003266 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003267 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003268
3269 def get_conflicting_hosts(self):
3270 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003271 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003272 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003273 if None not in (i1, i2) and i1 != i2)
3274
3275 def get_duplicated_hosts(self):
3276 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003277 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003278
3279 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3280 'chromium.googlesource.com': 'chromium.org',
3281 'chrome-internal.googlesource.com': 'google.com',
3282 }
3283
3284 def get_hosts_with_wrong_identities(self):
3285 """Finds hosts which **likely** reference wrong identities.
3286
3287 Note: skips hosts which have conflicting identities for Git and Gerrit.
3288 """
3289 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003290 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003291 pair = self._get_git_gerrit_identity_pairs().get(host)
3292 if pair and pair[0] == pair[1]:
3293 _, domain = self._parse_identity(pair[0])
3294 if domain != expected:
3295 hosts.add(host)
3296 return hosts
3297
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003298 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003299 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003300 hosts = sorted(hosts)
3301 assert hosts
3302 if extra_column_func is None:
3303 extras = [''] * len(hosts)
3304 else:
3305 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003306 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3307 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003308 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003309 lines.append(tmpl % he)
3310 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003311
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003312 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003313 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003314 yield ('.googlesource.com wildcard record detected',
3315 ['Chrome Infrastructure team recommends to list full host names '
3316 'explicitly.'],
3317 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003318
3319 dups = self.get_duplicated_hosts()
3320 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003321 yield ('The following hosts were defined twice',
3322 self._format_hosts(dups),
3323 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003324
3325 partial = self.get_partially_configured_hosts()
3326 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003327 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3328 'These hosts are missing',
3329 self._format_hosts(partial, lambda host: 'but %s defined' %
3330 self._get_counterpart_host(host)),
3331 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003332
3333 conflicting = self.get_conflicting_hosts()
3334 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003335 yield ('The following Git hosts have differing credentials from their '
3336 'Gerrit counterparts',
3337 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3338 tuple(self._get_git_gerrit_identity_pairs()[host])),
3339 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003340
3341 wrong = self.get_hosts_with_wrong_identities()
3342 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003343 yield ('These hosts likely use wrong identity',
3344 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3345 (self._get_git_gerrit_identity_pairs()[host][0],
3346 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3347 wrong)
3348
3349 def find_and_report_problems(self):
3350 """Returns True if there was at least one problem, else False."""
3351 found = False
3352 bad_hosts = set()
3353 for title, sublines, hosts in self._find_problems():
3354 if not found:
3355 found = True
3356 print('\n\n.gitcookies problem report:\n')
3357 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003358 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003359 if sublines:
3360 print()
3361 print(' %s' % '\n '.join(sublines))
3362 print()
3363
3364 if bad_hosts:
3365 assert found
3366 print(' You can manually remove corresponding lines in your %s file and '
3367 'visit the following URLs with correct account to generate '
3368 'correct credential lines:\n' %
3369 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3370 print(' %s' % '\n '.join(sorted(set(
3371 gerrit_util.CookiesAuthenticator().get_new_password_url(
3372 self._canonical_git_googlesource_host(host))
3373 for host in bad_hosts
3374 ))))
3375 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003376
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003377
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003378@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003379def CMDcreds_check(parser, args):
3380 """Checks credentials and suggests changes."""
3381 _, _ = parser.parse_args(args)
3382
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003383 # Code below checks .gitcookies. Abort if using something else.
3384 authn = gerrit_util.Authenticator.get()
3385 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3386 if isinstance(authn, gerrit_util.GceAuthenticator):
3387 DieWithError(
3388 'This command is not designed for GCE, are you on a bot?\n'
3389 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3390 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003391 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003392 'This command is not designed for bot environment. It checks '
3393 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003394
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003395 checker = _GitCookiesChecker()
3396 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003397
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003398 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003399 checker.print_current_creds(include_netrc=True)
3400
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003401 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003402 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003403 return 0
3404 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003405
3406
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003407@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003408def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003409 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003410 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003411 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003412 _, args = parser.parse_args(args)
3413 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003414 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003415 return RunGit(['config', 'branch.%s.base-url' % branch],
3416 error_ok=False).strip()
3417 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003418 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003419 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3420 error_ok=False).strip()
3421
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003422
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003423def color_for_status(status):
3424 """Maps a Changelist status to color, for CMDstatus and other tools."""
3425 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003426 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003427 'waiting': Fore.BLUE,
3428 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003429 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003430 'lgtm': Fore.GREEN,
3431 'commit': Fore.MAGENTA,
3432 'closed': Fore.CYAN,
3433 'error': Fore.WHITE,
3434 }.get(status, Fore.WHITE)
3435
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003436
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003437def get_cl_statuses(changes, fine_grained, max_processes=None):
3438 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003439
3440 If fine_grained is true, this will fetch CL statuses from the server.
3441 Otherwise, simply indicate if there's a matching url for the given branches.
3442
3443 If max_processes is specified, it is used as the maximum number of processes
3444 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3445 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003446
3447 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003448 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003449 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003450 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003451
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003452 if not fine_grained:
3453 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003454 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003455 for cl in changes:
3456 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003457 return
3458
3459 # First, sort out authentication issues.
3460 logging.debug('ensuring credentials exist')
3461 for cl in changes:
3462 cl.EnsureAuthenticated(force=False, refresh=True)
3463
3464 def fetch(cl):
3465 try:
3466 return (cl, cl.GetStatus())
3467 except:
3468 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003469 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003470 raise
3471
3472 threads_count = len(changes)
3473 if max_processes:
3474 threads_count = max(1, min(threads_count, max_processes))
3475 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3476
Edward Lemur61bf4172020-02-24 23:22:37 +00003477 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003478 fetched_cls = set()
3479 try:
3480 it = pool.imap_unordered(fetch, changes).__iter__()
3481 while True:
3482 try:
3483 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003484 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003485 break
3486 fetched_cls.add(cl)
3487 yield cl, status
3488 finally:
3489 pool.close()
3490
3491 # Add any branches that failed to fetch.
3492 for cl in set(changes) - fetched_cls:
3493 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003494
rmistry@google.com2dd99862015-06-22 12:22:18 +00003495
3496def upload_branch_deps(cl, args):
3497 """Uploads CLs of local branches that are dependents of the current branch.
3498
3499 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003500
3501 test1 -> test2.1 -> test3.1
3502 -> test3.2
3503 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003504
3505 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3506 run on the dependent branches in this order:
3507 test2.1, test3.1, test3.2, test2.2, test3.3
3508
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003509 Note: This function does not rebase your local dependent branches. Use it
3510 when you make a change to the parent branch that will not conflict
3511 with its dependent branches, and you would like their dependencies
3512 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003513 """
3514 if git_common.is_dirty_git_tree('upload-branch-deps'):
3515 return 1
3516
3517 root_branch = cl.GetBranch()
3518 if root_branch is None:
3519 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3520 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003521 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003522 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3523 'patchset dependencies without an uploaded CL.')
3524
3525 branches = RunGit(['for-each-ref',
3526 '--format=%(refname:short) %(upstream:short)',
3527 'refs/heads'])
3528 if not branches:
3529 print('No local branches found.')
3530 return 0
3531
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003532 # Create a dictionary of all local branches to the branches that are
3533 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003534 tracked_to_dependents = collections.defaultdict(list)
3535 for b in branches.splitlines():
3536 tokens = b.split()
3537 if len(tokens) == 2:
3538 branch_name, tracked = tokens
3539 tracked_to_dependents[tracked].append(branch_name)
3540
vapiera7fbd5a2016-06-16 09:17:49 -07003541 print()
3542 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003543 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003544
rmistry@google.com2dd99862015-06-22 12:22:18 +00003545 def traverse_dependents_preorder(branch, padding=''):
3546 dependents_to_process = tracked_to_dependents.get(branch, [])
3547 padding += ' '
3548 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003549 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003550 dependents.append(dependent)
3551 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003552
rmistry@google.com2dd99862015-06-22 12:22:18 +00003553 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003554 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003555
3556 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003557 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003558 return 0
3559
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003560 confirm_or_exit('This command will checkout all dependent branches and run '
3561 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003562
rmistry@google.com2dd99862015-06-22 12:22:18 +00003563 # Record all dependents that failed to upload.
3564 failures = {}
3565 # Go through all dependents, checkout the branch and upload.
3566 try:
3567 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003568 print()
3569 print('--------------------------------------')
3570 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003571 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003572 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003573 try:
3574 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003575 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003576 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003577 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003578 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003579 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003580 finally:
3581 # Swap back to the original root branch.
3582 RunGit(['checkout', '-q', root_branch])
3583
vapiera7fbd5a2016-06-16 09:17:49 -07003584 print()
3585 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003586 for dependent_branch in dependents:
3587 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003588 print(' %s : %s' % (dependent_branch, upload_status))
3589 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003590
3591 return 0
3592
3593
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003594def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3595 """Given a proposed tag name, returns a tag name that is guaranteed to be
3596 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3597 or 'foo-3', and so on."""
3598
3599 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3600 for suffix_num in itertools.count(1):
3601 if suffix_num == 1:
3602 to_check = proposed_tag
3603 else:
3604 to_check = '%s-%d' % (proposed_tag, suffix_num)
3605
3606 if to_check not in existing_tags:
3607 return to_check
3608
3609
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003610@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003611def CMDarchive(parser, args):
3612 """Archives and deletes branches associated with closed changelists."""
3613 parser.add_option(
3614 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003615 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003616 parser.add_option(
3617 '-f', '--force', action='store_true',
3618 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003619 parser.add_option(
3620 '-d', '--dry-run', action='store_true',
3621 help='Skip the branch tagging and removal steps.')
3622 parser.add_option(
3623 '-t', '--notags', action='store_true',
3624 help='Do not tag archived branches. '
3625 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003626
kmarshall3bff56b2016-06-06 18:31:47 -07003627 options, args = parser.parse_args(args)
3628 if args:
3629 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003630
3631 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3632 if not branches:
3633 return 0
3634
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003635 tags = RunGit(['for-each-ref', '--format=%(refname)',
3636 'refs/tags']).splitlines() or []
3637 tags = [t.split('/')[-1] for t in tags]
3638
vapiera7fbd5a2016-06-16 09:17:49 -07003639 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003640 changes = [Changelist(branchref=b)
3641 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003642 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3643 statuses = get_cl_statuses(changes,
3644 fine_grained=True,
3645 max_processes=options.maxjobs)
3646 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003647 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3648 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003649 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003650 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003651 proposal.sort()
3652
3653 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003654 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003655 return 0
3656
Edward Lemur85153282020-02-14 22:06:29 +00003657 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003658
vapiera7fbd5a2016-06-16 09:17:49 -07003659 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003660 if options.notags:
3661 for next_item in proposal:
3662 print(' ' + next_item[0])
3663 else:
3664 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3665 for next_item in proposal:
3666 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003667
kmarshall9249e012016-08-23 12:02:16 -07003668 # Quit now on precondition failure or if instructed by the user, either
3669 # via an interactive prompt or by command line flags.
3670 if options.dry_run:
3671 print('\nNo changes were made (dry run).\n')
3672 return 0
3673 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003674 print('You are currently on a branch \'%s\' which is associated with a '
3675 'closed codereview issue, so archive cannot proceed. Please '
3676 'checkout another branch and run this command again.' %
3677 current_branch)
3678 return 1
kmarshall9249e012016-08-23 12:02:16 -07003679 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003680 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3681 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003682 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003683 return 1
3684
3685 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003686 if not options.notags:
3687 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003688
3689 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3690 # Clean up the tag if we failed to delete the branch.
3691 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003692
vapiera7fbd5a2016-06-16 09:17:49 -07003693 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003694
3695 return 0
3696
3697
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003698@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003699def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003700 """Show status of changelists.
3701
3702 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003703 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003704 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003705 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003706 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003707 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003708 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003709 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003710
3711 Also see 'git cl comments'.
3712 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003713 parser.add_option(
3714 '--no-branch-color',
3715 action='store_true',
3716 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003717 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003718 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003719 parser.add_option('-f', '--fast', action='store_true',
3720 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003721 parser.add_option(
3722 '-j', '--maxjobs', action='store', type=int,
3723 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003724 parser.add_option(
3725 '-i', '--issue', type=int,
3726 help='Operate on this issue instead of the current branch\'s implicit '
3727 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003728 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003729 if args:
3730 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003731
iannuccie53c9352016-08-17 14:40:40 -07003732 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003733 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003734
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003735 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003736 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003737 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003738 if cl.GetIssue():
3739 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003740 elif options.field == 'id':
3741 issueid = cl.GetIssue()
3742 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003743 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003744 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003745 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003746 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003747 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003748 elif options.field == 'status':
3749 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003750 elif options.field == 'url':
3751 url = cl.GetIssueURL()
3752 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003753 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003754 return 0
3755
3756 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3757 if not branches:
3758 print('No local branch found.')
3759 return 0
3760
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003761 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003762 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003763 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003764 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003765 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003766 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003767 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003768
Edward Lemur85153282020-02-14 22:06:29 +00003769 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003770
3771 def FormatBranchName(branch, colorize=False):
3772 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3773 an asterisk when it is the current branch."""
3774
3775 asterisk = ""
3776 color = Fore.RESET
3777 if branch == current_branch:
3778 asterisk = "* "
3779 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003780 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003781
3782 if colorize:
3783 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003784 return asterisk + branch_name
3785
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003786 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003787
3788 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003789 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3790 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003791 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003792 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003793 branch_statuses[c.GetBranch()] = status
3794 status = branch_statuses.pop(branch)
3795 url = cl.GetIssueURL()
3796 if url and (not status or status == 'error'):
3797 # The issue probably doesn't exist anymore.
3798 url += ' (broken)'
3799
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003800 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003801 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003802 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003803 color = ''
3804 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003805 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003806
Alan Cuttera3be9a52019-03-04 18:50:33 +00003807 branch_display = FormatBranchName(branch)
3808 padding = ' ' * (alignment - len(branch_display))
3809 if not options.no_branch_color:
3810 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003811
Alan Cuttera3be9a52019-03-04 18:50:33 +00003812 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3813 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003814
vapiera7fbd5a2016-06-16 09:17:49 -07003815 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003816 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003817 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003818 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003819 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003820 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003821 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003822 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003823 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003824 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003825 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003826 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003827 return 0
3828
3829
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003830def colorize_CMDstatus_doc():
3831 """To be called once in main() to add colors to git cl status help."""
3832 colors = [i for i in dir(Fore) if i[0].isupper()]
3833
3834 def colorize_line(line):
3835 for color in colors:
3836 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003837 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003838 indent = len(line) - len(line.lstrip(' ')) + 1
3839 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3840 return line
3841
3842 lines = CMDstatus.__doc__.splitlines()
3843 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3844
3845
phajdan.jre328cf92016-08-22 04:12:17 -07003846def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003847 if path == '-':
3848 json.dump(contents, sys.stdout)
3849 else:
3850 with open(path, 'w') as f:
3851 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003852
3853
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003854@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003855@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003856def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003857 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003858
3859 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003860 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003861 parser.add_option('-r', '--reverse', action='store_true',
3862 help='Lookup the branch(es) for the specified issues. If '
3863 'no issues are specified, all branches with mapped '
3864 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003865 parser.add_option('--json',
3866 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003867 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003868
dnj@chromium.org406c4402015-03-03 17:22:28 +00003869 if options.reverse:
3870 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003871 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003872 # Reverse issue lookup.
3873 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003874
3875 git_config = {}
3876 for config in RunGit(['config', '--get-regexp',
3877 r'branch\..*issue']).splitlines():
3878 name, _space, val = config.partition(' ')
3879 git_config[name] = val
3880
dnj@chromium.org406c4402015-03-03 17:22:28 +00003881 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003882 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003883 Changelist.IssueConfigKey())
3884 issue = git_config.get(config_key)
3885 if issue:
3886 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003887 if not args:
3888 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003889 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003890 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003891 try:
3892 issue_num = int(issue)
3893 except ValueError:
3894 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003895 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003896 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003897 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003898 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003899 if options.json:
3900 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003901 return 0
3902
3903 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003904 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003905 if not issue.valid:
3906 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3907 'or no argument to list it.\n'
3908 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003909 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003910 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003911 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003912 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003913 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3914 if options.json:
3915 write_json(options.json, {
3916 'issue': cl.GetIssue(),
3917 'issue_url': cl.GetIssueURL(),
3918 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003919 return 0
3920
3921
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003922@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003923def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003924 """Shows or posts review comments for any changelist."""
3925 parser.add_option('-a', '--add-comment', dest='comment',
3926 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003927 parser.add_option('-p', '--publish', action='store_true',
3928 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003929 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003930 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003931 parser.add_option('-m', '--machine-readable', dest='readable',
3932 action='store_false', default=True,
3933 help='output comments in a format compatible with '
3934 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003935 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003936 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003937 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003938
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003939 issue = None
3940 if options.issue:
3941 try:
3942 issue = int(options.issue)
3943 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003944 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003945
Edward Lemur934836a2019-09-09 20:16:54 +00003946 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003947
3948 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003949 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003950 return 0
3951
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003952 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3953 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003954 for comment in summary:
3955 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003956 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003957 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003958 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003959 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003960 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003961 elif comment.autogenerated:
3962 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003963 else:
3964 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003965 print('\n%s%s %s%s\n%s' % (
3966 color,
3967 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3968 comment.sender,
3969 Fore.RESET,
3970 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3971
smut@google.comc85ac942015-09-15 16:34:43 +00003972 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003973 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003974 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003975 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3976 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003977 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003978 return 0
3979
3980
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003981@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003982@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003983def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003984 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003985 parser.add_option('-d', '--display', action='store_true',
3986 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003987 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003988 help='New description to set for this issue (- for stdin, '
3989 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003990 parser.add_option('-f', '--force', action='store_true',
3991 help='Delete any unpublished Gerrit edits for this issue '
3992 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003993
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003994 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003995
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003996 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003997 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003998 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003999 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004000 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004001
Edward Lemur934836a2019-09-09 20:16:54 +00004002 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004003 if target_issue_arg:
4004 kwargs['issue'] = target_issue_arg.issue
4005 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004006
4007 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004008 if not cl.GetIssue():
4009 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004010
Edward Lemur678a6842019-10-03 22:25:05 +00004011 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004012 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004013
Edward Lemur6c6827c2020-02-06 21:15:18 +00004014 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004015
smut@google.com34fb6b12015-07-13 20:03:26 +00004016 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004017 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004018 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004019
4020 if options.new_description:
4021 text = options.new_description
4022 if text == '-':
4023 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004024 elif text == '+':
4025 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004026 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004027
4028 description.set_description(text)
4029 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004030 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004031 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004032 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004033 return 0
4034
4035
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004036@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004037def CMDlint(parser, args):
4038 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004039 parser.add_option('--filter', action='append', metavar='-x,+y',
4040 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004041 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004042
4043 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004044 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004045 try:
4046 import cpplint
4047 import cpplint_chromium
4048 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004050 return 1
4051
4052 # Change the current working directory before calling lint so that it
4053 # shows the correct base.
4054 previous_cwd = os.getcwd()
4055 os.chdir(settings.GetRoot())
4056 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004057 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004058 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004059 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004060 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004061 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004062 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004063
4064 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004065 command = args + files
4066 if options.filter:
4067 command = ['--filter=' + ','.join(options.filter)] + command
4068 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004069
4070 white_regex = re.compile(settings.GetLintRegex())
4071 black_regex = re.compile(settings.GetLintIgnoreRegex())
4072 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4073 for filename in filenames:
4074 if white_regex.match(filename):
4075 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004076 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004077 else:
4078 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4079 extra_check_functions)
4080 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004081 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004082 finally:
4083 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004084 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004085 if cpplint._cpplint_state.error_count != 0:
4086 return 1
4087 return 0
4088
4089
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004090@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004091def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004092 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004093 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004094 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004095 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004096 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004097 parser.add_option('--all', action='store_true',
4098 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004099 parser.add_option('--parallel', action='store_true',
4100 help='Run all tests specified by input_api.RunTests in all '
4101 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004102 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004103
sbc@chromium.org71437c02015-04-09 19:29:40 +00004104 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004105 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004106 return 1
4107
Edward Lemur934836a2019-09-09 20:16:54 +00004108 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004109 if args:
4110 base_branch = args[0]
4111 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004112 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004113 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004114
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004115 if cl.GetIssue():
4116 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004117 else:
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004118 description = cl.GetLocalDescription(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004119
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004120 cl.RunHook(
4121 committing=not options.upload,
4122 may_prompt=False,
4123 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004124 parallel=options.parallel,
4125 upstream=base_branch,
4126 description=description,
4127 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004128 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004129
4130
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004131def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004132 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004133
4134 Works the same way as
4135 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4136 but can be called on demand on all platforms.
4137
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004138 The basic idea is to generate git hash of a state of the tree, original
4139 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004140 """
4141 lines = []
4142 tree_hash = RunGitSilent(['write-tree'])
4143 lines.append('tree %s' % tree_hash.strip())
4144 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4145 if code == 0:
4146 lines.append('parent %s' % parent.strip())
4147 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4148 lines.append('author %s' % author.strip())
4149 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4150 lines.append('committer %s' % committer.strip())
4151 lines.append('')
4152 # Note: Gerrit's commit-hook actually cleans message of some lines and
4153 # whitespace. This code is not doing this, but it clearly won't decrease
4154 # entropy.
4155 lines.append(message)
4156 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004157 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004158 return 'I%s' % change_hash.strip()
4159
4160
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004161def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004162 """Computes the remote branch ref to use for the CL.
4163
4164 Args:
4165 remote (str): The git remote for the CL.
4166 remote_branch (str): The git remote branch for the CL.
4167 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004168 """
4169 if not (remote and remote_branch):
4170 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004171
wittman@chromium.org455dc922015-01-26 20:15:50 +00004172 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004173 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004174 # refs, which are then translated into the remote full symbolic refs
4175 # below.
4176 if '/' not in target_branch:
4177 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4178 else:
4179 prefix_replacements = (
4180 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4181 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4182 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4183 )
4184 match = None
4185 for regex, replacement in prefix_replacements:
4186 match = re.search(regex, target_branch)
4187 if match:
4188 remote_branch = target_branch.replace(match.group(0), replacement)
4189 break
4190 if not match:
4191 # This is a branch path but not one we recognize; use as-is.
4192 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004193 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4194 # Handle the refs that need to land in different refs.
4195 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004196
wittman@chromium.org455dc922015-01-26 20:15:50 +00004197 # Create the true path to the remote branch.
4198 # Does the following translation:
4199 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4200 # * refs/remotes/origin/master -> refs/heads/master
4201 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4202 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4203 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4204 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4205 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4206 'refs/heads/')
4207 elif remote_branch.startswith('refs/remotes/branch-heads'):
4208 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004209
wittman@chromium.org455dc922015-01-26 20:15:50 +00004210 return remote_branch
4211
4212
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004213def cleanup_list(l):
4214 """Fixes a list so that comma separated items are put as individual items.
4215
4216 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4217 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4218 """
4219 items = sum((i.split(',') for i in l), [])
4220 stripped_items = (i.strip() for i in items)
4221 return sorted(filter(None, stripped_items))
4222
4223
Aaron Gable4db38df2017-11-03 14:59:07 -07004224@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004225@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004226def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004227 """Uploads the current changelist to codereview.
4228
4229 Can skip dependency patchset uploads for a branch by running:
4230 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004231 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004232 git config --unset branch.branch_name.skip-deps-uploads
4233 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004234
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004235 If the name of the checked out branch starts with "bug-" or "fix-" followed
4236 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004237 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004238
4239 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004240 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004241 [git-cl] add support for hashtags
4242 Foo bar: implement foo
4243 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004244 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004245 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4246 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004247 parser.add_option('--bypass-watchlists', action='store_true',
4248 dest='bypass_watchlists',
4249 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004250 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004251 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004252 parser.add_option('--message', '-m', dest='message',
4253 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004254 parser.add_option('-b', '--bug',
4255 help='pre-populate the bug number(s) for this issue. '
4256 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004257 parser.add_option('--message-file', dest='message_file',
4258 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004259 parser.add_option('--title', '-t', dest='title',
4260 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004261 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004262 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004263 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004264 parser.add_option('--tbrs',
4265 action='append', default=[],
4266 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004267 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004268 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004269 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004270 parser.add_option('--hashtag', dest='hashtags',
4271 action='append', default=[],
4272 help=('Gerrit hashtag for new CL; '
4273 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004274 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004275 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004276 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004277 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004278 metavar='TARGET',
4279 help='Apply CL to remote ref TARGET. ' +
4280 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004281 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004282 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004283 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004284 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004285 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004286 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004287 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4288 const='TBR', help='add a set of OWNERS to TBR')
4289 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4290 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004291 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004292 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004293 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004294 'implies --send-mail')
4295 parser.add_option('-d', '--cq-dry-run',
4296 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004297 help='Send the patchset to do a CQ dry run right after '
4298 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004299 parser.add_option('--preserve-tryjobs', action='store_true',
4300 help='instruct the CQ to let tryjobs running even after '
4301 'new patchsets are uploaded instead of canceling '
4302 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004303 parser.add_option('--dependencies', action='store_true',
4304 help='Uploads CLs of all the local branches that depend on '
4305 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004306 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4307 help='Sends your change to the CQ after an approval. Only '
4308 'works on repos that have the Auto-Submit label '
4309 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004310 parser.add_option('--parallel', action='store_true',
4311 help='Run all tests specified by input_api.RunTests in all '
4312 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004313 parser.add_option('--no-autocc', action='store_true',
4314 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004315 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004316 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004317 parser.add_option('-R', '--retry-failed', action='store_true',
4318 help='Retry failed tryjobs from old patchset immediately '
4319 'after uploading new patchset. Cannot be used with '
4320 '--use-commit-queue or --cq-dry-run.')
4321 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4322 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004323 parser.add_option('--fixed', '-x',
4324 help='List of bugs that will be commented on and marked '
4325 'fixed (pre-populates "Fixed:" tag). Same format as '
4326 '-b option / "Bug:" tag. If fixing several issues, '
4327 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004328 parser.add_option('--edit-description', action='store_true', default=False,
4329 help='Modify description before upload. Cannot be used '
4330 'with --force. It is a noop when --no-squash is set '
4331 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004332
rmistry@google.com2dd99862015-06-22 12:22:18 +00004333 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004334 (options, args) = parser.parse_args(args)
4335
sbc@chromium.org71437c02015-04-09 19:29:40 +00004336 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004337 return 1
4338
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004339 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004340 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004341 options.cc = cleanup_list(options.cc)
4342
Josipe827b0f2020-01-30 00:07:20 +00004343 if options.edit_description and options.force:
4344 parser.error('Only one of --force and --edit-description allowed')
4345
tandriib80458a2016-06-23 12:20:07 -07004346 if options.message_file:
4347 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004348 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004349 options.message = gclient_utils.FileRead(options.message_file)
4350 options.message_file = None
4351
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004352 if ([options.cq_dry_run,
4353 options.use_commit_queue,
4354 options.retry_failed].count(True) > 1):
4355 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4356 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004357
Aaron Gableedbc4132017-09-11 13:22:28 -07004358 if options.use_commit_queue:
4359 options.send_mail = True
4360
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004361 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4362 settings.GetIsGerrit()
4363
Edward Lemur934836a2019-09-09 20:16:54 +00004364 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004365 # Warm change details cache now to avoid RPCs later, reducing latency for
4366 # developers.
4367 if cl.GetIssue():
4368 cl._GetChangeDetail(
4369 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4370
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004371 if options.retry_failed and not cl.GetIssue():
4372 print('No previous patchsets, so --retry-failed has no effect.')
4373 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004374
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004375 # cl.GetMostRecentPatchset uses cached information, and can return the last
4376 # patchset before upload. Calling it here makes it clear that it's the
4377 # last patchset before upload. Note that GetMostRecentPatchset will fail
4378 # if no CL has been uploaded yet.
4379 if options.retry_failed:
4380 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004381
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004382 ret = cl.CMDUpload(options, args, orig_args)
4383
4384 if options.retry_failed:
4385 if ret != 0:
4386 print('Upload failed, so --retry-failed has no effect.')
4387 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004388 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004389 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004390 jobs = _filter_failed_for_retry(builds)
4391 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004392 print('No failed tryjobs, so --retry-failed has no effect.')
4393 return ret
Edward Lemur45768512020-03-02 19:03:14 +00004394 _trigger_try_jobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004395
4396 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004397
4398
Francois Dorayd42c6812017-05-30 15:10:20 -04004399@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004400@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004401def CMDsplit(parser, args):
4402 """Splits a branch into smaller branches and uploads CLs.
4403
4404 Creates a branch and uploads a CL for each group of files modified in the
4405 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004406 comment, the string '$directory', is replaced with the directory containing
4407 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004408 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004409 parser.add_option('-d', '--description', dest='description_file',
4410 help='A text file containing a CL description in which '
4411 '$directory will be replaced by each CL\'s directory.')
4412 parser.add_option('-c', '--comment', dest='comment_file',
4413 help='A text file containing a CL comment.')
4414 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004415 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004416 help='List the files and reviewers for each CL that would '
4417 'be created, but don\'t create branches or CLs.')
4418 parser.add_option('--cq-dry-run', action='store_true',
4419 help='If set, will do a cq dry run for each uploaded CL. '
4420 'Please be careful when doing this; more than ~10 CLs '
4421 'has the potential to overload our build '
4422 'infrastructure. Try to upload these not during high '
4423 'load times (usually 11-3 Mountain View time). Email '
4424 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004425 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4426 default=True,
4427 help='Sends your change to the CQ after an approval. Only '
4428 'works on repos that have the Auto-Submit label '
4429 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004430 options, _ = parser.parse_args(args)
4431
4432 if not options.description_file:
4433 parser.error('No --description flag specified.')
4434
4435 def WrappedCMDupload(args):
4436 return CMDupload(OptionParser(), args)
4437
4438 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004439 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004440 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004441
4442
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004443@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004444@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004445def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004446 """DEPRECATED: Used to commit the current changelist via git-svn."""
4447 message = ('git-cl no longer supports committing to SVN repositories via '
4448 'git-svn. You probably want to use `git cl land` instead.')
4449 print(message)
4450 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004451
4452
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004453@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004454@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004455def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004456 """Commits the current changelist via git.
4457
4458 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4459 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004460 """
4461 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4462 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004463 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004464 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004465 parser.add_option('--parallel', action='store_true',
4466 help='Run all tests specified by input_api.RunTests in all '
4467 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004468 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004469
Edward Lemur934836a2019-09-09 20:16:54 +00004470 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004471
Robert Iannucci2e73d432018-03-14 01:10:47 -07004472 if not cl.GetIssue():
4473 DieWithError('You must upload the change first to Gerrit.\n'
4474 ' If you would rather have `git cl land` upload '
4475 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004476 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004477 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004478
4479
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004480@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004481@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004482def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004483 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004484 parser.add_option('-b', dest='newbranch',
4485 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004486 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004487 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004488 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004489 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004490
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004491 group = optparse.OptionGroup(
4492 parser,
4493 'Options for continuing work on the current issue uploaded from a '
4494 'different clone (e.g. different machine). Must be used independently '
4495 'from the other options. No issue number should be specified, and the '
4496 'branch must have an issue number associated with it')
4497 group.add_option('--reapply', action='store_true', dest='reapply',
4498 help='Reset the branch and reapply the issue.\n'
4499 'CAUTION: This will undo any local changes in this '
4500 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004501
4502 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004503 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004504 parser.add_option_group(group)
4505
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004506 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004507
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004508 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004509 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004510 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004511 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004512 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004513
Edward Lemur934836a2019-09-09 20:16:54 +00004514 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004515 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004516 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004517
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004518 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004519 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004520 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004521
4522 RunGit(['reset', '--hard', upstream])
4523 if options.pull:
4524 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004525
Edward Lemur678a6842019-10-03 22:25:05 +00004526 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4527 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004528
4529 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004530 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004531
Edward Lemurf38bc172019-09-03 21:02:13 +00004532 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004533 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004534 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004535
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004536 # We don't want uncommitted changes mixed up with the patch.
4537 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004538 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004539
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004540 if options.newbranch:
4541 if options.force:
4542 RunGit(['branch', '-D', options.newbranch],
4543 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004544 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004545
Edward Lemur678a6842019-10-03 22:25:05 +00004546 cl = Changelist(
4547 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004548
Edward Lemur678a6842019-10-03 22:25:05 +00004549 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004550 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004551
Edward Lemurf38bc172019-09-03 21:02:13 +00004552 return cl.CMDPatchWithParsedIssue(
4553 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004554
4555
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004556def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004557 """Fetches the tree status and returns either 'open', 'closed',
4558 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004559 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004560 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004561 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004562 if status.find('closed') != -1 or status == '0':
4563 return 'closed'
4564 elif status.find('open') != -1 or status == '1':
4565 return 'open'
4566 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004567 return 'unset'
4568
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004569
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004570def GetTreeStatusReason():
4571 """Fetches the tree status from a json url and returns the message
4572 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004573 url = settings.GetTreeStatusUrl()
4574 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004575 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004576 status = json.loads(connection.read())
4577 connection.close()
4578 return status['message']
4579
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004580
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004581@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004582def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004583 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004584 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004585 status = GetTreeStatus()
4586 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004587 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004588 return 2
4589
vapiera7fbd5a2016-06-16 09:17:49 -07004590 print('The tree is %s' % status)
4591 print()
4592 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004593 if status != 'open':
4594 return 1
4595 return 0
4596
4597
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004598@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004599def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004600 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4601 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004602 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004603 '-b', '--bot', action='append',
4604 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4605 'times to specify multiple builders. ex: '
4606 '"-b win_rel -b win_layout". See '
4607 'the try server waterfall for the builders name and the tests '
4608 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004609 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004610 '-B', '--bucket', default='',
4611 help=('Buildbucket bucket to send the try requests.'))
4612 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004613 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004614 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004615 'be determined by the try recipe that builder runs, which usually '
4616 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004617 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004618 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004619 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004620 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004621 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004622 '--category', default='git_cl_try', help='Specify custom build category.')
4623 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004624 '--project',
4625 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004626 'in recipe to determine to which repository or directory to '
4627 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004628 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004629 '-p', '--property', dest='properties', action='append', default=[],
4630 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004631 'key2=value2 etc. The value will be treated as '
4632 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004633 'NOTE: using this may make your tryjob not usable for CQ, '
4634 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004635 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004636 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4637 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004638 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004639 parser.add_option(
4640 '-R', '--retry-failed', action='store_true', default=False,
4641 help='Retry failed jobs from the latest set of tryjobs. '
4642 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004643 parser.add_option(
4644 '-i', '--issue', type=int,
4645 help='Operate on this issue instead of the current branch\'s implicit '
4646 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004647 options, args = parser.parse_args(args)
4648
machenbach@chromium.org45453142015-09-15 08:45:22 +00004649 # Make sure that all properties are prop=value pairs.
4650 bad_params = [x for x in options.properties if '=' not in x]
4651 if bad_params:
4652 parser.error('Got properties with missing "=": %s' % bad_params)
4653
maruel@chromium.org15192402012-09-06 12:38:29 +00004654 if args:
4655 parser.error('Unknown arguments: %s' % args)
4656
Edward Lemur934836a2019-09-09 20:16:54 +00004657 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004658 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004659 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004660
Edward Lemurf38bc172019-09-03 21:02:13 +00004661 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004662 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004663
tandriie113dfd2016-10-11 10:20:12 -07004664 error_message = cl.CannotTriggerTryJobReason()
4665 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004666 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004667
Edward Lemur45768512020-03-02 19:03:14 +00004668 if options.bot:
4669 if options.retry_failed:
4670 parser.error('--bot is not compatible with --retry-failed.')
4671 if not options.bucket:
4672 parser.error('A bucket (e.g. "chromium/try") is required.')
4673
4674 triggered = [b for b in options.bot if 'triggered' in b]
4675 if triggered:
4676 parser.error(
4677 'Cannot schedule builds on triggered bots: %s.\n'
4678 'This type of bot requires an initial job from a parent (usually a '
4679 'builder). Schedule a job on the parent instead.\n' % triggered)
4680
4681 if options.bucket.startswith('.master'):
4682 parser.error('Buildbot masters are not supported.')
4683
4684 project, bucket = _parse_bucket(options.bucket)
4685 if project is None or bucket is None:
4686 parser.error('Invalid bucket: %s.' % options.bucket)
4687 jobs = sorted((project, bucket, bot) for bot in options.bot)
4688 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004689 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004690 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004691 if options.verbose:
4692 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004693 jobs = _filter_failed_for_retry(builds)
4694 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004695 print('There are no failed jobs in the latest set of jobs '
4696 '(patchset #%d), doing nothing.' % patchset)
4697 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004698 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004699 if num_builders > 10:
4700 confirm_or_exit('There are %d builders with failed builds.'
4701 % num_builders, action='continue')
4702 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004703 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004704 print('git cl try with no bots now defaults to CQ dry run.')
4705 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4706 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004707
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004708 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004709 try:
Edward Lemur45768512020-03-02 19:03:14 +00004710 _trigger_try_jobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004711 except BuildbucketResponseException as ex:
4712 print('ERROR: %s' % ex)
4713 return 1
4714 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004715
4716
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004717@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004718def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004719 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004720 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004721 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004722 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004723 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004724 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004725 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004726 '--color', action='store_true', default=setup_color.IS_TTY,
4727 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004728 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004729 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4730 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004731 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004732 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004733 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004734 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004735 parser.add_option(
4736 '-i', '--issue', type=int,
4737 help='Operate on this issue instead of the current branch\'s implicit '
4738 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004739 options, args = parser.parse_args(args)
4740 if args:
4741 parser.error('Unrecognized args: %s' % ' '.join(args))
4742
Edward Lemur934836a2019-09-09 20:16:54 +00004743 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004744 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004745 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004746
tandrii221ab252016-10-06 08:12:04 -07004747 patchset = options.patchset
4748 if not patchset:
4749 patchset = cl.GetMostRecentPatchset()
4750 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004751 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004752 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004753 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004754 cl.GetIssue())
4755
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004756 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004757 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004758 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004759 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004760 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004761 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004762 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004763 else:
4764 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004765 return 0
4766
4767
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004768@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004769@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004770def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004771 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004772 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004773 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004774 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004775
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004776 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004777 if args:
4778 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004779 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004780 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004781 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004782 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004783
4784 # Clear configured merge-base, if there is one.
4785 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004786 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004787 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004788 return 0
4789
4790
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004791@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004792def CMDweb(parser, args):
4793 """Opens the current CL in the web browser."""
4794 _, args = parser.parse_args(args)
4795 if args:
4796 parser.error('Unrecognized args: %s' % ' '.join(args))
4797
4798 issue_url = Changelist().GetIssueURL()
4799 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004800 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004801 return 1
4802
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004803 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004804 # allows us to hide the "Created new window in existing browser session."
4805 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004806 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004807 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004808 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004809 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004810 os.open(os.devnull, os.O_RDWR)
4811 try:
4812 webbrowser.open(issue_url)
4813 finally:
4814 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004815 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004816 return 0
4817
4818
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004819@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004820def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004821 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004822 parser.add_option('-d', '--dry-run', action='store_true',
4823 help='trigger in dry run mode')
4824 parser.add_option('-c', '--clear', action='store_true',
4825 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004826 parser.add_option(
4827 '-i', '--issue', type=int,
4828 help='Operate on this issue instead of the current branch\'s implicit '
4829 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004830 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004831 if args:
4832 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004833 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004834 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004835
Edward Lemur934836a2019-09-09 20:16:54 +00004836 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004837 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004838 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004839 elif options.dry_run:
4840 state = _CQState.DRY_RUN
4841 else:
4842 state = _CQState.COMMIT
4843 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004844 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004845 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004846 return 0
4847
4848
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004849@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004850def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004851 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004852 parser.add_option(
4853 '-i', '--issue', type=int,
4854 help='Operate on this issue instead of the current branch\'s implicit '
4855 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004856 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004857 if args:
4858 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004859 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004860 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004861 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004862 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004863 cl.CloseIssue()
4864 return 0
4865
4866
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004867@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004868def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004869 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004870 parser.add_option(
4871 '--stat',
4872 action='store_true',
4873 dest='stat',
4874 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004875 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004876 if args:
4877 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004878
Edward Lemur934836a2019-09-09 20:16:54 +00004879 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004880 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004881 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004882 if not issue:
4883 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004884
Aaron Gablea718c3e2017-08-28 17:47:28 -07004885 base = cl._GitGetBranchConfigValue('last-upload-hash')
4886 if not base:
4887 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4888 if not base:
4889 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4890 revision_info = detail['revisions'][detail['current_revision']]
4891 fetch_info = revision_info['fetch']['http']
4892 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4893 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004894
Aaron Gablea718c3e2017-08-28 17:47:28 -07004895 cmd = ['git', 'diff']
4896 if options.stat:
4897 cmd.append('--stat')
4898 cmd.append(base)
4899 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004900
4901 return 0
4902
4903
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004904@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004905def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004906 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004907 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004908 '--ignore-current',
4909 action='store_true',
4910 help='Ignore the CL\'s current reviewers and start from scratch.')
4911 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004912 '--ignore-self',
4913 action='store_true',
4914 help='Do not consider CL\'s author as an owners.')
4915 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004916 '--no-color',
4917 action='store_true',
4918 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004919 parser.add_option(
4920 '--batch',
4921 action='store_true',
4922 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004923 # TODO: Consider moving this to another command, since other
4924 # git-cl owners commands deal with owners for a given CL.
4925 parser.add_option(
4926 '--show-all',
4927 action='store_true',
4928 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004929 options, args = parser.parse_args(args)
4930
4931 author = RunGit(['config', 'user.email']).strip() or None
4932
Edward Lemur934836a2019-09-09 20:16:54 +00004933 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004934
Yang Guo6e269a02019-06-26 11:17:02 +00004935 if options.show_all:
4936 for arg in args:
4937 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004938 database = owners.Database(settings.GetRoot(), file, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004939 database.load_data_needed_for([arg])
4940 print('Owners for %s:' % arg)
4941 for owner in sorted(database.all_possible_owners([arg], None)):
4942 print(' - %s' % owner)
4943 return 0
4944
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004945 if args:
4946 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004947 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004948 base_branch = args[0]
4949 else:
4950 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004951 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004952
Edward Lemur7f6dec02020-02-06 20:23:58 +00004953 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004954 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4955
4956 if options.batch:
4957 db = owners.Database(change.RepositoryRoot(), file, os.path)
4958 print('\n'.join(db.reviewers_for(affected_files, author)))
4959 return 0
4960
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004961 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004962 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004963 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004964 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004965 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004966 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004967 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004968 override_files=change.OriginalOwnersFiles(),
4969 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004970
4971
Aiden Bennerc08566e2018-10-03 17:52:42 +00004972def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004973 """Generates a diff command."""
4974 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004975 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4976
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004977 if allow_prefix:
4978 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4979 # case that diff.noprefix is set in the user's git config.
4980 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4981 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004982 diff_cmd += ['--no-prefix']
4983
4984 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004985
4986 if args:
4987 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004988 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004989 diff_cmd.append(arg)
4990 else:
4991 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004992
4993 return diff_cmd
4994
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004995
Jamie Madill5e96ad12020-01-13 16:08:35 +00004996def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4997 """Runs clang-format-diff and sets a return value if necessary."""
4998
4999 if not clang_diff_files:
5000 return 0
5001
5002 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5003 # formatted. This is used to block during the presubmit.
5004 return_value = 0
5005
5006 # Locate the clang-format binary in the checkout
5007 try:
5008 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5009 except clang_format.NotFoundError as e:
5010 DieWithError(e)
5011
5012 if opts.full or settings.GetFormatFullByDefault():
5013 cmd = [clang_format_tool]
5014 if not opts.dry_run and not opts.diff:
5015 cmd.append('-i')
5016 if opts.dry_run:
5017 for diff_file in clang_diff_files:
5018 with open(diff_file, 'r') as myfile:
5019 code = myfile.read().replace('\r\n', '\n')
5020 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5021 stdout = stdout.replace('\r\n', '\n')
5022 if opts.diff:
5023 sys.stdout.write(stdout)
5024 if code != stdout:
5025 return_value = 2
5026 else:
5027 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5028 if opts.diff:
5029 sys.stdout.write(stdout)
5030 else:
5031 env = os.environ.copy()
5032 env['PATH'] = str(os.path.dirname(clang_format_tool))
5033 try:
5034 script = clang_format.FindClangFormatScriptInChromiumTree(
5035 'clang-format-diff.py')
5036 except clang_format.NotFoundError as e:
5037 DieWithError(e)
5038
5039 cmd = [sys.executable, script, '-p0']
5040 if not opts.dry_run and not opts.diff:
5041 cmd.append('-i')
5042
5043 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5044 diff_output = RunGit(diff_cmd)
5045
5046 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5047 if opts.diff:
5048 sys.stdout.write(stdout)
5049 if opts.dry_run and len(stdout) > 0:
5050 return_value = 2
5051
5052 return return_value
5053
5054
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005055def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005056 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005057 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005058
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005059
enne@chromium.org555cfe42014-01-29 18:21:39 +00005060@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005061@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005062def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005063 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005064 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005065 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005066 parser.add_option('--full', action='store_true',
5067 help='Reformat the full content of all touched files')
5068 parser.add_option('--dry-run', action='store_true',
5069 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005070 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005071 '--no-clang-format',
5072 dest='clang_format',
5073 action='store_false',
5074 default=True,
5075 help='Disables formatting of various file types using clang-format.')
5076 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005077 '--python',
5078 action='store_true',
5079 default=None,
5080 help='Enables python formatting on all python files.')
5081 parser.add_option(
5082 '--no-python',
5083 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005084 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005085 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005086 'If neither --python or --no-python are set, python files that have a '
5087 '.style.yapf file in an ancestor directory will be formatted. '
5088 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005089 parser.add_option(
5090 '--js',
5091 action='store_true',
5092 help='Format javascript code with clang-format. '
5093 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005094 parser.add_option('--diff', action='store_true',
5095 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005096 parser.add_option('--presubmit', action='store_true',
5097 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005098 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005099
Garrett Beaty91a6f332020-01-06 16:57:24 +00005100 if opts.python is not None and opts.no_python:
5101 raise parser.error('Cannot set both --python and --no-python')
5102 if opts.no_python:
5103 opts.python = False
5104
Daniel Chengc55eecf2016-12-30 03:11:02 -08005105 # Normalize any remaining args against the current path, so paths relative to
5106 # the current directory are still resolved as expected.
5107 args = [os.path.join(os.getcwd(), arg) for arg in args]
5108
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005109 # git diff generates paths against the root of the repository. Change
5110 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005111 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005112 if rel_base_path:
5113 os.chdir(rel_base_path)
5114
digit@chromium.org29e47272013-05-17 17:01:46 +00005115 # Grab the merge-base commit, i.e. the upstream commit of the current
5116 # branch when it was created or the last time it was rebased. This is
5117 # to cover the case where the user may have called "git fetch origin",
5118 # moving the origin branch to a newer commit, but hasn't rebased yet.
5119 upstream_commit = None
5120 cl = Changelist()
5121 upstream_branch = cl.GetUpstreamBranch()
5122 if upstream_branch:
5123 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5124 upstream_commit = upstream_commit.strip()
5125
5126 if not upstream_commit:
5127 DieWithError('Could not find base commit for this branch. '
5128 'Are you in detached state?')
5129
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005130 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5131 diff_output = RunGit(changed_files_cmd)
5132 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005133 # Filter out files deleted by this CL
5134 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005135
Andreas Haas417d89c2020-02-06 10:24:27 +00005136 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005137 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005138
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005139 clang_diff_files = []
5140 if opts.clang_format:
5141 clang_diff_files = [
5142 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5143 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005144 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5145 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005146 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005147
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005148 top_dir = os.path.normpath(
5149 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5150
Jamie Madill5e96ad12020-01-13 16:08:35 +00005151 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5152 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005153
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005154 # Similar code to above, but using yapf on .py files rather than clang-format
5155 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005156 py_explicitly_disabled = opts.python is not None and not opts.python
5157 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005158 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5159 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5160 if sys.platform.startswith('win'):
5161 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005162
Aiden Bennerc08566e2018-10-03 17:52:42 +00005163 # Used for caching.
5164 yapf_configs = {}
5165 for f in python_diff_files:
5166 # Find the yapf style config for the current file, defaults to depot
5167 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005168 _FindYapfConfigFile(f, yapf_configs, top_dir)
5169
5170 # Turn on python formatting by default if a yapf config is specified.
5171 # This breaks in the case of this repo though since the specified
5172 # style file is also the global default.
5173 if opts.python is None:
5174 filtered_py_files = []
5175 for f in python_diff_files:
5176 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5177 filtered_py_files.append(f)
5178 else:
5179 filtered_py_files = python_diff_files
5180
5181 # Note: yapf still seems to fix indentation of the entire file
5182 # even if line ranges are specified.
5183 # See https://github.com/google/yapf/issues/499
5184 if not opts.full and filtered_py_files:
5185 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5186
Brian Sheedyb4307d52019-12-02 19:18:17 +00005187 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5188 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5189 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005190
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005191 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005192 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5193 # Default to pep8 if not .style.yapf is found.
5194 if not yapf_style:
5195 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005196
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005197 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005198
5199 has_formattable_lines = False
5200 if not opts.full:
5201 # Only run yapf over changed line ranges.
5202 for diff_start, diff_len in py_line_diffs[f]:
5203 diff_end = diff_start + diff_len - 1
5204 # Yapf errors out if diff_end < diff_start but this
5205 # is a valid line range diff for a removal.
5206 if diff_end >= diff_start:
5207 has_formattable_lines = True
5208 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5209 # If all line diffs were removals we have nothing to format.
5210 if not has_formattable_lines:
5211 continue
5212
5213 if opts.diff or opts.dry_run:
5214 cmd += ['--diff']
5215 # Will return non-zero exit code if non-empty diff.
5216 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5217 if opts.diff:
5218 sys.stdout.write(stdout)
5219 elif len(stdout) > 0:
5220 return_value = 2
5221 else:
5222 cmd += ['-i']
5223 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005224
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005225 # Dart's formatter does not have the nice property of only operating on
5226 # modified chunks, so hard code full.
5227 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005228 try:
5229 command = [dart_format.FindDartFmtToolInChromiumTree()]
5230 if not opts.dry_run and not opts.diff:
5231 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005232 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005233
ppi@chromium.org6593d932016-03-03 15:41:15 +00005234 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005235 if opts.dry_run and stdout:
5236 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005237 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005238 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5239 'found in this checkout. Files in other languages are still '
5240 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005241
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005242 # Format GN build files. Always run on full build files for canonical form.
5243 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005244 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005245 if opts.dry_run or opts.diff:
5246 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005247 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005248 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5249 shell=sys.platform == 'win32',
5250 cwd=top_dir)
5251 if opts.dry_run and gn_ret == 2:
5252 return_value = 2 # Not formatted.
5253 elif opts.diff and gn_ret == 2:
5254 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005255 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005256 elif gn_ret != 0:
5257 # For non-dry run cases (and non-2 return values for dry-run), a
5258 # nonzero error code indicates a failure, probably because the file
5259 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005260 DieWithError('gn format failed on ' + gn_diff_file +
5261 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005262
Ilya Shermane081cbe2017-08-15 17:51:04 -07005263 # Skip the metrics formatting from the global presubmit hook. These files have
5264 # a separate presubmit hook that issues an error if the files need formatting,
5265 # whereas the top-level presubmit script merely issues a warning. Formatting
5266 # these files is somewhat slow, so it's important not to duplicate the work.
5267 if not opts.presubmit:
5268 for xml_dir in GetDirtyMetricsDirs(diff_files):
5269 tool_dir = os.path.join(top_dir, xml_dir)
5270 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5271 if opts.dry_run or opts.diff:
5272 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005273 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005274 if opts.diff:
5275 sys.stdout.write(stdout)
5276 if opts.dry_run and stdout:
5277 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005278
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005279 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005280
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005281
Steven Holte2e664bf2017-04-21 13:10:47 -07005282def GetDirtyMetricsDirs(diff_files):
5283 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5284 metrics_xml_dirs = [
5285 os.path.join('tools', 'metrics', 'actions'),
5286 os.path.join('tools', 'metrics', 'histograms'),
5287 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005288 os.path.join('tools', 'metrics', 'ukm'),
5289 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005290 for xml_dir in metrics_xml_dirs:
5291 if any(file.startswith(xml_dir) for file in xml_diff_files):
5292 yield xml_dir
5293
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005294
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005295@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005296@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005297def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005298 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005299 _, args = parser.parse_args(args)
5300
5301 if len(args) != 1:
5302 parser.print_help()
5303 return 1
5304
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005305 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005306 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005307 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005308
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005309 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005310
Edward Lemur52969c92020-02-06 18:15:28 +00005311 issueprefix = Changelist.IssueConfigKey()
5312 output = RunGit(['config', '--local', '--get-regexp',
5313 r'branch\..*\.%s' % issueprefix],
5314 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005315
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005316 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005317 for key, issue in [x.split() for x in output.splitlines()]:
5318 if issue == target_issue:
5319 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5320
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005321 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005322 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005323 return 1
5324 if len(branches) == 1:
5325 RunGit(['checkout', branches[0]])
5326 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005327 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005328 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005329 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005330 which = raw_input('Choose by index: ')
5331 try:
5332 RunGit(['checkout', branches[int(which)]])
5333 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005334 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005335 return 1
5336
5337 return 0
5338
5339
maruel@chromium.org29404b52014-09-08 22:58:00 +00005340def CMDlol(parser, args):
5341 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005342 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005343 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5344 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5345 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005346 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005347 return 0
5348
5349
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005350class OptionParser(optparse.OptionParser):
5351 """Creates the option parse and add --verbose support."""
5352 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005353 optparse.OptionParser.__init__(
5354 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005355 self.add_option(
5356 '-v', '--verbose', action='count', default=0,
5357 help='Use 2 times for more debugging info')
5358
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005359 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005360 try:
5361 return self._parse_args(args)
5362 finally:
5363 # Regardless of success or failure of args parsing, we want to report
5364 # metrics, but only after logging has been initialized (if parsing
5365 # succeeded).
5366 global settings
5367 settings = Settings()
5368
5369 if not metrics.DISABLE_METRICS_COLLECTION:
5370 # GetViewVCUrl ultimately calls logging method.
5371 project_url = settings.GetViewVCUrl().strip('/+')
5372 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5373 metrics.collector.add('project_urls', [project_url])
5374
5375 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005376 # Create an optparse.Values object that will store only the actual passed
5377 # options, without the defaults.
5378 actual_options = optparse.Values()
5379 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5380 # Create an optparse.Values object with the default options.
5381 options = optparse.Values(self.get_default_values().__dict__)
5382 # Update it with the options passed by the user.
5383 options._update_careful(actual_options.__dict__)
5384 # Store the options passed by the user in an _actual_options attribute.
5385 # We store only the keys, and not the values, since the values can contain
5386 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005387 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005388
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005389 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005390 logging.basicConfig(
5391 level=levels[min(options.verbose, len(levels) - 1)],
5392 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5393 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005394
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005395 return options, args
5396
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005397
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005398def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005399 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005400 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005401 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005402 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005403
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005404 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005405 dispatcher = subcommand.CommandDispatcher(__name__)
5406 try:
5407 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005408 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005409 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005410 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005411 if e.code != 500:
5412 raise
5413 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005414 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005415 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005416 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005417
5418
5419if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005420 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5421 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005422 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005423 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005424 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005425 sys.exit(main(sys.argv[1:]))