blob: 4d89021f5a224315dba4d4f5f7894708fc9024d1 [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)
136
vapiera7fbd5a2016-06-16 09:17:49 -0700137 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000138 sys.exit(1)
139
140
Christopher Lamf732cd52017-01-24 12:40:11 +1100141def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000142 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000143 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000144 with open(backup_path, 'w') as backup_file:
145 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100146
147
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000148def GetNoGitPagerEnv():
149 env = os.environ.copy()
150 # 'cat' is a magical git string that disables pagers on all platforms.
151 env['GIT_PAGER'] = 'cat'
152 return env
153
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000154
bsep@chromium.org627d9002016-04-29 00:00:52 +0000155def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000156 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000157 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
158 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000159 except subprocess2.CalledProcessError as e:
160 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000161 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000163 'Command "%s" failed.\n%s' % (
164 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000165 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000166
167
168def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000169 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000170 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000171
172
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000173def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000174 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700175 if suppress_stderr:
176 stderr = subprocess2.VOID
177 else:
178 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000179 try:
tandrii5d48c322016-08-18 16:19:37 -0700180 (out, _), code = subprocess2.communicate(['git'] + args,
181 env=GetNoGitPagerEnv(),
182 stdout=subprocess2.PIPE,
183 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000184 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700185 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900186 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000187 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000188
189
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000190def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000191 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000192 return RunGitWithCode(args, suppress_stderr=True)[1]
193
194
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000195def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000196 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000197 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000198 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000199 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000200
201
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000202def BranchExists(branch):
203 """Return True if specified branch exists."""
204 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
205 suppress_stderr=True)
206 return not code
207
208
tandrii2a16b952016-10-19 07:09:44 -0700209def time_sleep(seconds):
210 # Use this so that it can be mocked in tests without interfering with python
211 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700212 return time.sleep(seconds)
213
214
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000215def time_time():
216 # Use this so that it can be mocked in tests without interfering with python
217 # system machinery.
218 return time.time()
219
220
Edward Lemur1b52d872019-05-09 21:12:12 +0000221def datetime_now():
222 # Use this so that it can be mocked in tests without interfering with python
223 # system machinery.
224 return datetime.datetime.now()
225
226
maruel@chromium.org90541732011-04-01 17:54:18 +0000227def ask_for_data(prompt):
228 try:
229 return raw_input(prompt)
230 except KeyboardInterrupt:
231 # Hide the exception.
232 sys.exit(1)
233
234
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100235def confirm_or_exit(prefix='', action='confirm'):
236 """Asks user to press enter to continue or press Ctrl+C to abort."""
237 if not prefix or prefix.endswith('\n'):
238 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100239 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240 mid = ' Press'
241 elif prefix.endswith(' '):
242 mid = 'press'
243 else:
244 mid = ' press'
245 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
246
247
248def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000249 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100250 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
251 while True:
252 if 'yes'.startswith(result):
253 return True
254 if 'no'.startswith(result):
255 return False
256 result = ask_for_data('Please, type yes or no: ').lower()
257
258
tandrii5d48c322016-08-18 16:19:37 -0700259def _git_branch_config_key(branch, key):
260 """Helper method to return Git config key for a branch."""
261 assert branch, 'branch name is required to set git config for it'
262 return 'branch.%s.%s' % (branch, key)
263
264
machenbach@chromium.org45453142015-09-15 08:45:22 +0000265def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000266 prop_list = getattr(options, 'properties', [])
267 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000268 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000269 try:
270 properties[key] = json.loads(val)
271 except ValueError:
272 pass # If a value couldn't be evaluated, treat it as a string.
273 return properties
274
275
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000276# TODO(crbug.com/976104): Remove this function once git-cl try-results has
277# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000278def _buildbucket_retry(operation_name, http, *args, **kwargs):
279 """Retries requests to buildbucket service and returns parsed json content."""
280 try_count = 0
281 while True:
282 response, content = http.request(*args, **kwargs)
283 try:
284 content_json = json.loads(content)
285 except ValueError:
286 content_json = None
287
288 # Buildbucket could return an error even if status==200.
289 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000290 error = content_json.get('error')
291 if error.get('code') == 403:
292 raise BuildbucketResponseException(
293 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000294 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000295 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000296 raise BuildbucketResponseException(msg)
297
298 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700299 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000300 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000301 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700302 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000303 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000304 content)
305 return content_json
306 if response.status < 500 or try_count >= 2:
307 raise httplib2.HttpLib2Error(content)
308
309 # status >= 500 means transient failures.
310 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000311 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000312 try_count += 1
313 assert False, 'unreachable'
314
315
Edward Lemur4c707a22019-09-24 21:13:43 +0000316def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000317 """Calls a buildbucket v2 method and returns the parsed json response."""
318 headers = {
319 'Accept': 'application/json',
320 'Content-Type': 'application/json',
321 }
322 request = json.dumps(request)
323 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
324
325 logging.info('POST %s with %s' % (url, request))
326
327 attempts = 1
328 time_to_sleep = 1
329 while True:
330 response, content = http.request(url, 'POST', body=request, headers=headers)
331 if response.status == 200:
332 return json.loads(content[4:])
333 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
334 msg = '%s error when calling POST %s with %s: %s' % (
335 response.status, url, request, content)
336 raise BuildbucketResponseException(msg)
337 logging.debug(
338 '%s error when calling POST %s with %s. '
339 'Sleeping for %d seconds and retrying...' % (
340 response.status, url, request, time_to_sleep))
341 time.sleep(time_to_sleep)
342 time_to_sleep *= 2
343 attempts += 1
344
345 assert False, 'unreachable'
346
347
qyearsley1fdfcb62016-10-24 13:22:03 -0700348def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700349 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000350 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700351 """
qyearsleydd49f942016-10-28 11:57:22 -0700352 # If no bots are listed, we try to get a set of builders and tests based
353 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700354 if not options.bot:
Edward Lemur3b8094a2020-02-07 22:34:43 +0000355 change = changelist.GetChange(changelist.GetCommonAncestorWithUpstream())
qyearsley136b49f2016-10-31 09:02:26 -0700356 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700357 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700358 change=change,
359 changed_files=change.LocalPaths(),
360 repository_root=settings.GetRoot(),
361 default_presubmit=None,
362 project=None,
363 verbose=options.verbose,
364 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700365 if masters is None:
366 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000367 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700368
qyearsley1fdfcb62016-10-24 13:22:03 -0700369 if options.bucket:
370 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000371 option_parser.error(
Edward Lemur5ef16a32019-11-11 21:13:25 +0000372 'Please specify the bucket, e.g. "-B chromium/try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700373
374
Edward Lemur6215c792019-10-03 21:59:05 +0000375def _parse_bucket(raw_bucket):
376 legacy = True
377 project = bucket = None
378 if '/' in raw_bucket:
379 legacy = False
380 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000382 elif raw_bucket.startswith('luci.'):
383 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000384 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000385 elif '.' in raw_bucket:
386 project = raw_bucket.split('.')[0]
387 bucket = raw_bucket
388 # Legacy buckets.
389 if legacy:
390 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
391 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000392
393
Edward Lemur5b929a42019-10-21 17:57:39 +0000394def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000395 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700396
397 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000398 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700399 buckets: A nested dict mapping bucket names to builders to tests.
400 options: Command-line options.
401 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000402 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000403 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000404 print('Bucket:', bucket)
405 print('\n'.join(
406 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000407 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000408 print('To see results here, run: git cl try-results')
409 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700410
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000411 requests = _make_try_job_schedule_requests(
412 changelist, buckets, options, patchset)
413 if not requests:
414 return
415
Edward Lemur5b929a42019-10-21 17:57:39 +0000416 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000417 http.force_exception_to_status_code = True
418
419 batch_request = {'requests': requests}
420 batch_response = _call_buildbucket(
421 http, options.buildbucket_host, 'Batch', batch_request)
422
423 errors = [
424 ' ' + response['error']['message']
425 for response in batch_response.get('responses', [])
426 if 'error' in response
427 ]
428 if errors:
429 raise BuildbucketResponseException(
430 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
431
432
433def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000434 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000435 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000436 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000437 shared_properties['clobber'] = True
438 shared_properties.update(_get_properties_from_options(options) or {})
439
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000440 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
441 if options.retry_failed:
442 shared_tags.append({'key': 'retry_failed',
443 'value': '1'})
444
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000445 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000446 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000447 project, bucket = _parse_bucket(raw_bucket)
448 if not project or not bucket:
449 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
450 continue
451
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000452 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000453 properties = shared_properties.copy()
454 if 'presubmit' in builder.lower():
455 properties['dry_run'] = 'true'
456 if tests:
457 properties['testfilter'] = tests
458
459 requests.append({
460 'scheduleBuild': {
461 'requestId': str(uuid.uuid4()),
462 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000463 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000464 'bucket': bucket,
465 'builder': builder,
466 },
467 'gerritChanges': gerrit_changes,
468 'properties': properties,
469 'tags': [
470 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000471 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000472 }
473 })
Anthony Polito1a5fe232020-01-24 23:17:52 +0000474
475 if options.revision:
476 requests[-1]['scheduleBuild']['gitilesCommit'] = {
477 'host': gerrit_changes[0]['host'],
478 'project': gerrit_changes[0]['project'],
479 'id': options.revision
480 }
481
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000482 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000483
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000484
Edward Lemur5b929a42019-10-21 17:57:39 +0000485def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000486 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000487
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000488 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000489 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000490 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000491 request = {
492 'predicate': {
493 'gerritChanges': [changelist.GetGerritChange(patchset)],
494 },
495 'fields': ','.join('builds.*.' + field for field in fields),
496 }
tandrii221ab252016-10-06 08:12:04 -0700497
Edward Lemur5b929a42019-10-21 17:57:39 +0000498 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000499 if authenticator.has_cached_credentials():
500 http = authenticator.authorize(httplib2.Http())
501 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700502 print('Warning: Some results might be missing because %s' %
503 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000504 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000505 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000506 http.force_exception_to_status_code = True
507
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000508 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
509 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000510
Edward Lemur5b929a42019-10-21 17:57:39 +0000511def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000512 """Fetches builds from the latest patchset that has builds (within
513 the last few patchsets).
514
515 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000516 changelist (Changelist): The CL to fetch builds for
517 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000518 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
519 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000520 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000521 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
522 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000523 """
524 assert buildbucket_host
525 assert changelist.GetIssue(), 'CL must be uploaded first'
526 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000527 if latest_patchset is None:
528 assert changelist.GetMostRecentPatchset()
529 ps = changelist.GetMostRecentPatchset()
530 else:
531 assert latest_patchset > 0, latest_patchset
532 ps = latest_patchset
533
Quinten Yearsley983111f2019-09-26 17:18:48 +0000534 min_ps = max(1, ps - 5)
535 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000536 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000537 if len(builds):
538 return builds, ps
539 ps -= 1
540 return [], 0
541
542
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000543def _filter_failed_for_retry(all_builds):
544 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000545
546 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000547 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000548 i.e. a list of buildbucket.v2.Builds which includes status and builder
549 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000550
551 Returns:
552 A dict of bucket to builder to tests (empty list). This is the same format
553 accepted by _trigger_try_jobs and returned by _get_bucket_map.
554 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000555
556 def _builder_of(build):
557 builder = build['builder']
558 return (builder['project'], builder['bucket'], builder['builder'])
559
560 res = collections.defaultdict(dict)
561 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
562 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
563 # If builder had several builds, retry only if the last one failed.
564 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
565 # build, but in case of retrying failed jobs retrying a flaky one makes
566 # sense.
567 builds = list(builds)
568 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
569 continue
570 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
571 for t in builds[-1]['tags']):
572 # Don't retry experimental build previously triggered by CQ.
573 continue
574 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
575 # Don't retry if any are running.
576 continue
577 res[proj + '/' + buck][bldr] = []
578 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000579
580
qyearsleyeab3c042016-08-24 09:18:28 -0700581def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000582 """Prints nicely result of fetch_try_jobs."""
583 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000584 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585 return
586
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000587 longest_builder = max(len(b['builder']['builder']) for b in builds)
588 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000589 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000590 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
591 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 builds_by_status = {}
594 for b in builds:
595 builds_by_status.setdefault(b['status'], []).append({
596 'id': b['id'],
597 'name': name_fmt.format(
598 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
599 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000601 sort_key = lambda b: (b['name'], b['id'])
602
603 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000604 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000605 if not builds:
606 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000607
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000608 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000609 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000610 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000611 else:
612 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
613
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000614 print(colorize(title))
615 for b in sorted(builds, key=sort_key):
616 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000617
618 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000619 print_builds(
620 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
621 print_builds(
622 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
623 color=Fore.MAGENTA)
624 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
625 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
626 color=Fore.MAGENTA)
627 print_builds('Started:', builds_by_status.pop('STARTED', []))
628 print_builds(
629 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000630 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000631 print_builds(
632 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000633 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000634
635
Aiden Bennerc08566e2018-10-03 17:52:42 +0000636def _ComputeDiffLineRanges(files, upstream_commit):
637 """Gets the changed line ranges for each file since upstream_commit.
638
639 Parses a git diff on provided files and returns a dict that maps a file name
640 to an ordered list of range tuples in the form (start_line, count).
641 Ranges are in the same format as a git diff.
642 """
643 # If files is empty then diff_output will be a full diff.
644 if len(files) == 0:
645 return {}
646
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000647 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000648 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000649 diff_output = RunGit(diff_cmd)
650
651 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
652 # 2 capture groups
653 # 0 == fname of diff file
654 # 1 == 'diff_start,diff_count' or 'diff_start'
655 # will match each of
656 # diff --git a/foo.foo b/foo.py
657 # @@ -12,2 +14,3 @@
658 # @@ -12,2 +17 @@
659 # running re.findall on the above string with pattern will give
660 # [('foo.py', ''), ('', '14,3'), ('', '17')]
661
662 curr_file = None
663 line_diffs = {}
664 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
665 if match[0] != '':
666 # Will match the second filename in diff --git a/a.py b/b.py.
667 curr_file = match[0]
668 line_diffs[curr_file] = []
669 else:
670 # Matches +14,3
671 if ',' in match[1]:
672 diff_start, diff_count = match[1].split(',')
673 else:
674 # Single line changes are of the form +12 instead of +12,1.
675 diff_start = match[1]
676 diff_count = 1
677
678 diff_start = int(diff_start)
679 diff_count = int(diff_count)
680
681 # If diff_count == 0 this is a removal we can ignore.
682 line_diffs[curr_file].append((diff_start, diff_count))
683
684 return line_diffs
685
686
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000687def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000688 """Checks if a yapf file is in any parent directory of fpath until top_dir.
689
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000690 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000691 is found returns None. Uses yapf_config_cache as a cache for previously found
692 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000693 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000694 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000695 # Return result if we've already computed it.
696 if fpath in yapf_config_cache:
697 return yapf_config_cache[fpath]
698
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000699 parent_dir = os.path.dirname(fpath)
700 if os.path.isfile(fpath):
701 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000702 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000703 # Otherwise fpath is a directory
704 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
705 if os.path.isfile(yapf_file):
706 ret = yapf_file
707 elif fpath == top_dir or parent_dir == fpath:
708 # If we're at the top level directory, or if we're at root
709 # there is no provided style.
710 ret = None
711 else:
712 # Otherwise recurse on the current directory.
713 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000714 yapf_config_cache[fpath] = ret
715 return ret
716
717
Brian Sheedyb4307d52019-12-02 19:18:17 +0000718def _GetYapfIgnorePatterns(top_dir):
719 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000720
721 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
722 but this functionality appears to break when explicitly passing files to
723 yapf for formatting. According to
724 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
725 the .yapfignore file should be in the directory that yapf is invoked from,
726 which we assume to be the top level directory in this case.
727
728 Args:
729 top_dir: The top level directory for the repository being formatted.
730
731 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000732 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000733 """
734 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000735 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000736 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000737 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000738
Brian Sheedyb4307d52019-12-02 19:18:17 +0000739 with open(yapfignore_file) as f:
740 for line in f.readlines():
741 stripped_line = line.strip()
742 # Comments and blank lines should be ignored.
743 if stripped_line.startswith('#') or stripped_line == '':
744 continue
745 ignore_patterns.add(stripped_line)
746 return ignore_patterns
747
748
749def _FilterYapfIgnoredFiles(filepaths, patterns):
750 """Filters out any filepaths that match any of the given patterns.
751
752 Args:
753 filepaths: An iterable of strings containing filepaths to filter.
754 patterns: An iterable of strings containing fnmatch patterns to filter on.
755
756 Returns:
757 A list of strings containing all the elements of |filepaths| that did not
758 match any of the patterns in |patterns|.
759 """
760 # Not inlined so that tests can use the same implementation.
761 return [f for f in filepaths
762 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000763
764
Aaron Gable13101a62018-02-09 13:20:41 -0800765def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000766 """Prints statistics about the change to the user."""
767 # --no-ext-diff is broken in some versions of Git, so try to work around
768 # this by overriding the environment (but there is still a problem if the
769 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000770 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000771 if 'GIT_EXTERNAL_DIFF' in env:
772 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000773
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000774 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800775 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000776 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000777
778
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000779class BuildbucketResponseException(Exception):
780 pass
781
782
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783class Settings(object):
784 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000785 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000786 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787 self.tree_status_url = None
788 self.viewvc_url = None
789 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000790 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000791 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000792 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000793 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000794 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795
Edward Lemur26964072020-02-19 19:18:51 +0000796 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000798 if self.updated:
799 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000800
Edward Lemur26964072020-02-19 19:18:51 +0000801 # The only value that actually changes the behavior is
802 # autoupdate = "false". Everything else means "true".
803 autoupdate = (
804 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
805
806 cr_settings_file = FindCodereviewSettingsFile()
807 if autoupdate != 'false' and cr_settings_file:
808 LoadCodereviewSettingsFromFile(cr_settings_file)
809 cr_settings_file.close()
810
811 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000813 @staticmethod
814 def GetRelativeRoot():
815 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000816
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000817 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000818 if self.root is None:
819 self.root = os.path.abspath(self.GetRelativeRoot())
820 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000821
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822 def GetTreeStatusUrl(self, error_ok=False):
823 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000824 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
825 if self.tree_status_url is None and not error_ok:
826 DieWithError(
827 'You must configure your tree status URL by running '
828 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000829 return self.tree_status_url
830
831 def GetViewVCUrl(self):
832 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000833 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 return self.viewvc_url
835
rmistry@google.com90752582014-01-14 21:04:50 +0000836 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000837 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000838
rmistry@google.com5626a922015-02-26 14:03:30 +0000839 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000840 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000841 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000842 return run_post_upload_hook == "True"
843
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000844 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000845 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000846
ukai@chromium.orge8077812012-02-03 03:41:46 +0000847 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000848 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000849 if self.is_gerrit is None:
Edward Lemur26964072020-02-19 19:18:51 +0000850 self.is_gerrit = self._GetConfig('gerrit.host').lower() == 'true'
ukai@chromium.orge8077812012-02-03 03:41:46 +0000851 return self.is_gerrit
852
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000853 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000854 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000855 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700856 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000857 if self.squash_gerrit_uploads is None:
858 # Default is squash now (http://crbug.com/611892#c23).
859 self.squash_gerrit_uploads = self._GetConfig(
860 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000861 return self.squash_gerrit_uploads
862
tandriia60502f2016-06-20 02:01:53 -0700863 def GetSquashGerritUploadsOverride(self):
864 """Return True or False if codereview.settings should be overridden.
865
866 Returns None if no override has been defined.
867 """
868 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000869 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700870 if result == 'true':
871 return True
872 if result == 'false':
873 return False
874 return None
875
tandrii@chromium.org28253532016-04-14 13:46:56 +0000876 def GetGerritSkipEnsureAuthenticated(self):
877 """Return True if EnsureAuthenticated should not be done for Gerrit
878 uploads."""
879 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000880 self.gerrit_skip_ensure_authenticated = self._GetConfig(
881 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000882 return self.gerrit_skip_ensure_authenticated
883
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000884 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000885 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000886 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000887 # Git requires single quotes for paths with spaces. We need to replace
888 # them with double quotes for Windows to treat such paths as a single
889 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000890 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000891 return self.git_editor or None
892
thestig@chromium.org44202a22014-03-11 19:22:18 +0000893 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000894 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000895
896 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000897 return self._GetConfig(
898 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000899
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000900 def GetFormatFullByDefault(self):
901 if self.format_full_by_default is None:
902 result = (
903 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
904 error_ok=True).strip())
905 self.format_full_by_default = (result == 'true')
906 return self.format_full_by_default
907
Edward Lemur26964072020-02-19 19:18:51 +0000908 def _GetConfig(self, key, default=''):
909 self._LazyUpdateIfNeeded()
910 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000911
912
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000913class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000914 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000915 NONE = 'none'
916 DRY_RUN = 'dry_run'
917 COMMIT = 'commit'
918
919 ALL_STATES = [NONE, DRY_RUN, COMMIT]
920
921
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000922class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000923 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000924 self.issue = issue
925 self.patchset = patchset
926 self.hostname = hostname
927
928 @property
929 def valid(self):
930 return self.issue is not None
931
932
Edward Lemurf38bc172019-09-03 21:02:13 +0000933def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000934 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
935 fail_result = _ParsedIssueNumberArgument()
936
Edward Lemur678a6842019-10-03 22:25:05 +0000937 if isinstance(arg, int):
938 return _ParsedIssueNumberArgument(issue=arg)
939 if not isinstance(arg, basestring):
940 return fail_result
941
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000942 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000943 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000944 if not arg.startswith('http'):
945 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700946
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000947 url = gclient_utils.UpgradeToHttps(arg)
948 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000949 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000950 except ValueError:
951 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200952
Edward Lemur678a6842019-10-03 22:25:05 +0000953 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
954 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
955 # Short urls like https://domain/<issue_number> can be used, but don't allow
956 # specifying the patchset (you'd 404), but we allow that here.
957 if parsed_url.path == '/':
958 part = parsed_url.fragment
959 else:
960 part = parsed_url.path
961
962 match = re.match(
963 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
964 if not match:
965 return fail_result
966
967 issue = int(match.group('issue'))
968 patchset = match.group('patchset')
969 return _ParsedIssueNumberArgument(
970 issue=issue,
971 patchset=int(patchset) if patchset else None,
972 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000973
974
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000975def _create_description_from_log(args):
976 """Pulls out the commit log to use as a base for the CL description."""
977 log_args = []
978 if len(args) == 1 and not args[0].endswith('.'):
979 log_args = [args[0] + '..']
980 elif len(args) == 1 and args[0].endswith('...'):
981 log_args = [args[0][:-1]]
982 elif len(args) == 2:
983 log_args = [args[0] + '..' + args[1]]
984 else:
985 log_args = args[:] # Hope for the best!
986 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
987
988
Aaron Gablea45ee112016-11-22 15:14:38 -0800989class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700990 def __init__(self, issue, url):
991 self.issue = issue
992 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800993 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700994
995 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800996 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700997 self.issue, self.url)
998
999
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001000_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001001 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001002 # TODO(tandrii): these two aren't known in Gerrit.
1003 'approval', 'disapproval'])
1004
1005
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001006class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001007 """Changelist works with one changelist in local branch.
1008
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001009 Notes:
1010 * Not safe for concurrent multi-{thread,process} use.
1011 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001012 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001013 """
1014
Edward Lemur125d60a2019-09-13 18:25:41 +00001015 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001016 """Create a new ChangeList instance.
1017
Edward Lemurf38bc172019-09-03 21:02:13 +00001018 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001020 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001021 global settings
1022 if not settings:
1023 # Happens when git_cl.py is used as a utility library.
1024 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001025
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001026 self.branchref = branchref
1027 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001028 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001029 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 else:
1031 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001032 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001033 self.lookedup_issue = False
1034 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001035 self.description = None
Edward Lemur9aa1a962020-02-25 00:58:38 +00001036 self.local_description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001037 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001039 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001040 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001041 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001042 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001043
Edward Lemur125d60a2019-09-13 18:25:41 +00001044 # Lazily cached values.
1045 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1046 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1047 # Map from change number (issue) to its detail cache.
1048 self._detail_cache = {}
1049
1050 if codereview_host is not None:
1051 assert not codereview_host.startswith('https://'), codereview_host
1052 self._gerrit_host = codereview_host
1053 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001054
1055 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001056 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001057
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001058 The return value is a string suitable for passing to git cl with the --cc
1059 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001060 """
1061 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001062 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001063 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001064 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1065 return self.cc
1066
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001067 def GetCCListWithoutDefault(self):
1068 """Return the users cc'd on this CL excluding default ones."""
1069 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001070 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001071 return self.cc
1072
Daniel Cheng7227d212017-11-17 08:12:37 -08001073 def ExtendCC(self, more_cc):
1074 """Extends the list of users to cc on this CL based on the changed files."""
1075 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001076
1077 def GetBranch(self):
1078 """Returns the short branch name, e.g. 'master'."""
1079 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001080 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001081 if not branchref:
1082 return None
1083 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001084 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085 return self.branch
1086
1087 def GetBranchRef(self):
1088 """Returns the full branch name, e.g. 'refs/heads/master'."""
1089 self.GetBranch() # Poke the lazy loader.
1090 return self.branchref
1091
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001092 def ClearBranch(self):
1093 """Clears cached branch data of this object."""
1094 self.branch = self.branchref = None
1095
Edward Lemur85153282020-02-14 22:06:29 +00001096 def _GitGetBranchConfigValue(self, key, default=None):
1097 return scm.GIT.GetBranchConfig(
1098 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001099
Edward Lemur85153282020-02-14 22:06:29 +00001100 def _GitSetBranchConfigValue(self, key, value):
1101 action = 'set %s to %r' % (key, value)
1102 if not value:
1103 action = 'unset %s' % key
1104 assert self.GetBranch(), 'a branch is needed to ' + action
1105 return scm.GIT.SetBranchConfig(
1106 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001107
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001108 @staticmethod
1109 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001110 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111 e.g. 'origin', 'refs/heads/master'
1112 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001113 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1114 settings.GetRoot(), branch)
1115 if not remote or not upstream_branch:
1116 DieWithError(
1117 'Unable to determine default branch to diff against.\n'
1118 'Either pass complete "git diff"-style arguments, like\n'
1119 ' git cl upload origin/master\n'
1120 'or verify this branch is set up to track another \n'
1121 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001122
1123 return remote, upstream_branch
1124
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001125 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001126 upstream_branch = self.GetUpstreamBranch()
1127 if not BranchExists(upstream_branch):
1128 DieWithError('The upstream for the current branch (%s) does not exist '
1129 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001130 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001131 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001132
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001133 def GetUpstreamBranch(self):
1134 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001135 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001136 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001137 upstream_branch = upstream_branch.replace('refs/heads/',
1138 'refs/remotes/%s/' % remote)
1139 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1140 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 self.upstream_branch = upstream_branch
1142 return self.upstream_branch
1143
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001144 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001145 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001146 remote, branch = None, self.GetBranch()
1147 seen_branches = set()
1148 while branch not in seen_branches:
1149 seen_branches.add(branch)
1150 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001151 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001152 if remote != '.' or branch.startswith('refs/remotes'):
1153 break
1154 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001155 remotes = RunGit(['remote'], error_ok=True).split()
1156 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001157 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001158 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001159 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001160 logging.warn('Could not determine which remote this change is '
1161 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001162 else:
1163 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001164 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 branch = 'HEAD'
1166 if branch.startswith('refs/remotes'):
1167 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001168 elif branch.startswith('refs/branch-heads/'):
1169 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001170 else:
1171 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001172 return self._remote
1173
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 def GitSanityChecks(self, upstream_git_obj):
1175 """Checks git repo status and ensures diff is from local commits."""
1176
sbc@chromium.org79706062015-01-14 21:18:12 +00001177 if upstream_git_obj is None:
1178 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001179 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001180 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001181 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001182 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001183 return False
1184
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001185 # Verify the commit we're diffing against is in our current branch.
1186 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1187 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1188 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001189 print('ERROR: %s is not in the current branch. You may need to rebase '
1190 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001191 return False
1192
1193 # List the commits inside the diff, and verify they are all local.
1194 commits_in_diff = RunGit(
1195 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1196 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1197 remote_branch = remote_branch.strip()
1198 if code != 0:
1199 _, remote_branch = self.GetRemoteBranch()
1200
1201 commits_in_remote = RunGit(
1202 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1203
1204 common_commits = set(commits_in_diff) & set(commits_in_remote)
1205 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001206 print('ERROR: Your diff contains %d commits already in %s.\n'
1207 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1208 'the diff. If you are using a custom git flow, you can override'
1209 ' the reference used for this check with "git config '
1210 'gitcl.remotebranch <git-ref>".' % (
1211 len(common_commits), remote_branch, upstream_git_obj),
1212 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001213 return False
1214 return True
1215
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001216 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001217 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001218
1219 Returns None if it is not set.
1220 """
tandrii5d48c322016-08-18 16:19:37 -07001221 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001222
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223 def GetRemoteUrl(self):
1224 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1225
1226 Returns None if there is no remote.
1227 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001228 is_cached, value = self._cached_remote_url
1229 if is_cached:
1230 return value
1231
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001232 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001233 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001234
Edward Lemur298f2cf2019-02-22 21:40:39 +00001235 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001236 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001237 if host:
1238 self._cached_remote_url = (True, url)
1239 return url
1240
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001241 # If it cannot be parsed as an url, assume it is a local directory,
1242 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001243 logging.warning('"%s" doesn\'t appear to point to a git host. '
1244 'Interpreting it as a local directory.', url)
1245 if not os.path.isdir(url):
1246 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001247 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1248 'but it doesn\'t exist.',
1249 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001250 return None
1251
1252 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001253 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001254
Edward Lemur79d4f992019-11-11 23:49:02 +00001255 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001256 if not host:
1257 logging.error(
1258 'Remote "%(remote)s" for branch "%(branch)s" points to '
1259 '"%(cache_path)s", but it is misconfigured.\n'
1260 '"%(cache_path)s" must be a git repo and must have a remote named '
1261 '"%(remote)s" pointing to the git host.', {
1262 'remote': remote,
1263 'cache_path': cache_path,
1264 'branch': self.GetBranch()})
1265 return None
1266
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001267 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001268 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001269
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001270 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001271 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001272 if self.issue is None and not self.lookedup_issue:
Edward Lemur85153282020-02-14 22:06:29 +00001273 self.issue = self._GitGetBranchConfigValue(self.IssueConfigKey())
1274 if self.issue is not None:
1275 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001276 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001277 return self.issue
1278
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001279 def GetIssueURL(self):
1280 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001281 issue = self.GetIssue()
1282 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001283 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001284 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001285
Edward Lemur7f6dec02020-02-06 20:23:58 +00001286 def GetLocalDescription(self, upstream_branch):
1287 """Return the log messages of all commits up to the branch point."""
Edward Lemur9aa1a962020-02-25 00:58:38 +00001288 if self.local_description is None:
1289 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1290 self.local_description = RunGitWithCode(args)[1].strip()
1291 return self.local_description
Edward Lemur7f6dec02020-02-06 20:23:58 +00001292
Edward Lemur6c6827c2020-02-06 21:15:18 +00001293 def FetchDescription(self, pretty=False):
1294 assert self.GetIssue(), 'issue is required to query Gerrit'
1295
Edward Lemur9aa1a962020-02-25 00:58:38 +00001296 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001297 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1298 current_rev = data['current_revision']
1299 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001300
1301 if not pretty:
1302 return self.description
1303
1304 # Set width to 72 columns + 2 space indent.
1305 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1306 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1307 lines = self.description.splitlines()
1308 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309
1310 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001311 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001312 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001313 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1314 if self.patchset is not None:
1315 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001316 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001317 return self.patchset
1318
Edward Lemur9aa1a962020-02-25 00:58:38 +00001319 def GetAuthor(self):
1320 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1321
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001322 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001323 """Set this branch's patchset. If patchset=0, clears the patchset."""
1324 assert self.GetBranch()
1325 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001326 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001327 else:
1328 self.patchset = int(patchset)
1329 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001330 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001331
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001332 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001333 """Set this branch's issue. If issue isn't given, clears the issue."""
1334 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001335 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001336 issue = int(issue)
1337 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001338 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001339 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001340 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001341 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001342 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001343 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001344 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001345 else:
tandrii5d48c322016-08-18 16:19:37 -07001346 # Reset all of these just to be clean.
1347 reset_suffixes = [
1348 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001349 self.IssueConfigKey(),
1350 self.PatchsetConfigKey(),
1351 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001352 ] + self._PostUnsetIssueProperties()
1353 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001354 try:
1355 self._GitSetBranchConfigValue(prop, None)
1356 except subprocess2.CalledProcessError:
1357 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001358 msg = RunGit(['log', '-1', '--format=%B']).strip()
1359 if msg and git_footers.get_footer_change_id(msg):
1360 print('WARNING: The change patched into this branch has a Change-Id. '
1361 'Removing it.')
1362 RunGit(['commit', '--amend', '-m',
1363 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001364 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001365 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001366 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001367
Edward Lemur7f6dec02020-02-06 20:23:58 +00001368 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001369 if not self.GitSanityChecks(upstream_branch):
1370 DieWithError('\nGit sanity check failure')
1371
Edward Lemur7f6dec02020-02-06 20:23:58 +00001372 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001373 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001374 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001375 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001376 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001377 except subprocess2.CalledProcessError:
1378 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001379 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001380 'This branch probably doesn\'t exist anymore. To reset the\n'
1381 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001382 ' git branch --set-upstream-to origin/master %s\n'
1383 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001384 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001385
maruel@chromium.org52424302012-08-29 15:14:30 +00001386 issue = self.GetIssue()
1387 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001388 if issue:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001389 description = self.FetchDescription()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001390 else:
1391 # If the change was never uploaded, use the log messages of all commits
1392 # up to the branch point, as git cl upload will prefill the description
1393 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001394 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001395
Edward Lemur9aa1a962020-02-25 00:58:38 +00001396 author = self.GetAuthor()
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001397 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001398 name,
1399 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001400 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001401 files,
1402 issue,
1403 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001404 author,
1405 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001406
dsansomee2d6fd92016-09-08 00:10:47 -07001407 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001408 assert self.GetIssue(), 'issue is required to update description'
1409
1410 if gerrit_util.HasPendingChangeEdit(
1411 self._GetGerritHost(), self._GerritChangeIdentifier()):
1412 if not force:
1413 confirm_or_exit(
1414 'The description cannot be modified while the issue has a pending '
1415 'unpublished edit. Either publish the edit in the Gerrit web UI '
1416 'or delete it.\n\n', action='delete the unpublished edit')
1417
1418 gerrit_util.DeletePendingChangeEdit(
1419 self._GetGerritHost(), self._GerritChangeIdentifier())
1420 gerrit_util.SetCommitMessage(
1421 self._GetGerritHost(), self._GerritChangeIdentifier(),
1422 description, notify='NONE')
1423
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001424 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001425
Edward Lemur227d5102020-02-25 23:45:35 +00001426 def RunHook(
1427 self, committing, may_prompt, verbose, parallel, upstream, description,
1428 all_files):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001429 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
Edward Lemur227d5102020-02-25 23:45:35 +00001430 args = [
1431 '--commit' if committing else '--upload',
1432 '--author', self.GetAuthor(),
1433 '--root', settings.GetRoot(),
1434 '--upstream', upstream,
1435 ]
1436
1437 args.extend(['--verbose'] * verbose)
1438
1439 issue = self.GetIssue()
1440 patchset = self.GetPatchset()
1441 gerrit_url = self.GetCodereviewServer()
1442 if issue:
1443 args.extend(['--issue', str(issue)])
1444 if patchset:
1445 args.extend(['--patchset', str(patchset)])
1446 if gerrit_url:
1447 args.extend(['--gerrit_url', gerrit_url])
1448
1449 if may_prompt:
1450 args.append('--may_prompt')
1451 if parallel:
1452 args.append('--parallel')
1453 if all_files:
1454 args.append('--all_files')
1455
1456 with gclient_utils.temporary_file() as description_file:
1457 with gclient_utils.temporary_file() as json_output:
1458 gclient_utils.FileWrite(
1459 description_file, description.encode('utf-8'), mode='wb')
1460 args.extend(['--json_output', json_output])
1461 args.extend(['--description_file', description_file])
1462
1463 start = time_time()
1464 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1465 exit_code = p.wait()
1466 metrics.collector.add_repeated('sub_commands', {
1467 'command': 'presubmit',
1468 'execution_time': time_time() - start,
1469 'exit_code': exit_code,
1470 })
1471
1472 if exit_code:
1473 sys.exit(exit_code)
1474
1475 json_results = gclient_utils.FileRead(json_output)
1476 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001477
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001478 def CMDUpload(self, options, git_diff_args, orig_args):
1479 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001480 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001481 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001482 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001483 else:
1484 if self.GetBranch() is None:
1485 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1486
1487 # Default to diffing against common ancestor of upstream branch
1488 base_branch = self.GetCommonAncestorWithUpstream()
1489 git_diff_args = [base_branch, 'HEAD']
1490
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001491 # Fast best-effort checks to abort before running potentially expensive
1492 # hooks if uploading is likely to fail anyway. Passing these checks does
1493 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001494 self.EnsureAuthenticated(force=options.force)
1495 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001496
1497 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001498 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001499 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1500 files = [f.LocalPath() for f in change.AffectedFiles()]
1501 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001502 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001503
1504 if not options.bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001505 description = change.FullDescriptionText()
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001506 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001507 # Set the reviewer list now so that presubmit checks can access it.
Edward Lemur227d5102020-02-25 23:45:35 +00001508 change_description = ChangeDescription(description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001509 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001510 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001511 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001512 change)
Edward Lemur227d5102020-02-25 23:45:35 +00001513 description = change_description.description
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001514 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001515 may_prompt=not options.force,
1516 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001517 parallel=options.parallel,
1518 upstream=base_branch,
1519 description=description,
1520 all_files=False)
1521 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001522
Aaron Gable13101a62018-02-09 13:20:41 -08001523 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001524 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001525 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001526 self._GitSetBranchConfigValue(
1527 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001528 # Run post upload hooks, if specified.
1529 if settings.GetRunPostUploadHook():
1530 presubmit_support.DoPostUploadExecuter(
1531 change,
Edward Lemur016a0872020-02-04 22:13:28 +00001532 self.GetGerritObjForPresubmit(),
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001533 settings.GetRoot(),
1534 options.verbose,
1535 sys.stdout)
1536
1537 # Upload all dependencies if specified.
1538 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001539 print()
1540 print('--dependencies has been specified.')
1541 print('All dependent local branches will be re-uploaded.')
1542 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001543 # Remove the dependencies flag from args so that we do not end up in a
1544 # loop.
1545 orig_args.remove('--dependencies')
1546 ret = upload_branch_deps(self, orig_args)
1547 return ret
1548
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001549 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001550 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001551
1552 Issue must have been already uploaded and known.
1553 """
1554 assert new_state in _CQState.ALL_STATES
1555 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001556 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001557 vote_map = {
1558 _CQState.NONE: 0,
1559 _CQState.DRY_RUN: 1,
1560 _CQState.COMMIT: 2,
1561 }
1562 labels = {'Commit-Queue': vote_map[new_state]}
1563 notify = False if new_state == _CQState.DRY_RUN else None
1564 gerrit_util.SetReview(
1565 self._GetGerritHost(), self._GerritChangeIdentifier(),
1566 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001567 return 0
1568 except KeyboardInterrupt:
1569 raise
1570 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001571 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001572 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001573 ' * Your project has no CQ,\n'
1574 ' * You don\'t have permission to change the CQ state,\n'
1575 ' * There\'s a bug in this code (see stack trace below).\n'
1576 'Consider specifying which bots to trigger manually or asking your '
1577 'project owners for permissions or contacting Chrome Infra at:\n'
1578 'https://www.chromium.org/infra\n\n' %
1579 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001580 # Still raise exception so that stack trace is printed.
1581 raise
1582
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001583 def _GetGerritHost(self):
1584 # Lazy load of configs.
1585 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001586 if self._gerrit_host and '.' not in self._gerrit_host:
1587 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1588 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001589 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001590 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001591 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001592 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001593 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1594 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001595 return self._gerrit_host
1596
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001597 def _GetGitHost(self):
1598 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001599 remote_url = self.GetRemoteUrl()
1600 if not remote_url:
1601 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001602 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001603
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001604 def GetCodereviewServer(self):
1605 if not self._gerrit_server:
1606 # If we're on a branch then get the server potentially associated
1607 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001608 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001609 self._gerrit_server = self._GitGetBranchConfigValue(
1610 self.CodereviewServerConfigKey())
1611 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001612 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001613 if not self._gerrit_server:
1614 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1615 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001616 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001617 parts[0] = parts[0] + '-review'
1618 self._gerrit_host = '.'.join(parts)
1619 self._gerrit_server = 'https://%s' % self._gerrit_host
1620 return self._gerrit_server
1621
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001622 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001623 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001624 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001625 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001626 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001627 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001628 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001629 if project.endswith('.git'):
1630 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001631 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1632 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1633 # gitiles/git-over-https protocol. E.g.,
1634 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1635 # as
1636 # https://chromium.googlesource.com/v8/v8
1637 if project.startswith('a/'):
1638 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001639 return project
1640
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001641 def _GerritChangeIdentifier(self):
1642 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1643
1644 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001645 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001646 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001647 project = self._GetGerritProject()
1648 if project:
1649 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1650 # Fall back on still unique, but less efficient change number.
1651 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001652
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001653 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001654 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001655 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001656
tandrii5d48c322016-08-18 16:19:37 -07001657 @classmethod
1658 def PatchsetConfigKey(cls):
1659 return 'gerritpatchset'
1660
1661 @classmethod
1662 def CodereviewServerConfigKey(cls):
1663 return 'gerritserver'
1664
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001665 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001666 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001667 if settings.GetGerritSkipEnsureAuthenticated():
1668 # For projects with unusual authentication schemes.
1669 # See http://crbug.com/603378.
1670 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001671
1672 # Check presence of cookies only if using cookies-based auth method.
1673 cookie_auth = gerrit_util.Authenticator.get()
1674 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001675 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001676
Florian Mayerae510e82020-01-30 21:04:48 +00001677 remote_url = self.GetRemoteUrl()
1678 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001679 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001680 return
1681 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001682 logging.warning('Ignoring branch %(branch)s with non-https remote '
1683 '%(remote)s', {
1684 'branch': self.branch,
1685 'remote': self.GetRemoteUrl()
1686 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001687 return
1688
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001689 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001690 self.GetCodereviewServer()
1691 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001692 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001693
1694 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1695 git_auth = cookie_auth.get_auth_header(git_host)
1696 if gerrit_auth and git_auth:
1697 if gerrit_auth == git_auth:
1698 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001699 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001700 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001701 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001702 ' %s\n'
1703 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001704 ' Consider running the following command:\n'
1705 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001706 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001707 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001708 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001709 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001710 cookie_auth.get_new_password_message(git_host)))
1711 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001712 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001713 return
1714 else:
1715 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001716 ([] if gerrit_auth else [self._gerrit_host]) +
1717 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001718 DieWithError('Credentials for the following hosts are required:\n'
1719 ' %s\n'
1720 'These are read from %s (or legacy %s)\n'
1721 '%s' % (
1722 '\n '.join(missing),
1723 cookie_auth.get_gitcookies_path(),
1724 cookie_auth.get_netrc_path(),
1725 cookie_auth.get_new_password_message(git_host)))
1726
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001727 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001728 if not self.GetIssue():
1729 return
1730
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001731 status = self._GetChangeDetail()['status']
1732 if status in ('MERGED', 'ABANDONED'):
1733 DieWithError('Change %s has been %s, new uploads are not allowed' %
1734 (self.GetIssueURL(),
1735 'submitted' if status == 'MERGED' else 'abandoned'))
1736
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001737 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1738 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1739 # Apparently this check is not very important? Otherwise get_auth_email
1740 # could have been added to other implementations of Authenticator.
1741 cookies_auth = gerrit_util.Authenticator.get()
1742 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001743 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001744
1745 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001746 if self.GetIssueOwner() == cookies_user:
1747 return
1748 logging.debug('change %s owner is %s, cookies user is %s',
1749 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001750 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001751 # so ask what Gerrit thinks of this user.
1752 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1753 if details['email'] == self.GetIssueOwner():
1754 return
1755 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001756 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001757 'as %s.\n'
1758 'Uploading may fail due to lack of permissions.' %
1759 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1760 confirm_or_exit(action='upload')
1761
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001762 def _PostUnsetIssueProperties(self):
1763 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001764 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001765
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001766 def GetGerritObjForPresubmit(self):
1767 return presubmit_support.GerritAccessor(self._GetGerritHost())
1768
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001769 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001770 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001771 or CQ status, assuming adherence to a common workflow.
1772
1773 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001774 * 'error' - error from review tool (including deleted issues)
1775 * 'unsent' - no reviewers added
1776 * 'waiting' - waiting for review
1777 * 'reply' - waiting for uploader to reply to review
1778 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001779 * 'dry-run' - dry-running in the CQ
1780 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001781 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001782 """
1783 if not self.GetIssue():
1784 return None
1785
1786 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001787 data = self._GetChangeDetail([
1788 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001789 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001790 return 'error'
1791
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001792 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001793 return 'closed'
1794
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001795 cq_label = data['labels'].get('Commit-Queue', {})
1796 max_cq_vote = 0
1797 for vote in cq_label.get('all', []):
1798 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1799 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001800 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001801 if max_cq_vote == 1:
1802 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001803
Aaron Gable9ab38c62017-04-06 14:36:33 -07001804 if data['labels'].get('Code-Review', {}).get('approved'):
1805 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001806
1807 if not data.get('reviewers', {}).get('REVIEWER', []):
1808 return 'unsent'
1809
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001810 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001811 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001812 last_message_author = messages.pop().get('author', {})
1813 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001814 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1815 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001816 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001817 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001818 if last_message_author.get('_account_id') == owner:
1819 # Most recent message was by owner.
1820 return 'waiting'
1821 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001822 # Some reply from non-owner.
1823 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001824
1825 # Somehow there are no messages even though there are reviewers.
1826 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001827
1828 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001829 if not self.GetIssue():
1830 return None
1831
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001832 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001833 patchset = data['revisions'][data['current_revision']]['_number']
1834 self.SetPatchset(patchset)
1835 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836
Aaron Gable636b13f2017-07-14 10:42:48 -07001837 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001838 gerrit_util.SetReview(
1839 self._GetGerritHost(), self._GerritChangeIdentifier(),
1840 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001841
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001842 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001843 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001844 # CURRENT_REVISION is included to get the latest patchset so that
1845 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001846 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001847 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1848 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001849 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001850 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001851 robot_file_comments = gerrit_util.GetChangeRobotComments(
1852 self._GetGerritHost(), self._GerritChangeIdentifier())
1853
1854 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001855 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001856 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001857 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001858 line_comments = file_comments.setdefault(path, [])
1859 line_comments.extend(
1860 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001861
1862 # Build dictionary of file comments for easy access and sorting later.
1863 # {author+date: {path: {patchset: {line: url+message}}}}
1864 comments = collections.defaultdict(
1865 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001866 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001867 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001868 tag = comment.get('tag', '')
1869 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001870 continue
1871 key = (comment['author']['email'], comment['updated'])
1872 if comment.get('side', 'REVISION') == 'PARENT':
1873 patchset = 'Base'
1874 else:
1875 patchset = 'PS%d' % comment['patch_set']
1876 line = comment.get('line', 0)
1877 url = ('https://%s/c/%s/%s/%s#%s%s' %
1878 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1879 'b' if comment.get('side') == 'PARENT' else '',
1880 str(line) if line else ''))
1881 comments[key][path][patchset][line] = (url, comment['message'])
1882
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001883 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001884 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001885 summary = self._BuildCommentSummary(msg, comments, readable)
1886 if summary:
1887 summaries.append(summary)
1888 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001889
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001890 @staticmethod
1891 def _BuildCommentSummary(msg, comments, readable):
1892 key = (msg['author']['email'], msg['date'])
1893 # Don't bother showing autogenerated messages that don't have associated
1894 # file or line comments. this will filter out most autogenerated
1895 # messages, but will keep robot comments like those from Tricium.
1896 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1897 if is_autogenerated and not comments.get(key):
1898 return None
1899 message = msg['message']
1900 # Gerrit spits out nanoseconds.
1901 assert len(msg['date'].split('.')[-1]) == 9
1902 date = datetime.datetime.strptime(msg['date'][:-3],
1903 '%Y-%m-%d %H:%M:%S.%f')
1904 if key in comments:
1905 message += '\n'
1906 for path, patchsets in sorted(comments.get(key, {}).items()):
1907 if readable:
1908 message += '\n%s' % path
1909 for patchset, lines in sorted(patchsets.items()):
1910 for line, (url, content) in sorted(lines.items()):
1911 if line:
1912 line_str = 'Line %d' % line
1913 path_str = '%s:%d:' % (path, line)
1914 else:
1915 line_str = 'File comment'
1916 path_str = '%s:0:' % path
1917 if readable:
1918 message += '\n %s, %s: %s' % (patchset, line_str, url)
1919 message += '\n %s\n' % content
1920 else:
1921 message += '\n%s ' % path_str
1922 message += '\n%s\n' % content
1923
1924 return _CommentSummary(
1925 date=date,
1926 message=message,
1927 sender=msg['author']['email'],
1928 autogenerated=is_autogenerated,
1929 # These could be inferred from the text messages and correlated with
1930 # Code-Review label maximum, however this is not reliable.
1931 # Leaving as is until the need arises.
1932 approval=False,
1933 disapproval=False,
1934 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001935
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001936 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001937 gerrit_util.AbandonChange(
1938 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001939
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001940 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001941 gerrit_util.SubmitChange(
1942 self._GetGerritHost(), self._GerritChangeIdentifier(),
1943 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001944
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001945 def _GetChangeDetail(self, options=None):
1946 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001947 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001948 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001949
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001950 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001951 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001952 options.append('CURRENT_COMMIT')
1953
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001954 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001955 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001956 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001957
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001958 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1959 # Assumption: data fetched before with extra options is suitable
1960 # for return for a smaller set of options.
1961 # For example, if we cached data for
1962 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1963 # and request is for options=[CURRENT_REVISION],
1964 # THEN we can return prior cached data.
1965 if options_set.issubset(cached_options_set):
1966 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001967
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001968 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001969 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001970 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001971 except gerrit_util.GerritError as e:
1972 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001973 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001974 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001975
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001976 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001977 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001978
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001979 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001980 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001981 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001982 data = gerrit_util.GetChangeCommit(
1983 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001984 except gerrit_util.GerritError as e:
1985 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001986 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001987 raise
agable32978d92016-11-01 12:55:02 -07001988 return data
1989
Karen Qian40c19422019-03-13 21:28:29 +00001990 def _IsCqConfigured(self):
1991 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001992 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001993
Olivier Robin75ee7252018-04-13 10:02:56 +02001994 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001995 if git_common.is_dirty_git_tree('land'):
1996 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001997
tandriid60367b2016-06-22 05:25:12 -07001998 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001999 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002000 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002001 'which can test and land changes for you. '
2002 'Are you sure you wish to bypass it?\n',
2003 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002004 differs = True
tandriic4344b52016-08-29 06:04:54 -07002005 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002006 # Note: git diff outputs nothing if there is no diff.
2007 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002008 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002009 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002010 if detail['current_revision'] == last_upload:
2011 differs = False
2012 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002013 print('WARNING: Local branch contents differ from latest uploaded '
2014 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002015 if differs:
2016 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002017 confirm_or_exit(
2018 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2019 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002020 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002021 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002022 upstream = self.GetCommonAncestorWithUpstream()
2023 if self.GetIssue():
2024 description = self.FetchDescription()
2025 else:
2026 description = self.GetDescription(upstream)
2027 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002028 committing=True,
2029 may_prompt=not force,
2030 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002031 parallel=parallel,
2032 upstream=upstream,
2033 description=description,
2034 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002035
2036 self.SubmitIssue(wait_for_merge=True)
2037 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002038 links = self._GetChangeCommit().get('web_links', [])
2039 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002040 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002041 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002042 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002043 return 0
2044
Edward Lemurf38bc172019-09-03 21:02:13 +00002045 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002046 assert parsed_issue_arg.valid
2047
Edward Lemur125d60a2019-09-13 18:25:41 +00002048 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002049
2050 if parsed_issue_arg.hostname:
2051 self._gerrit_host = parsed_issue_arg.hostname
2052 self._gerrit_server = 'https://%s' % self._gerrit_host
2053
tandriic2405f52016-10-10 08:13:15 -07002054 try:
2055 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002056 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002057 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002058
2059 if not parsed_issue_arg.patchset:
2060 # Use current revision by default.
2061 revision_info = detail['revisions'][detail['current_revision']]
2062 patchset = int(revision_info['_number'])
2063 else:
2064 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002065 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002066 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2067 break
2068 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002069 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002070 (parsed_issue_arg.patchset, self.GetIssue()))
2071
Edward Lemur125d60a2019-09-13 18:25:41 +00002072 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002073 if remote_url.endswith('.git'):
2074 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002075 remote_url = remote_url.rstrip('/')
2076
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002077 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002078 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002079
2080 if remote_url != fetch_info['url']:
2081 DieWithError('Trying to patch a change from %s but this repo appears '
2082 'to be %s.' % (fetch_info['url'], remote_url))
2083
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002084 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002085
Aaron Gable62619a32017-06-16 08:22:09 -07002086 if force:
2087 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2088 print('Checked out commit for change %i patchset %i locally' %
2089 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002090 elif nocommit:
2091 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2092 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002093 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002094 RunGit(['cherry-pick', 'FETCH_HEAD'])
2095 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002096 (parsed_issue_arg.issue, patchset))
2097 print('Note: this created a local commit which does not have '
2098 'the same hash as the one uploaded for review. This will make '
2099 'uploading changes based on top of this branch difficult.\n'
2100 'If you want to do that, use "git cl patch --force" instead.')
2101
Stefan Zagerd08043c2017-10-12 12:07:02 -07002102 if self.GetBranch():
2103 self.SetIssue(parsed_issue_arg.issue)
2104 self.SetPatchset(patchset)
2105 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2106 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2107 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2108 else:
2109 print('WARNING: You are in detached HEAD state.\n'
2110 'The patch has been applied to your checkout, but you will not be '
2111 'able to upload a new patch set to the gerrit issue.\n'
2112 'Try using the \'-b\' option if you would like to work on a '
2113 'branch and/or upload a new patch set.')
2114
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002115 return 0
2116
tandrii16e0b4e2016-06-07 10:34:28 -07002117 def _GerritCommitMsgHookCheck(self, offer_removal):
2118 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2119 if not os.path.exists(hook):
2120 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002121 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2122 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002123 data = gclient_utils.FileRead(hook)
2124 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2125 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002126 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002127 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002128 'and may interfere with it in subtle ways.\n'
2129 'We recommend you remove the commit-msg hook.')
2130 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002131 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002132 gclient_utils.rm_file_or_tree(hook)
2133 print('Gerrit commit-msg hook removed.')
2134 else:
2135 print('OK, will keep Gerrit commit-msg hook in place.')
2136
Edward Lemur1b52d872019-05-09 21:12:12 +00002137 def _CleanUpOldTraces(self):
2138 """Keep only the last |MAX_TRACES| traces."""
2139 try:
2140 traces = sorted([
2141 os.path.join(TRACES_DIR, f)
2142 for f in os.listdir(TRACES_DIR)
2143 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2144 and not f.startswith('tmp'))
2145 ])
2146 traces_to_delete = traces[:-MAX_TRACES]
2147 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002148 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002149 except OSError:
2150 print('WARNING: Failed to remove old git traces from\n'
2151 ' %s'
2152 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002153
Edward Lemur5737f022019-05-17 01:24:00 +00002154 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002155 """Zip and write the git push traces stored in traces_dir."""
2156 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002157 traces_zip = trace_name + '-traces'
2158 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002159 # Create a temporary dir to store git config and gitcookies in. It will be
2160 # compressed and stored next to the traces.
2161 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002162 git_info_zip = trace_name + '-git-info'
2163
Edward Lemur5737f022019-05-17 01:24:00 +00002164 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002165 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002166 git_push_metadata['now'] = git_push_metadata['now'].decode(
2167 sys.stdin.encoding)
2168
Edward Lemur1b52d872019-05-09 21:12:12 +00002169 git_push_metadata['trace_name'] = trace_name
2170 gclient_utils.FileWrite(
2171 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2172
2173 # Keep only the first 6 characters of the git hashes on the packet
2174 # trace. This greatly decreases size after compression.
2175 packet_traces = os.path.join(traces_dir, 'trace-packet')
2176 if os.path.isfile(packet_traces):
2177 contents = gclient_utils.FileRead(packet_traces)
2178 gclient_utils.FileWrite(
2179 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2180 shutil.make_archive(traces_zip, 'zip', traces_dir)
2181
2182 # Collect and compress the git config and gitcookies.
2183 git_config = RunGit(['config', '-l'])
2184 gclient_utils.FileWrite(
2185 os.path.join(git_info_dir, 'git-config'),
2186 git_config)
2187
2188 cookie_auth = gerrit_util.Authenticator.get()
2189 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2190 gitcookies_path = cookie_auth.get_gitcookies_path()
2191 if os.path.isfile(gitcookies_path):
2192 gitcookies = gclient_utils.FileRead(gitcookies_path)
2193 gclient_utils.FileWrite(
2194 os.path.join(git_info_dir, 'gitcookies'),
2195 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2196 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2197
Edward Lemur1b52d872019-05-09 21:12:12 +00002198 gclient_utils.rmtree(git_info_dir)
2199
2200 def _RunGitPushWithTraces(
2201 self, change_desc, refspec, refspec_opts, git_push_metadata):
2202 """Run git push and collect the traces resulting from the execution."""
2203 # Create a temporary directory to store traces in. Traces will be compressed
2204 # and stored in a 'traces' dir inside depot_tools.
2205 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002206 trace_name = os.path.join(
2207 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002208
2209 env = os.environ.copy()
2210 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2211 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002212 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002213 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2214 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2215 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2216
2217 try:
2218 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002219 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002220 before_push = time_time()
2221 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002222 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002223 env=env,
2224 print_stdout=True,
2225 # Flush after every line: useful for seeing progress when running as
2226 # recipe.
2227 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002228 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002229 except subprocess2.CalledProcessError as e:
2230 push_returncode = e.returncode
2231 DieWithError('Failed to create a change. Please examine output above '
2232 'for the reason of the failure.\n'
2233 'Hint: run command below to diagnose common Git/Gerrit '
2234 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002235 ' git cl creds-check\n'
2236 '\n'
2237 'If git-cl is not working correctly, file a bug under the '
2238 'Infra>SDK component including the files below.\n'
2239 'Review the files before upload, since they might contain '
2240 'sensitive information.\n'
2241 'Set the Restrict-View-Google label so that they are not '
2242 'publicly accessible.\n'
2243 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002244 change_desc)
2245 finally:
2246 execution_time = time_time() - before_push
2247 metrics.collector.add_repeated('sub_commands', {
2248 'command': 'git push',
2249 'execution_time': execution_time,
2250 'exit_code': push_returncode,
2251 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2252 })
2253
Edward Lemur1b52d872019-05-09 21:12:12 +00002254 git_push_metadata['execution_time'] = execution_time
2255 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002256 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002257
Edward Lemur1b52d872019-05-09 21:12:12 +00002258 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002259 gclient_utils.rmtree(traces_dir)
2260
2261 return push_stdout
2262
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002263 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002264 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002265 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002266 # Load default for user, repo, squash=true, in this order.
2267 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002268
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002269 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002270 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002271 # This may be None; default fallback value is determined in logic below.
2272 title = options.title
2273
Dominic Battre7d1c4842017-10-27 09:17:28 +02002274 # Extract bug number from branch name.
2275 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002276 fixed = options.fixed
2277 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2278 self.GetBranch())
2279 if not bug and not fixed and match:
2280 if match.group('type') == 'bug':
2281 bug = match.group('bugnum')
2282 else:
2283 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002284
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002286 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002287 if self.GetIssue():
2288 # Try to get the message from a previous upload.
Edward Lemur6c6827c2020-02-06 21:15:18 +00002289 message = self.FetchDescription()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002290 if not message:
2291 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002292 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002293 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002294 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002295 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002296 # When uploading a subsequent patchset, -m|--message is taken
2297 # as the patchset title if --title was not provided.
2298 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002299 else:
2300 default_title = RunGit(
2301 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002302 if options.force:
2303 title = default_title
2304 else:
2305 title = ask_for_data(
2306 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002307
2308 # User requested to change description
2309 if options.edit_description:
2310 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2311 change_desc.prompt()
2312 message = change_desc.description
2313
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002314 change_id = self._GetChangeDetail()['change_id']
2315 while True:
2316 footer_change_ids = git_footers.get_footer_change_id(message)
2317 if footer_change_ids == [change_id]:
2318 break
2319 if not footer_change_ids:
2320 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002321 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002322 continue
2323 # There is already a valid footer but with different or several ids.
2324 # Doing this automatically is non-trivial as we don't want to lose
2325 # existing other footers, yet we want to append just 1 desired
2326 # Change-Id. Thus, just create a new footer, but let user verify the
2327 # new description.
2328 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002329 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002330 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002331 print(
2332 'WARNING: change %s has Change-Id footer(s):\n'
2333 ' %s\n'
2334 'but change has Change-Id %s, according to Gerrit.\n'
2335 'Please, check the proposed correction to the description, '
2336 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2337 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2338 change_id))
2339 confirm_or_exit(action='edit')
2340 change_desc.prompt()
2341
2342 message = change_desc.description
2343 if not message:
2344 DieWithError("Description is empty. Aborting...")
2345
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002346 # Continue the while loop.
2347 # Sanity check of this code - we should end up with proper message
2348 # footer.
2349 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002350 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002351 else: # if not self.GetIssue()
2352 if options.message:
2353 message = options.message
2354 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002355 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002356 if options.title:
2357 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002358 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002359 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002360 change_desc.prompt()
2361
Aaron Gableb56ad332017-01-06 15:24:31 -08002362 # On first upload, patchset title is always this string, while
2363 # --title flag gets converted to first line of message.
2364 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002365 if not change_desc.description:
2366 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002367 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002368 if len(change_ids) > 1:
2369 DieWithError('too many Change-Id footers, at most 1 allowed.')
2370 if not change_ids:
2371 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002372 change_desc.set_description(git_footers.add_footer_change_id(
2373 change_desc.description,
2374 GenerateGerritChangeId(change_desc.description)))
2375 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002376 assert len(change_ids) == 1
2377 change_id = change_ids[0]
2378
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002379 if options.reviewers or options.tbrs or options.add_owners_to:
2380 change_desc.update_reviewers(options.reviewers, options.tbrs,
2381 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002382 if options.preserve_tryjobs:
2383 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002384
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002385 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002386 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2387 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002388 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002389 with gclient_utils.temporary_file() as desc_tempfile:
2390 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2391 ref_to_push = RunGit(
2392 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002393 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002394 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002395 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002396 if not change_desc.description:
2397 DieWithError("Description is empty. Aborting...")
2398
2399 if not git_footers.get_footer_change_id(change_desc.description):
2400 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002401 change_desc.set_description(
2402 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002403 if options.reviewers or options.tbrs or options.add_owners_to:
2404 change_desc.update_reviewers(options.reviewers, options.tbrs,
2405 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002406 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002407 # For no-squash mode, we assume the remote called "origin" is the one we
2408 # want. It is not worthwhile to support different workflows for
2409 # no-squash mode.
2410 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002411 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2412
2413 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002414 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002415 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2416 ref_to_push)]).splitlines()
2417 if len(commits) > 1:
2418 print('WARNING: This will upload %d commits. Run the following command '
2419 'to see which commits will be uploaded: ' % len(commits))
2420 print('git log %s..%s' % (parent, ref_to_push))
2421 print('You can also use `git squash-branch` to squash these into a '
2422 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002423 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002424
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002425 if options.reviewers or options.tbrs or options.add_owners_to:
2426 change_desc.update_reviewers(options.reviewers, options.tbrs,
2427 options.add_owners_to, change)
2428
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002429 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002430 cc = []
2431 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2432 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2433 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002434 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002435 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002436 if options.cc:
2437 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002438 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002439 if change_desc.get_cced():
2440 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002441 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2442 valid_accounts = set(reviewers + cc)
2443 # TODO(crbug/877717): relax this for all hosts.
2444 else:
2445 valid_accounts = gerrit_util.ValidAccounts(
2446 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002447 logging.info('accounts %s are recognized, %s invalid',
2448 sorted(valid_accounts),
2449 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002450
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002451 # Extra options that can be specified at push time. Doc:
2452 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002453 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002454
Aaron Gable844cf292017-06-28 11:32:59 -07002455 # By default, new changes are started in WIP mode, and subsequent patchsets
2456 # don't send email. At any time, passing --send-mail will mark the change
2457 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002458 if options.send_mail:
2459 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002460 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002461 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002462 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002463 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002464 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002465
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002466 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002467 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002468
Aaron Gable9b713dd2016-12-14 16:04:21 -08002469 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002470 # Punctuation and whitespace in |title| must be percent-encoded.
2471 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002472
agablec6787972016-09-09 16:13:34 -07002473 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002474 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002475
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002476 for r in sorted(reviewers):
2477 if r in valid_accounts:
2478 refspec_opts.append('r=%s' % r)
2479 reviewers.remove(r)
2480 else:
2481 # TODO(tandrii): this should probably be a hard failure.
2482 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2483 % r)
2484 for c in sorted(cc):
2485 # refspec option will be rejected if cc doesn't correspond to an
2486 # account, even though REST call to add such arbitrary cc may succeed.
2487 if c in valid_accounts:
2488 refspec_opts.append('cc=%s' % c)
2489 cc.remove(c)
2490
rmistry9eadede2016-09-19 11:22:43 -07002491 if options.topic:
2492 # Documentation on Gerrit topics is here:
2493 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002494 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002495
Edward Lemur687ca902018-12-05 02:30:30 +00002496 if options.enable_auto_submit:
2497 refspec_opts.append('l=Auto-Submit+1')
2498 if options.use_commit_queue:
2499 refspec_opts.append('l=Commit-Queue+2')
2500 elif options.cq_dry_run:
2501 refspec_opts.append('l=Commit-Queue+1')
2502
2503 if change_desc.get_reviewers(tbr_only=True):
2504 score = gerrit_util.GetCodeReviewTbrScore(
2505 self._GetGerritHost(),
2506 self._GetGerritProject())
2507 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002508
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002509 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002510 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002511 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002512 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002513 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2514
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002515 refspec_suffix = ''
2516 if refspec_opts:
2517 refspec_suffix = '%' + ','.join(refspec_opts)
2518 assert ' ' not in refspec_suffix, (
2519 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2520 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2521
Edward Lemur1b52d872019-05-09 21:12:12 +00002522 git_push_metadata = {
2523 'gerrit_host': self._GetGerritHost(),
2524 'title': title or '<untitled>',
2525 'change_id': change_id,
2526 'description': change_desc.description,
2527 }
2528 push_stdout = self._RunGitPushWithTraces(
2529 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002530
2531 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002532 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002533 change_numbers = [m.group(1)
2534 for m in map(regex.match, push_stdout.splitlines())
2535 if m]
2536 if len(change_numbers) != 1:
2537 DieWithError(
2538 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002539 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002540 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002541 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002542
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002543 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002544 # GetIssue() is not set in case of non-squash uploads according to tests.
2545 # TODO(agable): non-squash uploads in git cl should be removed.
2546 gerrit_util.AddReviewers(
2547 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002548 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002549 reviewers, cc,
2550 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002551
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002552 return 0
2553
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002554 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2555 change_desc):
2556 """Computes parent of the generated commit to be uploaded to Gerrit.
2557
2558 Returns revision or a ref name.
2559 """
2560 if custom_cl_base:
2561 # Try to avoid creating additional unintended CLs when uploading, unless
2562 # user wants to take this risk.
2563 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2564 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2565 local_ref_of_target_remote])
2566 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002567 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002568 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2569 'If you proceed with upload, more than 1 CL may be created by '
2570 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2571 'If you are certain that specified base `%s` has already been '
2572 'uploaded to Gerrit as another CL, you may proceed.\n' %
2573 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2574 if not force:
2575 confirm_or_exit(
2576 'Do you take responsibility for cleaning up potential mess '
2577 'resulting from proceeding with upload?',
2578 action='upload')
2579 return custom_cl_base
2580
Aaron Gablef97e33d2017-03-30 15:44:27 -07002581 if remote != '.':
2582 return self.GetCommonAncestorWithUpstream()
2583
2584 # If our upstream branch is local, we base our squashed commit on its
2585 # squashed version.
2586 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2587
Aaron Gablef97e33d2017-03-30 15:44:27 -07002588 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002589 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002590
2591 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002592 # TODO(tandrii): consider checking parent change in Gerrit and using its
2593 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2594 # the tree hash of the parent branch. The upside is less likely bogus
2595 # requests to reupload parent change just because it's uploadhash is
2596 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002597 parent = RunGit(['config',
2598 'branch.%s.gerritsquashhash' % upstream_branch_name],
2599 error_ok=True).strip()
2600 # Verify that the upstream branch has been uploaded too, otherwise
2601 # Gerrit will create additional CLs when uploading.
2602 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2603 RunGitSilent(['rev-parse', parent + ':'])):
2604 DieWithError(
2605 '\nUpload upstream branch %s first.\n'
2606 'It is likely that this branch has been rebased since its last '
2607 'upload, so you just need to upload it again.\n'
2608 '(If you uploaded it with --no-squash, then branch dependencies '
2609 'are not supported, and you should reupload with --squash.)'
2610 % upstream_branch_name,
2611 change_desc)
2612 return parent
2613
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002614 def _AddChangeIdToCommitMessage(self, options, args):
2615 """Re-commits using the current message, assumes the commit hook is in
2616 place.
2617 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002618 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002619 git_command = ['commit', '--amend', '-m', log_desc]
2620 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002621 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002622 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002623 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002624 return new_log_desc
2625 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002626 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002627
tandriie113dfd2016-10-11 10:20:12 -07002628 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002629 try:
2630 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002631 except GerritChangeNotExists:
2632 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002633
2634 if data['status'] in ('ABANDONED', 'MERGED'):
2635 return 'CL %s is closed' % self.GetIssue()
2636
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002637 def GetGerritChange(self, patchset=None):
2638 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002639 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002640 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002641 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002642 data = self._GetChangeDetail(['ALL_REVISIONS'])
2643
2644 assert host and issue and patchset, 'CL must be uploaded first'
2645
2646 has_patchset = any(
2647 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002648 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002649 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002650 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002651 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002652
tandrii8c5a3532016-11-04 07:52:02 -07002653 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002654 'host': host,
2655 'change': issue,
2656 'project': data['project'],
2657 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002658 }
tandriie113dfd2016-10-11 10:20:12 -07002659
tandriide281ae2016-10-12 06:02:30 -07002660 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002661 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002662
Edward Lemur707d70b2018-02-07 00:50:14 +01002663 def GetReviewers(self):
2664 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002665 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002666
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002667
tandriif9aefb72016-07-01 09:06:51 -07002668def _get_bug_line_values(default_project, bugs):
2669 """Given default_project and comma separated list of bugs, yields bug line
2670 values.
2671
2672 Each bug can be either:
2673 * a number, which is combined with default_project
2674 * string, which is left as is.
2675
2676 This function may produce more than one line, because bugdroid expects one
2677 project per line.
2678
2679 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2680 ['v8:123', 'chromium:789']
2681 """
2682 default_bugs = []
2683 others = []
2684 for bug in bugs.split(','):
2685 bug = bug.strip()
2686 if bug:
2687 try:
2688 default_bugs.append(int(bug))
2689 except ValueError:
2690 others.append(bug)
2691
2692 if default_bugs:
2693 default_bugs = ','.join(map(str, default_bugs))
2694 if default_project:
2695 yield '%s:%s' % (default_project, default_bugs)
2696 else:
2697 yield default_bugs
2698 for other in sorted(others):
2699 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2700 yield other
2701
2702
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002703class ChangeDescription(object):
2704 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002705 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002706 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002707 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002708 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002709 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002710 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2711 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002712 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002713 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002714
Dan Beamd8b04ca2019-10-10 21:23:26 +00002715 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002716 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002717 if bug:
2718 regexp = re.compile(self.BUG_LINE)
2719 prefix = settings.GetBugPrefix()
2720 if not any((regexp.match(line) for line in self._description_lines)):
2721 values = list(_get_bug_line_values(prefix, bug))
2722 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002723 if fixed:
2724 regexp = re.compile(self.FIXED_LINE)
2725 prefix = settings.GetBugPrefix()
2726 if not any((regexp.match(line) for line in self._description_lines)):
2727 values = list(_get_bug_line_values(prefix, fixed))
2728 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002729
agable@chromium.org42c20792013-09-12 17:34:49 +00002730 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002731 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002732 return '\n'.join(self._description_lines)
2733
2734 def set_description(self, desc):
2735 if isinstance(desc, basestring):
2736 lines = desc.splitlines()
2737 else:
2738 lines = [line.rstrip() for line in desc]
2739 while lines and not lines[0]:
2740 lines.pop(0)
2741 while lines and not lines[-1]:
2742 lines.pop(-1)
2743 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002744
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002745 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2746 """Rewrites the R=/TBR= line(s) as a single line each.
2747
2748 Args:
2749 reviewers (list(str)) - list of additional emails to use for reviewers.
2750 tbrs (list(str)) - list of additional emails to use for TBRs.
2751 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2752 the change that are missing OWNER coverage. If this is not None, you
2753 must also pass a value for `change`.
2754 change (Change) - The Change that should be used for OWNERS lookups.
2755 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002756 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002757 assert isinstance(tbrs, list), tbrs
2758
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002759 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002760 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002761
2762 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002763 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002764
2765 reviewers = set(reviewers)
2766 tbrs = set(tbrs)
2767 LOOKUP = {
2768 'TBR': tbrs,
2769 'R': reviewers,
2770 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002771
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002772 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002773 regexp = re.compile(self.R_LINE)
2774 matches = [regexp.match(line) for line in self._description_lines]
2775 new_desc = [l for i, l in enumerate(self._description_lines)
2776 if not matches[i]]
2777 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002778
agable@chromium.org42c20792013-09-12 17:34:49 +00002779 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002780
2781 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002782 for match in matches:
2783 if not match:
2784 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002785 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2786
2787 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002788 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002789 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002790 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002791 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002792 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002793 LOOKUP[add_owners_to].update(
2794 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002795
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002796 # If any folks ended up in both groups, remove them from tbrs.
2797 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002798
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002799 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2800 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002801
2802 # Put the new lines in the description where the old first R= line was.
2803 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2804 if 0 <= line_loc < len(self._description_lines):
2805 if new_tbr_line:
2806 self._description_lines.insert(line_loc, new_tbr_line)
2807 if new_r_line:
2808 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002809 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002810 if new_r_line:
2811 self.append_footer(new_r_line)
2812 if new_tbr_line:
2813 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002814
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002815 def set_preserve_tryjobs(self):
2816 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2817 footers = git_footers.parse_footers(self.description)
2818 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2819 if v.lower() == 'true':
2820 return
2821 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2822
Anthony Polito8b955342019-09-24 19:01:36 +00002823 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002824 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002825 self.set_description([
2826 '# Enter a description of the change.',
2827 '# This will be displayed on the codereview site.',
2828 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002829 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002830 '--------------------',
2831 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002832 bug_regexp = re.compile(self.BUG_LINE)
2833 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002834 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002835 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2836 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002837 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002838
agable@chromium.org42c20792013-09-12 17:34:49 +00002839 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002840 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002841 if not content:
2842 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002843 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002844
Bruce Dawson2377b012018-01-11 16:46:49 -08002845 # Strip off comments and default inserted "Bug:" line.
2846 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002847 (line.startswith('#') or
2848 line.rstrip() == "Bug:" or
2849 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002850 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002851 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002852 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002853
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002854 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002855 """Adds a footer line to the description.
2856
2857 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2858 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2859 that Gerrit footers are always at the end.
2860 """
2861 parsed_footer_line = git_footers.parse_footer(line)
2862 if parsed_footer_line:
2863 # Line is a gerrit footer in the form: Footer-Key: any value.
2864 # Thus, must be appended observing Gerrit footer rules.
2865 self.set_description(
2866 git_footers.add_footer(self.description,
2867 key=parsed_footer_line[0],
2868 value=parsed_footer_line[1]))
2869 return
2870
2871 if not self._description_lines:
2872 self._description_lines.append(line)
2873 return
2874
2875 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2876 if gerrit_footers:
2877 # git_footers.split_footers ensures that there is an empty line before
2878 # actual (gerrit) footers, if any. We have to keep it that way.
2879 assert top_lines and top_lines[-1] == ''
2880 top_lines, separator = top_lines[:-1], top_lines[-1:]
2881 else:
2882 separator = [] # No need for separator if there are no gerrit_footers.
2883
2884 prev_line = top_lines[-1] if top_lines else ''
2885 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2886 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2887 top_lines.append('')
2888 top_lines.append(line)
2889 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002890
tandrii99a72f22016-08-17 14:33:24 -07002891 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002893 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002894 reviewers = [match.group(2).strip()
2895 for match in matches
2896 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002897 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002898
bradnelsond975b302016-10-23 12:20:23 -07002899 def get_cced(self):
2900 """Retrieves the list of reviewers."""
2901 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2902 cced = [match.group(2).strip() for match in matches if match]
2903 return cleanup_list(cced)
2904
Nodir Turakulov23b82142017-11-16 11:04:25 -08002905 def get_hash_tags(self):
2906 """Extracts and sanitizes a list of Gerrit hashtags."""
2907 subject = (self._description_lines or ('',))[0]
2908 subject = re.sub(
2909 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2910
2911 tags = []
2912 start = 0
2913 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2914 while True:
2915 m = bracket_exp.match(subject, start)
2916 if not m:
2917 break
2918 tags.append(self.sanitize_hash_tag(m.group(1)))
2919 start = m.end()
2920
2921 if not tags:
2922 # Try "Tag: " prefix.
2923 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2924 if m:
2925 tags.append(self.sanitize_hash_tag(m.group(1)))
2926 return tags
2927
2928 @classmethod
2929 def sanitize_hash_tag(cls, tag):
2930 """Returns a sanitized Gerrit hash tag.
2931
2932 A sanitized hashtag can be used as a git push refspec parameter value.
2933 """
2934 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2935
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002936 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2937 """Updates this commit description given the parent.
2938
2939 This is essentially what Gnumbd used to do.
2940 Consult https://goo.gl/WMmpDe for more details.
2941 """
2942 assert parent_msg # No, orphan branch creation isn't supported.
2943 assert parent_hash
2944 assert dest_ref
2945 parent_footer_map = git_footers.parse_footers(parent_msg)
2946 # This will also happily parse svn-position, which GnumbD is no longer
2947 # supporting. While we'd generate correct footers, the verifier plugin
2948 # installed in Gerrit will block such commit (ie git push below will fail).
2949 parent_position = git_footers.get_position(parent_footer_map)
2950
2951 # Cherry-picks may have last line obscuring their prior footers,
2952 # from git_footers perspective. This is also what Gnumbd did.
2953 cp_line = None
2954 if (self._description_lines and
2955 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2956 cp_line = self._description_lines.pop()
2957
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002958 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002959
2960 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2961 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002962 for i, line in enumerate(footer_lines):
2963 k, v = git_footers.parse_footer(line) or (None, None)
2964 if k and k.startswith('Cr-'):
2965 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002966
2967 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002968 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002969 if parent_position[0] == dest_ref:
2970 # Same branch as parent.
2971 number = int(parent_position[1]) + 1
2972 else:
2973 number = 1 # New branch, and extra lineage.
2974 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2975 int(parent_position[1])))
2976
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002977 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2978 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002979
2980 self._description_lines = top_lines
2981 if cp_line:
2982 self._description_lines.append(cp_line)
2983 if self._description_lines[-1] != '':
2984 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002985 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002986
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002987
Aaron Gablea1bab272017-04-11 16:38:18 -07002988def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002989 """Retrieves the reviewers that approved a CL from the issue properties with
2990 messages.
2991
2992 Note that the list may contain reviewers that are not committer, thus are not
2993 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002994
2995 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002996 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002997 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002998 return sorted(
2999 set(
3000 message['sender']
3001 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003002 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003003 )
3004 )
3005
3006
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003007def FindCodereviewSettingsFile(filename='codereview.settings'):
3008 """Finds the given file starting in the cwd and going up.
3009
3010 Only looks up to the top of the repository unless an
3011 'inherit-review-settings-ok' file exists in the root of the repository.
3012 """
3013 inherit_ok_file = 'inherit-review-settings-ok'
3014 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003015 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003016 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3017 root = '/'
3018 while True:
3019 if filename in os.listdir(cwd):
3020 if os.path.isfile(os.path.join(cwd, filename)):
3021 return open(os.path.join(cwd, filename))
3022 if cwd == root:
3023 break
3024 cwd = os.path.dirname(cwd)
3025
3026
3027def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003028 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003029 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003030
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003031 def SetProperty(name, setting, unset_error_ok=False):
3032 fullname = 'rietveld.' + name
3033 if setting in keyvals:
3034 RunGit(['config', fullname, keyvals[setting]])
3035 else:
3036 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3037
tandrii48df5812016-10-17 03:55:37 -07003038 if not keyvals.get('GERRIT_HOST', False):
3039 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003040 # Only server setting is required. Other settings can be absent.
3041 # In that case, we ignore errors raised during option deletion attempt.
3042 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3043 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3044 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003045 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003046 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3047 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003048 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3049 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003050 SetProperty(
3051 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003052
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003053 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003054 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003055
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003056 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003057 RunGit(['config', 'gerrit.squash-uploads',
3058 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003059
tandrii@chromium.org28253532016-04-14 13:46:56 +00003060 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003061 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003062 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3063
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003064 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003065 # should be of the form
3066 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3067 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003068 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3069 keyvals['ORIGIN_URL_CONFIG']])
3070
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003071
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003072def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003073 """Downloads a network object to a local file, like urllib.urlretrieve.
3074
3075 This is necessary because urllib is broken for SSL connections via a proxy.
3076 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003077 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003078 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003079
3080
ukai@chromium.org712d6102013-11-27 00:52:58 +00003081def hasSheBang(fname):
3082 """Checks fname is a #! script."""
3083 with open(fname) as f:
3084 return f.read(2).startswith('#!')
3085
3086
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003087# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3088def DownloadHooks(*args, **kwargs):
3089 pass
3090
3091
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003092def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003093 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003094
3095 Args:
3096 force: True to update hooks. False to install hooks if not present.
3097 """
3098 if not settings.GetIsGerrit():
3099 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003100 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003101 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3102 if not os.access(dst, os.X_OK):
3103 if os.path.exists(dst):
3104 if not force:
3105 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003106 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003107 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003108 if not hasSheBang(dst):
3109 DieWithError('Not a script: %s\n'
3110 'You need to download from\n%s\n'
3111 'into .git/hooks/commit-msg and '
3112 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003113 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3114 except Exception:
3115 if os.path.exists(dst):
3116 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003117 DieWithError('\nFailed to download hooks.\n'
3118 'You need to download from\n%s\n'
3119 'into .git/hooks/commit-msg and '
3120 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003121
3122
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003123class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003124 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003125
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003126 _GOOGLESOURCE = 'googlesource.com'
3127
3128 def __init__(self):
3129 # Cached list of [host, identity, source], where source is either
3130 # .gitcookies or .netrc.
3131 self._all_hosts = None
3132
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003133 def ensure_configured_gitcookies(self):
3134 """Runs checks and suggests fixes to make git use .gitcookies from default
3135 path."""
3136 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3137 configured_path = RunGitSilent(
3138 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003139 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003140 if configured_path:
3141 self._ensure_default_gitcookies_path(configured_path, default)
3142 else:
3143 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003144
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003145 @staticmethod
3146 def _ensure_default_gitcookies_path(configured_path, default_path):
3147 assert configured_path
3148 if configured_path == default_path:
3149 print('git is already configured to use your .gitcookies from %s' %
3150 configured_path)
3151 return
3152
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003153 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003154 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3155 (configured_path, default_path))
3156
3157 if not os.path.exists(configured_path):
3158 print('However, your configured .gitcookies file is missing.')
3159 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3160 action='reconfigure')
3161 RunGit(['config', '--global', 'http.cookiefile', default_path])
3162 return
3163
3164 if os.path.exists(default_path):
3165 print('WARNING: default .gitcookies file already exists %s' %
3166 default_path)
3167 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3168 default_path)
3169
3170 confirm_or_exit('Move existing .gitcookies to default location?',
3171 action='move')
3172 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003173 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003174 print('Moved and reconfigured git to use .gitcookies from %s' %
3175 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003176
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003177 @staticmethod
3178 def _configure_gitcookies_path(default_path):
3179 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3180 if os.path.exists(netrc_path):
3181 print('You seem to be using outdated .netrc for git credentials: %s' %
3182 netrc_path)
3183 print('This tool will guide you through setting up recommended '
3184 '.gitcookies store for git credentials.\n'
3185 '\n'
3186 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3187 ' git config --global --unset http.cookiefile\n'
3188 ' mv %s %s.backup\n\n' % (default_path, default_path))
3189 confirm_or_exit(action='setup .gitcookies')
3190 RunGit(['config', '--global', 'http.cookiefile', default_path])
3191 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003192
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003193 def get_hosts_with_creds(self, include_netrc=False):
3194 if self._all_hosts is None:
3195 a = gerrit_util.CookiesAuthenticator()
3196 self._all_hosts = [
3197 (h, u, s)
3198 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003199 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3200 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003201 )
3202 if h.endswith(self._GOOGLESOURCE)
3203 ]
3204
3205 if include_netrc:
3206 return self._all_hosts
3207 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3208
3209 def print_current_creds(self, include_netrc=False):
3210 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3211 if not hosts:
3212 print('No Git/Gerrit credentials found')
3213 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003214 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003215 header = [('Host', 'User', 'Which file'),
3216 ['=' * l for l in lengths]]
3217 for row in (header + hosts):
3218 print('\t'.join((('%%+%ds' % l) % s)
3219 for l, s in zip(lengths, row)))
3220
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003221 @staticmethod
3222 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003223 """Parses identity "git-<username>.domain" into <username> and domain."""
3224 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003225 # distinguishable from sub-domains. But we do know typical domains:
3226 if identity.endswith('.chromium.org'):
3227 domain = 'chromium.org'
3228 username = identity[:-len('.chromium.org')]
3229 else:
3230 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003231 if username.startswith('git-'):
3232 username = username[len('git-'):]
3233 return username, domain
3234
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003235 def _canonical_git_googlesource_host(self, host):
3236 """Normalizes Gerrit hosts (with '-review') to Git host."""
3237 assert host.endswith(self._GOOGLESOURCE)
3238 # Prefix doesn't include '.' at the end.
3239 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3240 if prefix.endswith('-review'):
3241 prefix = prefix[:-len('-review')]
3242 return prefix + '.' + self._GOOGLESOURCE
3243
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003244 def _canonical_gerrit_googlesource_host(self, host):
3245 git_host = self._canonical_git_googlesource_host(host)
3246 prefix = git_host.split('.', 1)[0]
3247 return prefix + '-review.' + self._GOOGLESOURCE
3248
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003249 def _get_counterpart_host(self, host):
3250 assert host.endswith(self._GOOGLESOURCE)
3251 git = self._canonical_git_googlesource_host(host)
3252 gerrit = self._canonical_gerrit_googlesource_host(git)
3253 return git if gerrit == host else gerrit
3254
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003255 def has_generic_host(self):
3256 """Returns whether generic .googlesource.com has been configured.
3257
3258 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3259 """
3260 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3261 if host == '.' + self._GOOGLESOURCE:
3262 return True
3263 return False
3264
3265 def _get_git_gerrit_identity_pairs(self):
3266 """Returns map from canonic host to pair of identities (Git, Gerrit).
3267
3268 One of identities might be None, meaning not configured.
3269 """
3270 host_to_identity_pairs = {}
3271 for host, identity, _ in self.get_hosts_with_creds():
3272 canonical = self._canonical_git_googlesource_host(host)
3273 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3274 idx = 0 if canonical == host else 1
3275 pair[idx] = identity
3276 return host_to_identity_pairs
3277
3278 def get_partially_configured_hosts(self):
3279 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003280 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003281 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003282 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003283
3284 def get_conflicting_hosts(self):
3285 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003286 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003287 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003288 if None not in (i1, i2) and i1 != i2)
3289
3290 def get_duplicated_hosts(self):
3291 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003292 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003293
3294 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3295 'chromium.googlesource.com': 'chromium.org',
3296 'chrome-internal.googlesource.com': 'google.com',
3297 }
3298
3299 def get_hosts_with_wrong_identities(self):
3300 """Finds hosts which **likely** reference wrong identities.
3301
3302 Note: skips hosts which have conflicting identities for Git and Gerrit.
3303 """
3304 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003305 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003306 pair = self._get_git_gerrit_identity_pairs().get(host)
3307 if pair and pair[0] == pair[1]:
3308 _, domain = self._parse_identity(pair[0])
3309 if domain != expected:
3310 hosts.add(host)
3311 return hosts
3312
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003313 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003314 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003315 hosts = sorted(hosts)
3316 assert hosts
3317 if extra_column_func is None:
3318 extras = [''] * len(hosts)
3319 else:
3320 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003321 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3322 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003323 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003324 lines.append(tmpl % he)
3325 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003326
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003327 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003328 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003329 yield ('.googlesource.com wildcard record detected',
3330 ['Chrome Infrastructure team recommends to list full host names '
3331 'explicitly.'],
3332 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003333
3334 dups = self.get_duplicated_hosts()
3335 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003336 yield ('The following hosts were defined twice',
3337 self._format_hosts(dups),
3338 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003339
3340 partial = self.get_partially_configured_hosts()
3341 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003342 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3343 'These hosts are missing',
3344 self._format_hosts(partial, lambda host: 'but %s defined' %
3345 self._get_counterpart_host(host)),
3346 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003347
3348 conflicting = self.get_conflicting_hosts()
3349 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003350 yield ('The following Git hosts have differing credentials from their '
3351 'Gerrit counterparts',
3352 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3353 tuple(self._get_git_gerrit_identity_pairs()[host])),
3354 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003355
3356 wrong = self.get_hosts_with_wrong_identities()
3357 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003358 yield ('These hosts likely use wrong identity',
3359 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3360 (self._get_git_gerrit_identity_pairs()[host][0],
3361 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3362 wrong)
3363
3364 def find_and_report_problems(self):
3365 """Returns True if there was at least one problem, else False."""
3366 found = False
3367 bad_hosts = set()
3368 for title, sublines, hosts in self._find_problems():
3369 if not found:
3370 found = True
3371 print('\n\n.gitcookies problem report:\n')
3372 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003373 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003374 if sublines:
3375 print()
3376 print(' %s' % '\n '.join(sublines))
3377 print()
3378
3379 if bad_hosts:
3380 assert found
3381 print(' You can manually remove corresponding lines in your %s file and '
3382 'visit the following URLs with correct account to generate '
3383 'correct credential lines:\n' %
3384 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3385 print(' %s' % '\n '.join(sorted(set(
3386 gerrit_util.CookiesAuthenticator().get_new_password_url(
3387 self._canonical_git_googlesource_host(host))
3388 for host in bad_hosts
3389 ))))
3390 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003391
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003392
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003393@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003394def CMDcreds_check(parser, args):
3395 """Checks credentials and suggests changes."""
3396 _, _ = parser.parse_args(args)
3397
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003398 # Code below checks .gitcookies. Abort if using something else.
3399 authn = gerrit_util.Authenticator.get()
3400 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3401 if isinstance(authn, gerrit_util.GceAuthenticator):
3402 DieWithError(
3403 'This command is not designed for GCE, are you on a bot?\n'
3404 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3405 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003406 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003407 'This command is not designed for bot environment. It checks '
3408 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003409
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003410 checker = _GitCookiesChecker()
3411 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003412
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003413 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003414 checker.print_current_creds(include_netrc=True)
3415
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003416 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003417 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003418 return 0
3419 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003420
3421
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003422@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003423def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003424 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003425 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003426 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003427 _, args = parser.parse_args(args)
3428 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003429 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003430 return RunGit(['config', 'branch.%s.base-url' % branch],
3431 error_ok=False).strip()
3432 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003433 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003434 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3435 error_ok=False).strip()
3436
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003437
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003438def color_for_status(status):
3439 """Maps a Changelist status to color, for CMDstatus and other tools."""
3440 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003441 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003442 'waiting': Fore.BLUE,
3443 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003444 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003445 'lgtm': Fore.GREEN,
3446 'commit': Fore.MAGENTA,
3447 'closed': Fore.CYAN,
3448 'error': Fore.WHITE,
3449 }.get(status, Fore.WHITE)
3450
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003451
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003452def get_cl_statuses(changes, fine_grained, max_processes=None):
3453 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003454
3455 If fine_grained is true, this will fetch CL statuses from the server.
3456 Otherwise, simply indicate if there's a matching url for the given branches.
3457
3458 If max_processes is specified, it is used as the maximum number of processes
3459 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3460 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003461
3462 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003463 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003464 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003465 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003466
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003467 if not fine_grained:
3468 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003469 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003470 for cl in changes:
3471 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003472 return
3473
3474 # First, sort out authentication issues.
3475 logging.debug('ensuring credentials exist')
3476 for cl in changes:
3477 cl.EnsureAuthenticated(force=False, refresh=True)
3478
3479 def fetch(cl):
3480 try:
3481 return (cl, cl.GetStatus())
3482 except:
3483 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003484 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003485 raise
3486
3487 threads_count = len(changes)
3488 if max_processes:
3489 threads_count = max(1, min(threads_count, max_processes))
3490 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3491
Edward Lemur61bf4172020-02-24 23:22:37 +00003492 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003493 fetched_cls = set()
3494 try:
3495 it = pool.imap_unordered(fetch, changes).__iter__()
3496 while True:
3497 try:
3498 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003499 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003500 break
3501 fetched_cls.add(cl)
3502 yield cl, status
3503 finally:
3504 pool.close()
3505
3506 # Add any branches that failed to fetch.
3507 for cl in set(changes) - fetched_cls:
3508 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003509
rmistry@google.com2dd99862015-06-22 12:22:18 +00003510
3511def upload_branch_deps(cl, args):
3512 """Uploads CLs of local branches that are dependents of the current branch.
3513
3514 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003515
3516 test1 -> test2.1 -> test3.1
3517 -> test3.2
3518 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003519
3520 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3521 run on the dependent branches in this order:
3522 test2.1, test3.1, test3.2, test2.2, test3.3
3523
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003524 Note: This function does not rebase your local dependent branches. Use it
3525 when you make a change to the parent branch that will not conflict
3526 with its dependent branches, and you would like their dependencies
3527 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003528 """
3529 if git_common.is_dirty_git_tree('upload-branch-deps'):
3530 return 1
3531
3532 root_branch = cl.GetBranch()
3533 if root_branch is None:
3534 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3535 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003536 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003537 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3538 'patchset dependencies without an uploaded CL.')
3539
3540 branches = RunGit(['for-each-ref',
3541 '--format=%(refname:short) %(upstream:short)',
3542 'refs/heads'])
3543 if not branches:
3544 print('No local branches found.')
3545 return 0
3546
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003547 # Create a dictionary of all local branches to the branches that are
3548 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003549 tracked_to_dependents = collections.defaultdict(list)
3550 for b in branches.splitlines():
3551 tokens = b.split()
3552 if len(tokens) == 2:
3553 branch_name, tracked = tokens
3554 tracked_to_dependents[tracked].append(branch_name)
3555
vapiera7fbd5a2016-06-16 09:17:49 -07003556 print()
3557 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003558 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003559
rmistry@google.com2dd99862015-06-22 12:22:18 +00003560 def traverse_dependents_preorder(branch, padding=''):
3561 dependents_to_process = tracked_to_dependents.get(branch, [])
3562 padding += ' '
3563 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003564 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003565 dependents.append(dependent)
3566 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003567
rmistry@google.com2dd99862015-06-22 12:22:18 +00003568 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003569 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003570
3571 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003572 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003573 return 0
3574
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003575 confirm_or_exit('This command will checkout all dependent branches and run '
3576 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003577
rmistry@google.com2dd99862015-06-22 12:22:18 +00003578 # Record all dependents that failed to upload.
3579 failures = {}
3580 # Go through all dependents, checkout the branch and upload.
3581 try:
3582 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003583 print()
3584 print('--------------------------------------')
3585 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003586 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003587 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003588 try:
3589 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003590 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003591 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003592 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003593 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003594 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003595 finally:
3596 # Swap back to the original root branch.
3597 RunGit(['checkout', '-q', root_branch])
3598
vapiera7fbd5a2016-06-16 09:17:49 -07003599 print()
3600 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003601 for dependent_branch in dependents:
3602 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003603 print(' %s : %s' % (dependent_branch, upload_status))
3604 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003605
3606 return 0
3607
3608
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003609def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3610 """Given a proposed tag name, returns a tag name that is guaranteed to be
3611 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3612 or 'foo-3', and so on."""
3613
3614 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3615 for suffix_num in itertools.count(1):
3616 if suffix_num == 1:
3617 to_check = proposed_tag
3618 else:
3619 to_check = '%s-%d' % (proposed_tag, suffix_num)
3620
3621 if to_check not in existing_tags:
3622 return to_check
3623
3624
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003625@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003626def CMDarchive(parser, args):
3627 """Archives and deletes branches associated with closed changelists."""
3628 parser.add_option(
3629 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003630 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003631 parser.add_option(
3632 '-f', '--force', action='store_true',
3633 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003634 parser.add_option(
3635 '-d', '--dry-run', action='store_true',
3636 help='Skip the branch tagging and removal steps.')
3637 parser.add_option(
3638 '-t', '--notags', action='store_true',
3639 help='Do not tag archived branches. '
3640 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003641
kmarshall3bff56b2016-06-06 18:31:47 -07003642 options, args = parser.parse_args(args)
3643 if args:
3644 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003645
3646 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3647 if not branches:
3648 return 0
3649
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003650 tags = RunGit(['for-each-ref', '--format=%(refname)',
3651 'refs/tags']).splitlines() or []
3652 tags = [t.split('/')[-1] for t in tags]
3653
vapiera7fbd5a2016-06-16 09:17:49 -07003654 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003655 changes = [Changelist(branchref=b)
3656 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003657 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3658 statuses = get_cl_statuses(changes,
3659 fine_grained=True,
3660 max_processes=options.maxjobs)
3661 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003662 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3663 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003664 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003665 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003666 proposal.sort()
3667
3668 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003669 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003670 return 0
3671
Edward Lemur85153282020-02-14 22:06:29 +00003672 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003673
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003675 if options.notags:
3676 for next_item in proposal:
3677 print(' ' + next_item[0])
3678 else:
3679 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3680 for next_item in proposal:
3681 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003682
kmarshall9249e012016-08-23 12:02:16 -07003683 # Quit now on precondition failure or if instructed by the user, either
3684 # via an interactive prompt or by command line flags.
3685 if options.dry_run:
3686 print('\nNo changes were made (dry run).\n')
3687 return 0
3688 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003689 print('You are currently on a branch \'%s\' which is associated with a '
3690 'closed codereview issue, so archive cannot proceed. Please '
3691 'checkout another branch and run this command again.' %
3692 current_branch)
3693 return 1
kmarshall9249e012016-08-23 12:02:16 -07003694 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003695 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3696 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003697 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003698 return 1
3699
3700 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003701 if not options.notags:
3702 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003703
3704 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3705 # Clean up the tag if we failed to delete the branch.
3706 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003707
vapiera7fbd5a2016-06-16 09:17:49 -07003708 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003709
3710 return 0
3711
3712
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003713@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003714def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003715 """Show status of changelists.
3716
3717 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003718 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003719 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003720 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003721 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003722 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003723 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003724 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003725
3726 Also see 'git cl comments'.
3727 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003728 parser.add_option(
3729 '--no-branch-color',
3730 action='store_true',
3731 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003732 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003733 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003734 parser.add_option('-f', '--fast', action='store_true',
3735 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003736 parser.add_option(
3737 '-j', '--maxjobs', action='store', type=int,
3738 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003739 parser.add_option(
3740 '-i', '--issue', type=int,
3741 help='Operate on this issue instead of the current branch\'s implicit '
3742 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003743 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003744 if args:
3745 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003746
iannuccie53c9352016-08-17 14:40:40 -07003747 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003748 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003749
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003750 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003751 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003752 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003753 if cl.GetIssue():
3754 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003755 elif options.field == 'id':
3756 issueid = cl.GetIssue()
3757 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003758 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003759 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003760 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003761 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003762 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003763 elif options.field == 'status':
3764 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003765 elif options.field == 'url':
3766 url = cl.GetIssueURL()
3767 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003768 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003769 return 0
3770
3771 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3772 if not branches:
3773 print('No local branch found.')
3774 return 0
3775
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003776 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003777 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003778 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003779 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003780 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003781 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003782 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003783
Edward Lemur85153282020-02-14 22:06:29 +00003784 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003785
3786 def FormatBranchName(branch, colorize=False):
3787 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3788 an asterisk when it is the current branch."""
3789
3790 asterisk = ""
3791 color = Fore.RESET
3792 if branch == current_branch:
3793 asterisk = "* "
3794 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003795 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003796
3797 if colorize:
3798 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003799 return asterisk + branch_name
3800
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003801 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003802
3803 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003804 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3805 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003806 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003807 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003808 branch_statuses[c.GetBranch()] = status
3809 status = branch_statuses.pop(branch)
3810 url = cl.GetIssueURL()
3811 if url and (not status or status == 'error'):
3812 # The issue probably doesn't exist anymore.
3813 url += ' (broken)'
3814
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003815 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003816 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003817 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003818 color = ''
3819 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003820 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003821
Alan Cuttera3be9a52019-03-04 18:50:33 +00003822 branch_display = FormatBranchName(branch)
3823 padding = ' ' * (alignment - len(branch_display))
3824 if not options.no_branch_color:
3825 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003826
Alan Cuttera3be9a52019-03-04 18:50:33 +00003827 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3828 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003829
vapiera7fbd5a2016-06-16 09:17:49 -07003830 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003831 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003832 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003833 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003834 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003835 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003836 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003837 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003838 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003839 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003840 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003841 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003842 return 0
3843
3844
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003845def colorize_CMDstatus_doc():
3846 """To be called once in main() to add colors to git cl status help."""
3847 colors = [i for i in dir(Fore) if i[0].isupper()]
3848
3849 def colorize_line(line):
3850 for color in colors:
3851 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003852 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003853 indent = len(line) - len(line.lstrip(' ')) + 1
3854 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3855 return line
3856
3857 lines = CMDstatus.__doc__.splitlines()
3858 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3859
3860
phajdan.jre328cf92016-08-22 04:12:17 -07003861def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003862 if path == '-':
3863 json.dump(contents, sys.stdout)
3864 else:
3865 with open(path, 'w') as f:
3866 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003867
3868
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003869@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003870@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003871def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003872 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003873
3874 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003875 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003876 parser.add_option('-r', '--reverse', action='store_true',
3877 help='Lookup the branch(es) for the specified issues. If '
3878 'no issues are specified, all branches with mapped '
3879 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003880 parser.add_option('--json',
3881 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003882 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003883
dnj@chromium.org406c4402015-03-03 17:22:28 +00003884 if options.reverse:
3885 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003886 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003887 # Reverse issue lookup.
3888 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003889
3890 git_config = {}
3891 for config in RunGit(['config', '--get-regexp',
3892 r'branch\..*issue']).splitlines():
3893 name, _space, val = config.partition(' ')
3894 git_config[name] = val
3895
dnj@chromium.org406c4402015-03-03 17:22:28 +00003896 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003897 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003898 Changelist.IssueConfigKey())
3899 issue = git_config.get(config_key)
3900 if issue:
3901 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003902 if not args:
3903 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003904 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003905 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003906 try:
3907 issue_num = int(issue)
3908 except ValueError:
3909 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003910 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003911 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003912 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003913 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003914 if options.json:
3915 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003916 return 0
3917
3918 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003919 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003920 if not issue.valid:
3921 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3922 'or no argument to list it.\n'
3923 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003924 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003925 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003926 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003927 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003928 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3929 if options.json:
3930 write_json(options.json, {
3931 'issue': cl.GetIssue(),
3932 'issue_url': cl.GetIssueURL(),
3933 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003934 return 0
3935
3936
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003937@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003938def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003939 """Shows or posts review comments for any changelist."""
3940 parser.add_option('-a', '--add-comment', dest='comment',
3941 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003942 parser.add_option('-p', '--publish', action='store_true',
3943 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003944 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003945 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003946 parser.add_option('-m', '--machine-readable', dest='readable',
3947 action='store_false', default=True,
3948 help='output comments in a format compatible with '
3949 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003950 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003951 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003952 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003953
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003954 issue = None
3955 if options.issue:
3956 try:
3957 issue = int(options.issue)
3958 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003959 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003960
Edward Lemur934836a2019-09-09 20:16:54 +00003961 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003962
3963 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003964 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003965 return 0
3966
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003967 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3968 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003969 for comment in summary:
3970 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003971 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003972 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003973 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003974 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003975 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003976 elif comment.autogenerated:
3977 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003978 else:
3979 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003980 print('\n%s%s %s%s\n%s' % (
3981 color,
3982 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3983 comment.sender,
3984 Fore.RESET,
3985 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3986
smut@google.comc85ac942015-09-15 16:34:43 +00003987 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003988 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003989 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003990 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3991 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003992 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003993 return 0
3994
3995
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003996@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003997@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003998def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003999 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004000 parser.add_option('-d', '--display', action='store_true',
4001 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004002 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004003 help='New description to set for this issue (- for stdin, '
4004 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004005 parser.add_option('-f', '--force', action='store_true',
4006 help='Delete any unpublished Gerrit edits for this issue '
4007 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004008
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004009 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004010
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004011 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004012 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004013 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004014 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004015 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004016
Edward Lemur934836a2019-09-09 20:16:54 +00004017 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004018 if target_issue_arg:
4019 kwargs['issue'] = target_issue_arg.issue
4020 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004021
4022 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004023 if not cl.GetIssue():
4024 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004025
Edward Lemur678a6842019-10-03 22:25:05 +00004026 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004027 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004028
Edward Lemur6c6827c2020-02-06 21:15:18 +00004029 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004030
smut@google.com34fb6b12015-07-13 20:03:26 +00004031 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004032 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004033 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004034
4035 if options.new_description:
4036 text = options.new_description
4037 if text == '-':
4038 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004039 elif text == '+':
4040 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004041 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004042
4043 description.set_description(text)
4044 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004045 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004046 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004047 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004048 return 0
4049
4050
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004051@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004052def CMDlint(parser, args):
4053 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004054 parser.add_option('--filter', action='append', metavar='-x,+y',
4055 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004056 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004057
4058 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004059 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004060 try:
4061 import cpplint
4062 import cpplint_chromium
4063 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004064 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004065 return 1
4066
4067 # Change the current working directory before calling lint so that it
4068 # shows the correct base.
4069 previous_cwd = os.getcwd()
4070 os.chdir(settings.GetRoot())
4071 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004072 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004073 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004074 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004075 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004076 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004077 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004078
4079 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004080 command = args + files
4081 if options.filter:
4082 command = ['--filter=' + ','.join(options.filter)] + command
4083 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004084
4085 white_regex = re.compile(settings.GetLintRegex())
4086 black_regex = re.compile(settings.GetLintIgnoreRegex())
4087 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4088 for filename in filenames:
4089 if white_regex.match(filename):
4090 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004091 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004092 else:
4093 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4094 extra_check_functions)
4095 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004096 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004097 finally:
4098 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004099 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004100 if cpplint._cpplint_state.error_count != 0:
4101 return 1
4102 return 0
4103
4104
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004105@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004106def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004107 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004108 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004109 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004110 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004111 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004112 parser.add_option('--all', action='store_true',
4113 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004114 parser.add_option('--parallel', action='store_true',
4115 help='Run all tests specified by input_api.RunTests in all '
4116 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004117 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004118
sbc@chromium.org71437c02015-04-09 19:29:40 +00004119 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004120 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004121 return 1
4122
Edward Lemur934836a2019-09-09 20:16:54 +00004123 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004124 if args:
4125 base_branch = args[0]
4126 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004127 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004128 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004129
Edward Lemur227d5102020-02-25 23:45:35 +00004130 if self.GetIssue():
4131 description = self.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004132 else:
Edward Lemur227d5102020-02-25 23:45:35 +00004133 description = self.GetDescription(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004134
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004135 cl.RunHook(
4136 committing=not options.upload,
4137 may_prompt=False,
4138 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004139 parallel=options.parallel,
4140 upstream=base_branch,
4141 description=description,
4142 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004143 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004144
4145
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004146def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004147 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004148
4149 Works the same way as
4150 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4151 but can be called on demand on all platforms.
4152
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004153 The basic idea is to generate git hash of a state of the tree, original
4154 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004155 """
4156 lines = []
4157 tree_hash = RunGitSilent(['write-tree'])
4158 lines.append('tree %s' % tree_hash.strip())
4159 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4160 if code == 0:
4161 lines.append('parent %s' % parent.strip())
4162 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4163 lines.append('author %s' % author.strip())
4164 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4165 lines.append('committer %s' % committer.strip())
4166 lines.append('')
4167 # Note: Gerrit's commit-hook actually cleans message of some lines and
4168 # whitespace. This code is not doing this, but it clearly won't decrease
4169 # entropy.
4170 lines.append(message)
4171 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004172 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004173 return 'I%s' % change_hash.strip()
4174
4175
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004176def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004177 """Computes the remote branch ref to use for the CL.
4178
4179 Args:
4180 remote (str): The git remote for the CL.
4181 remote_branch (str): The git remote branch for the CL.
4182 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004183 """
4184 if not (remote and remote_branch):
4185 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004186
wittman@chromium.org455dc922015-01-26 20:15:50 +00004187 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004188 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004189 # refs, which are then translated into the remote full symbolic refs
4190 # below.
4191 if '/' not in target_branch:
4192 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4193 else:
4194 prefix_replacements = (
4195 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4196 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4197 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4198 )
4199 match = None
4200 for regex, replacement in prefix_replacements:
4201 match = re.search(regex, target_branch)
4202 if match:
4203 remote_branch = target_branch.replace(match.group(0), replacement)
4204 break
4205 if not match:
4206 # This is a branch path but not one we recognize; use as-is.
4207 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004208 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4209 # Handle the refs that need to land in different refs.
4210 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004211
wittman@chromium.org455dc922015-01-26 20:15:50 +00004212 # Create the true path to the remote branch.
4213 # Does the following translation:
4214 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4215 # * refs/remotes/origin/master -> refs/heads/master
4216 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4217 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4218 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4219 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4220 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4221 'refs/heads/')
4222 elif remote_branch.startswith('refs/remotes/branch-heads'):
4223 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004224
wittman@chromium.org455dc922015-01-26 20:15:50 +00004225 return remote_branch
4226
4227
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004228def cleanup_list(l):
4229 """Fixes a list so that comma separated items are put as individual items.
4230
4231 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4232 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4233 """
4234 items = sum((i.split(',') for i in l), [])
4235 stripped_items = (i.strip() for i in items)
4236 return sorted(filter(None, stripped_items))
4237
4238
Aaron Gable4db38df2017-11-03 14:59:07 -07004239@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004240@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004241def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004242 """Uploads the current changelist to codereview.
4243
4244 Can skip dependency patchset uploads for a branch by running:
4245 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004246 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004247 git config --unset branch.branch_name.skip-deps-uploads
4248 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004249
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004250 If the name of the checked out branch starts with "bug-" or "fix-" followed
4251 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004252 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004253
4254 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004255 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004256 [git-cl] add support for hashtags
4257 Foo bar: implement foo
4258 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004259 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004260 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4261 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004262 parser.add_option('--bypass-watchlists', action='store_true',
4263 dest='bypass_watchlists',
4264 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004265 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004266 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004267 parser.add_option('--message', '-m', dest='message',
4268 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004269 parser.add_option('-b', '--bug',
4270 help='pre-populate the bug number(s) for this issue. '
4271 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004272 parser.add_option('--message-file', dest='message_file',
4273 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004274 parser.add_option('--title', '-t', dest='title',
4275 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004276 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004277 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004278 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004279 parser.add_option('--tbrs',
4280 action='append', default=[],
4281 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004282 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004283 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004284 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004285 parser.add_option('--hashtag', dest='hashtags',
4286 action='append', default=[],
4287 help=('Gerrit hashtag for new CL; '
4288 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004289 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004290 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004291 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004292 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004293 metavar='TARGET',
4294 help='Apply CL to remote ref TARGET. ' +
4295 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004296 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004297 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004298 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004299 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004300 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004301 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004302 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4303 const='TBR', help='add a set of OWNERS to TBR')
4304 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4305 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004306 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004307 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004308 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004309 'implies --send-mail')
4310 parser.add_option('-d', '--cq-dry-run',
4311 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004312 help='Send the patchset to do a CQ dry run right after '
4313 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004314 parser.add_option('--preserve-tryjobs', action='store_true',
4315 help='instruct the CQ to let tryjobs running even after '
4316 'new patchsets are uploaded instead of canceling '
4317 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004318 parser.add_option('--dependencies', action='store_true',
4319 help='Uploads CLs of all the local branches that depend on '
4320 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004321 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4322 help='Sends your change to the CQ after an approval. Only '
4323 'works on repos that have the Auto-Submit label '
4324 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004325 parser.add_option('--parallel', action='store_true',
4326 help='Run all tests specified by input_api.RunTests in all '
4327 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004328 parser.add_option('--no-autocc', action='store_true',
4329 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004330 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004331 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004332 parser.add_option('-R', '--retry-failed', action='store_true',
4333 help='Retry failed tryjobs from old patchset immediately '
4334 'after uploading new patchset. Cannot be used with '
4335 '--use-commit-queue or --cq-dry-run.')
4336 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4337 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004338 parser.add_option('--fixed', '-x',
4339 help='List of bugs that will be commented on and marked '
4340 'fixed (pre-populates "Fixed:" tag). Same format as '
4341 '-b option / "Bug:" tag. If fixing several issues, '
4342 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004343 parser.add_option('--edit-description', action='store_true', default=False,
4344 help='Modify description before upload. Cannot be used '
4345 'with --force. It is a noop when --no-squash is set '
4346 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004347
rmistry@google.com2dd99862015-06-22 12:22:18 +00004348 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004349 (options, args) = parser.parse_args(args)
4350
sbc@chromium.org71437c02015-04-09 19:29:40 +00004351 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004352 return 1
4353
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004354 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004355 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004356 options.cc = cleanup_list(options.cc)
4357
Josipe827b0f2020-01-30 00:07:20 +00004358 if options.edit_description and options.force:
4359 parser.error('Only one of --force and --edit-description allowed')
4360
tandriib80458a2016-06-23 12:20:07 -07004361 if options.message_file:
4362 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004363 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004364 options.message = gclient_utils.FileRead(options.message_file)
4365 options.message_file = None
4366
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004367 if ([options.cq_dry_run,
4368 options.use_commit_queue,
4369 options.retry_failed].count(True) > 1):
4370 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4371 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004372
Aaron Gableedbc4132017-09-11 13:22:28 -07004373 if options.use_commit_queue:
4374 options.send_mail = True
4375
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004376 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4377 settings.GetIsGerrit()
4378
Edward Lemur934836a2019-09-09 20:16:54 +00004379 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004380 # Warm change details cache now to avoid RPCs later, reducing latency for
4381 # developers.
4382 if cl.GetIssue():
4383 cl._GetChangeDetail(
4384 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4385
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004386 if options.retry_failed and not cl.GetIssue():
4387 print('No previous patchsets, so --retry-failed has no effect.')
4388 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004389
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004390 # cl.GetMostRecentPatchset uses cached information, and can return the last
4391 # patchset before upload. Calling it here makes it clear that it's the
4392 # last patchset before upload. Note that GetMostRecentPatchset will fail
4393 # if no CL has been uploaded yet.
4394 if options.retry_failed:
4395 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004396
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004397 ret = cl.CMDUpload(options, args, orig_args)
4398
4399 if options.retry_failed:
4400 if ret != 0:
4401 print('Upload failed, so --retry-failed has no effect.')
4402 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004403 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004404 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004405 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004406 if len(buckets) == 0:
4407 print('No failed tryjobs, so --retry-failed has no effect.')
4408 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004409 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004410
4411 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004412
4413
Francois Dorayd42c6812017-05-30 15:10:20 -04004414@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004415@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004416def CMDsplit(parser, args):
4417 """Splits a branch into smaller branches and uploads CLs.
4418
4419 Creates a branch and uploads a CL for each group of files modified in the
4420 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004421 comment, '$directory' is replaced with the directory containing the changes
4422 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4423 sending out, and '$num_cls' is replaced with the total number of CLs that
4424 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004425 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004426 parser.add_option('-d', '--description', dest='description_file',
4427 help='A text file containing a CL description in which '
4428 '$directory will be replaced by each CL\'s directory.')
4429 parser.add_option('-c', '--comment', dest='comment_file',
4430 help='A text file containing a CL comment.')
4431 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004432 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004433 help='List the files and reviewers for each CL that would '
4434 'be created, but don\'t create branches or CLs.')
4435 parser.add_option('--cq-dry-run', action='store_true',
4436 help='If set, will do a cq dry run for each uploaded CL. '
4437 'Please be careful when doing this; more than ~10 CLs '
4438 'has the potential to overload our build '
4439 'infrastructure. Try to upload these not during high '
4440 'load times (usually 11-3 Mountain View time). Email '
4441 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004442 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4443 default=True,
4444 help='Sends your change to the CQ after an approval. Only '
4445 'works on repos that have the Auto-Submit label '
4446 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004447 options, _ = parser.parse_args(args)
4448
4449 if not options.description_file:
4450 parser.error('No --description flag specified.')
4451
4452 def WrappedCMDupload(args):
4453 return CMDupload(OptionParser(), args)
4454
4455 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004456 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004457 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004458
4459
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004460@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004461@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004462def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004463 """DEPRECATED: Used to commit the current changelist via git-svn."""
4464 message = ('git-cl no longer supports committing to SVN repositories via '
4465 'git-svn. You probably want to use `git cl land` instead.')
4466 print(message)
4467 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004468
4469
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004470@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004471@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004472def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004473 """Commits the current changelist via git.
4474
4475 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4476 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004477 """
4478 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4479 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004480 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004481 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004482 parser.add_option('--parallel', action='store_true',
4483 help='Run all tests specified by input_api.RunTests in all '
4484 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004485 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004486
Edward Lemur934836a2019-09-09 20:16:54 +00004487 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004488
Robert Iannucci2e73d432018-03-14 01:10:47 -07004489 if not cl.GetIssue():
4490 DieWithError('You must upload the change first to Gerrit.\n'
4491 ' If you would rather have `git cl land` upload '
4492 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004493 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004494 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004495
4496
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004497@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004498@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004499def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004500 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004501 parser.add_option('-b', dest='newbranch',
4502 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004503 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004504 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004505 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004506 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004507
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004508 group = optparse.OptionGroup(
4509 parser,
4510 'Options for continuing work on the current issue uploaded from a '
4511 'different clone (e.g. different machine). Must be used independently '
4512 'from the other options. No issue number should be specified, and the '
4513 'branch must have an issue number associated with it')
4514 group.add_option('--reapply', action='store_true', dest='reapply',
4515 help='Reset the branch and reapply the issue.\n'
4516 'CAUTION: This will undo any local changes in this '
4517 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004518
4519 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004520 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004521 parser.add_option_group(group)
4522
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004523 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004524
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004525 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004526 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004527 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004528 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004529 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004530
Edward Lemur934836a2019-09-09 20:16:54 +00004531 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004532 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004533 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004534
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004535 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004536 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004537 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004538
4539 RunGit(['reset', '--hard', upstream])
4540 if options.pull:
4541 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004542
Edward Lemur678a6842019-10-03 22:25:05 +00004543 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4544 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004545
4546 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004547 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004548
Edward Lemurf38bc172019-09-03 21:02:13 +00004549 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004550 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004551 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004552
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004553 # We don't want uncommitted changes mixed up with the patch.
4554 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004555 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004556
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004557 if options.newbranch:
4558 if options.force:
4559 RunGit(['branch', '-D', options.newbranch],
4560 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004561 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004562
Edward Lemur678a6842019-10-03 22:25:05 +00004563 cl = Changelist(
4564 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004565
Edward Lemur678a6842019-10-03 22:25:05 +00004566 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004567 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004568
Edward Lemurf38bc172019-09-03 21:02:13 +00004569 return cl.CMDPatchWithParsedIssue(
4570 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004571
4572
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004573def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004574 """Fetches the tree status and returns either 'open', 'closed',
4575 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004576 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004577 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004578 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004579 if status.find('closed') != -1 or status == '0':
4580 return 'closed'
4581 elif status.find('open') != -1 or status == '1':
4582 return 'open'
4583 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004584 return 'unset'
4585
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004586
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004587def GetTreeStatusReason():
4588 """Fetches the tree status from a json url and returns the message
4589 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004590 url = settings.GetTreeStatusUrl()
4591 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004592 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004593 status = json.loads(connection.read())
4594 connection.close()
4595 return status['message']
4596
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004597
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004598@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004599def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004600 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004601 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004602 status = GetTreeStatus()
4603 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004604 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004605 return 2
4606
vapiera7fbd5a2016-06-16 09:17:49 -07004607 print('The tree is %s' % status)
4608 print()
4609 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004610 if status != 'open':
4611 return 1
4612 return 0
4613
4614
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004615@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004616def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004617 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4618 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004619 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004620 '-b', '--bot', action='append',
4621 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4622 'times to specify multiple builders. ex: '
4623 '"-b win_rel -b win_layout". See '
4624 'the try server waterfall for the builders name and the tests '
4625 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004626 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004627 '-B', '--bucket', default='',
4628 help=('Buildbucket bucket to send the try requests.'))
4629 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004630 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004631 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004632 'be determined by the try recipe that builder runs, which usually '
4633 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004634 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004635 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004636 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004637 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004638 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004639 '--category', default='git_cl_try', help='Specify custom build category.')
4640 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004641 '--project',
4642 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004643 'in recipe to determine to which repository or directory to '
4644 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004645 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004646 '-p', '--property', dest='properties', action='append', default=[],
4647 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004648 'key2=value2 etc. The value will be treated as '
4649 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004650 'NOTE: using this may make your tryjob not usable for CQ, '
4651 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004652 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004653 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4654 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004655 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004656 parser.add_option(
4657 '-R', '--retry-failed', action='store_true', default=False,
4658 help='Retry failed jobs from the latest set of tryjobs. '
4659 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004660 parser.add_option(
4661 '-i', '--issue', type=int,
4662 help='Operate on this issue instead of the current branch\'s implicit '
4663 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004664 options, args = parser.parse_args(args)
4665
machenbach@chromium.org45453142015-09-15 08:45:22 +00004666 # Make sure that all properties are prop=value pairs.
4667 bad_params = [x for x in options.properties if '=' not in x]
4668 if bad_params:
4669 parser.error('Got properties with missing "=": %s' % bad_params)
4670
maruel@chromium.org15192402012-09-06 12:38:29 +00004671 if args:
4672 parser.error('Unknown arguments: %s' % args)
4673
Edward Lemur934836a2019-09-09 20:16:54 +00004674 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004675 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004676 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004677
Edward Lemurf38bc172019-09-03 21:02:13 +00004678 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004679 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004680
tandriie113dfd2016-10-11 10:20:12 -07004681 error_message = cl.CannotTriggerTryJobReason()
4682 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004683 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004684
Quinten Yearsley983111f2019-09-26 17:18:48 +00004685 if options.retry_failed:
4686 if options.bot or options.bucket:
4687 print('ERROR: The option --retry-failed is not compatible with '
4688 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4689 return 1
4690 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004691 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004692 if options.verbose:
4693 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004694 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004695 if not buckets:
4696 print('There are no failed jobs in the latest set of jobs '
4697 '(patchset #%d), doing nothing.' % patchset)
4698 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004699 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004700 if num_builders > 10:
4701 confirm_or_exit('There are %d builders with failed builds.'
4702 % num_builders, action='continue')
4703 else:
4704 buckets = _get_bucket_map(cl, options, parser)
4705 if buckets and any(b.startswith('master.') for b in buckets):
4706 print('ERROR: Buildbot masters are not supported.')
4707 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004708
qyearsleydd49f942016-10-28 11:57:22 -07004709 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4710 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004711 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004712 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004713 print('git cl try with no bots now defaults to CQ dry run.')
4714 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4715 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004716
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004717 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004718 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004719 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004720 'of bot requires an initial job from a parent (usually a builder). '
4721 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004722 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004723 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004724
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004725 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004726 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004727 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004728 except BuildbucketResponseException as ex:
4729 print('ERROR: %s' % ex)
4730 return 1
4731 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004732
4733
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004734@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004735def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004736 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004737 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004738 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004739 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004740 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004741 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004742 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004743 '--color', action='store_true', default=setup_color.IS_TTY,
4744 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004745 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004746 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4747 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004748 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004749 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004750 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004751 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004752 parser.add_option(
4753 '-i', '--issue', type=int,
4754 help='Operate on this issue instead of the current branch\'s implicit '
4755 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004756 options, args = parser.parse_args(args)
4757 if args:
4758 parser.error('Unrecognized args: %s' % ' '.join(args))
4759
Edward Lemur934836a2019-09-09 20:16:54 +00004760 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004761 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004762 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004763
tandrii221ab252016-10-06 08:12:04 -07004764 patchset = options.patchset
4765 if not patchset:
4766 patchset = cl.GetMostRecentPatchset()
4767 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004768 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004769 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004770 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004771 cl.GetIssue())
4772
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004773 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004774 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004775 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004776 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004777 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004778 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004779 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004780 else:
4781 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004782 return 0
4783
4784
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004785@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004786@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004787def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004788 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004789 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004790 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004791 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004792
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004793 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004794 if args:
4795 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004796 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004797 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004798 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004799 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004800
4801 # Clear configured merge-base, if there is one.
4802 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004803 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004804 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004805 return 0
4806
4807
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004808@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004809def CMDweb(parser, args):
4810 """Opens the current CL in the web browser."""
4811 _, args = parser.parse_args(args)
4812 if args:
4813 parser.error('Unrecognized args: %s' % ' '.join(args))
4814
4815 issue_url = Changelist().GetIssueURL()
4816 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004817 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004818 return 1
4819
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004820 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004821 # allows us to hide the "Created new window in existing browser session."
4822 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004823 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004824 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004825 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004826 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004827 os.open(os.devnull, os.O_RDWR)
4828 try:
4829 webbrowser.open(issue_url)
4830 finally:
4831 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004832 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004833 return 0
4834
4835
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004836@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004837def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004838 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004839 parser.add_option('-d', '--dry-run', action='store_true',
4840 help='trigger in dry run mode')
4841 parser.add_option('-c', '--clear', action='store_true',
4842 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004843 parser.add_option(
4844 '-i', '--issue', type=int,
4845 help='Operate on this issue instead of the current branch\'s implicit '
4846 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004847 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004848 if args:
4849 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004850 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004851 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004852
Edward Lemur934836a2019-09-09 20:16:54 +00004853 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004854 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004855 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004856 elif options.dry_run:
4857 state = _CQState.DRY_RUN
4858 else:
4859 state = _CQState.COMMIT
4860 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004861 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004862 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004863 return 0
4864
4865
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004866@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004867def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004868 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004869 parser.add_option(
4870 '-i', '--issue', type=int,
4871 help='Operate on this issue instead of the current branch\'s implicit '
4872 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004873 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004874 if args:
4875 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004876 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004877 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004878 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004879 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004880 cl.CloseIssue()
4881 return 0
4882
4883
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004884@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004885def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004886 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004887 parser.add_option(
4888 '--stat',
4889 action='store_true',
4890 dest='stat',
4891 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004892 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004893 if args:
4894 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004895
Edward Lemur934836a2019-09-09 20:16:54 +00004896 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004897 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004898 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004899 if not issue:
4900 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004901
Aaron Gablea718c3e2017-08-28 17:47:28 -07004902 base = cl._GitGetBranchConfigValue('last-upload-hash')
4903 if not base:
4904 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4905 if not base:
4906 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4907 revision_info = detail['revisions'][detail['current_revision']]
4908 fetch_info = revision_info['fetch']['http']
4909 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4910 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004911
Aaron Gablea718c3e2017-08-28 17:47:28 -07004912 cmd = ['git', 'diff']
4913 if options.stat:
4914 cmd.append('--stat')
4915 cmd.append(base)
4916 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004917
4918 return 0
4919
4920
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004921@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004922def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004923 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004924 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004925 '--ignore-current',
4926 action='store_true',
4927 help='Ignore the CL\'s current reviewers and start from scratch.')
4928 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004929 '--ignore-self',
4930 action='store_true',
4931 help='Do not consider CL\'s author as an owners.')
4932 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004933 '--no-color',
4934 action='store_true',
4935 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004936 parser.add_option(
4937 '--batch',
4938 action='store_true',
4939 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004940 # TODO: Consider moving this to another command, since other
4941 # git-cl owners commands deal with owners for a given CL.
4942 parser.add_option(
4943 '--show-all',
4944 action='store_true',
4945 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004946 options, args = parser.parse_args(args)
4947
4948 author = RunGit(['config', 'user.email']).strip() or None
4949
Edward Lemur934836a2019-09-09 20:16:54 +00004950 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004951
Yang Guo6e269a02019-06-26 11:17:02 +00004952 if options.show_all:
4953 for arg in args:
4954 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004955 database = owners.Database(settings.GetRoot(), file, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004956 database.load_data_needed_for([arg])
4957 print('Owners for %s:' % arg)
4958 for owner in sorted(database.all_possible_owners([arg], None)):
4959 print(' - %s' % owner)
4960 return 0
4961
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004962 if args:
4963 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004964 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004965 base_branch = args[0]
4966 else:
4967 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004968 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004969
Edward Lemur7f6dec02020-02-06 20:23:58 +00004970 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004971 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4972
4973 if options.batch:
4974 db = owners.Database(change.RepositoryRoot(), file, os.path)
4975 print('\n'.join(db.reviewers_for(affected_files, author)))
4976 return 0
4977
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004978 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004979 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004980 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004981 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004982 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004983 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004984 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004985 override_files=change.OriginalOwnersFiles(),
4986 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004987
4988
Aiden Bennerc08566e2018-10-03 17:52:42 +00004989def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004990 """Generates a diff command."""
4991 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004992 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4993
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004994 if allow_prefix:
4995 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4996 # case that diff.noprefix is set in the user's git config.
4997 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4998 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004999 diff_cmd += ['--no-prefix']
5000
5001 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005002
5003 if args:
5004 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005005 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005006 diff_cmd.append(arg)
5007 else:
5008 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005009
5010 return diff_cmd
5011
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005012
Jamie Madill5e96ad12020-01-13 16:08:35 +00005013def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5014 """Runs clang-format-diff and sets a return value if necessary."""
5015
5016 if not clang_diff_files:
5017 return 0
5018
5019 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5020 # formatted. This is used to block during the presubmit.
5021 return_value = 0
5022
5023 # Locate the clang-format binary in the checkout
5024 try:
5025 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5026 except clang_format.NotFoundError as e:
5027 DieWithError(e)
5028
5029 if opts.full or settings.GetFormatFullByDefault():
5030 cmd = [clang_format_tool]
5031 if not opts.dry_run and not opts.diff:
5032 cmd.append('-i')
5033 if opts.dry_run:
5034 for diff_file in clang_diff_files:
5035 with open(diff_file, 'r') as myfile:
5036 code = myfile.read().replace('\r\n', '\n')
5037 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5038 stdout = stdout.replace('\r\n', '\n')
5039 if opts.diff:
5040 sys.stdout.write(stdout)
5041 if code != stdout:
5042 return_value = 2
5043 else:
5044 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5045 if opts.diff:
5046 sys.stdout.write(stdout)
5047 else:
5048 env = os.environ.copy()
5049 env['PATH'] = str(os.path.dirname(clang_format_tool))
5050 try:
5051 script = clang_format.FindClangFormatScriptInChromiumTree(
5052 'clang-format-diff.py')
5053 except clang_format.NotFoundError as e:
5054 DieWithError(e)
5055
5056 cmd = [sys.executable, script, '-p0']
5057 if not opts.dry_run and not opts.diff:
5058 cmd.append('-i')
5059
5060 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5061 diff_output = RunGit(diff_cmd)
5062
5063 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5064 if opts.diff:
5065 sys.stdout.write(stdout)
5066 if opts.dry_run and len(stdout) > 0:
5067 return_value = 2
5068
5069 return return_value
5070
5071
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005072def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005073 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005074 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005075
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005076
enne@chromium.org555cfe42014-01-29 18:21:39 +00005077@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005078@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005079def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005080 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005081 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005082 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005083 parser.add_option('--full', action='store_true',
5084 help='Reformat the full content of all touched files')
5085 parser.add_option('--dry-run', action='store_true',
5086 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005087 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005088 '--no-clang-format',
5089 dest='clang_format',
5090 action='store_false',
5091 default=True,
5092 help='Disables formatting of various file types using clang-format.')
5093 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005094 '--python',
5095 action='store_true',
5096 default=None,
5097 help='Enables python formatting on all python files.')
5098 parser.add_option(
5099 '--no-python',
5100 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005101 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005102 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005103 'If neither --python or --no-python are set, python files that have a '
5104 '.style.yapf file in an ancestor directory will be formatted. '
5105 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005106 parser.add_option(
5107 '--js',
5108 action='store_true',
5109 help='Format javascript code with clang-format. '
5110 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005111 parser.add_option('--diff', action='store_true',
5112 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005113 parser.add_option('--presubmit', action='store_true',
5114 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005115 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005116
Garrett Beaty91a6f332020-01-06 16:57:24 +00005117 if opts.python is not None and opts.no_python:
5118 raise parser.error('Cannot set both --python and --no-python')
5119 if opts.no_python:
5120 opts.python = False
5121
Daniel Chengc55eecf2016-12-30 03:11:02 -08005122 # Normalize any remaining args against the current path, so paths relative to
5123 # the current directory are still resolved as expected.
5124 args = [os.path.join(os.getcwd(), arg) for arg in args]
5125
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005126 # git diff generates paths against the root of the repository. Change
5127 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005128 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005129 if rel_base_path:
5130 os.chdir(rel_base_path)
5131
digit@chromium.org29e47272013-05-17 17:01:46 +00005132 # Grab the merge-base commit, i.e. the upstream commit of the current
5133 # branch when it was created or the last time it was rebased. This is
5134 # to cover the case where the user may have called "git fetch origin",
5135 # moving the origin branch to a newer commit, but hasn't rebased yet.
5136 upstream_commit = None
5137 cl = Changelist()
5138 upstream_branch = cl.GetUpstreamBranch()
5139 if upstream_branch:
5140 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5141 upstream_commit = upstream_commit.strip()
5142
5143 if not upstream_commit:
5144 DieWithError('Could not find base commit for this branch. '
5145 'Are you in detached state?')
5146
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005147 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5148 diff_output = RunGit(changed_files_cmd)
5149 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005150 # Filter out files deleted by this CL
5151 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005152
Andreas Haas417d89c2020-02-06 10:24:27 +00005153 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005154 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005155
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005156 clang_diff_files = []
5157 if opts.clang_format:
5158 clang_diff_files = [
5159 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5160 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005161 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5162 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005163 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005164
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005165 top_dir = os.path.normpath(
5166 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5167
Jamie Madill5e96ad12020-01-13 16:08:35 +00005168 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5169 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005170
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005171 # Similar code to above, but using yapf on .py files rather than clang-format
5172 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005173 py_explicitly_disabled = opts.python is not None and not opts.python
5174 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005175 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5176 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5177 if sys.platform.startswith('win'):
5178 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005179
Aiden Bennerc08566e2018-10-03 17:52:42 +00005180 # Used for caching.
5181 yapf_configs = {}
5182 for f in python_diff_files:
5183 # Find the yapf style config for the current file, defaults to depot
5184 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005185 _FindYapfConfigFile(f, yapf_configs, top_dir)
5186
5187 # Turn on python formatting by default if a yapf config is specified.
5188 # This breaks in the case of this repo though since the specified
5189 # style file is also the global default.
5190 if opts.python is None:
5191 filtered_py_files = []
5192 for f in python_diff_files:
5193 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5194 filtered_py_files.append(f)
5195 else:
5196 filtered_py_files = python_diff_files
5197
5198 # Note: yapf still seems to fix indentation of the entire file
5199 # even if line ranges are specified.
5200 # See https://github.com/google/yapf/issues/499
5201 if not opts.full and filtered_py_files:
5202 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5203
Brian Sheedyb4307d52019-12-02 19:18:17 +00005204 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5205 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5206 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005207
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005208 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005209 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5210 # Default to pep8 if not .style.yapf is found.
5211 if not yapf_style:
5212 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005213
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005214 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005215
5216 has_formattable_lines = False
5217 if not opts.full:
5218 # Only run yapf over changed line ranges.
5219 for diff_start, diff_len in py_line_diffs[f]:
5220 diff_end = diff_start + diff_len - 1
5221 # Yapf errors out if diff_end < diff_start but this
5222 # is a valid line range diff for a removal.
5223 if diff_end >= diff_start:
5224 has_formattable_lines = True
5225 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5226 # If all line diffs were removals we have nothing to format.
5227 if not has_formattable_lines:
5228 continue
5229
5230 if opts.diff or opts.dry_run:
5231 cmd += ['--diff']
5232 # Will return non-zero exit code if non-empty diff.
5233 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5234 if opts.diff:
5235 sys.stdout.write(stdout)
5236 elif len(stdout) > 0:
5237 return_value = 2
5238 else:
5239 cmd += ['-i']
5240 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005241
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005242 # Dart's formatter does not have the nice property of only operating on
5243 # modified chunks, so hard code full.
5244 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005245 try:
5246 command = [dart_format.FindDartFmtToolInChromiumTree()]
5247 if not opts.dry_run and not opts.diff:
5248 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005249 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005250
ppi@chromium.org6593d932016-03-03 15:41:15 +00005251 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005252 if opts.dry_run and stdout:
5253 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005254 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005255 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5256 'found in this checkout. Files in other languages are still '
5257 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005258
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005259 # Format GN build files. Always run on full build files for canonical form.
5260 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005261 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005262 if opts.dry_run or opts.diff:
5263 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005264 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005265 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5266 shell=sys.platform == 'win32',
5267 cwd=top_dir)
5268 if opts.dry_run and gn_ret == 2:
5269 return_value = 2 # Not formatted.
5270 elif opts.diff and gn_ret == 2:
5271 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005272 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005273 elif gn_ret != 0:
5274 # For non-dry run cases (and non-2 return values for dry-run), a
5275 # nonzero error code indicates a failure, probably because the file
5276 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005277 DieWithError('gn format failed on ' + gn_diff_file +
5278 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005279
Ilya Shermane081cbe2017-08-15 17:51:04 -07005280 # Skip the metrics formatting from the global presubmit hook. These files have
5281 # a separate presubmit hook that issues an error if the files need formatting,
5282 # whereas the top-level presubmit script merely issues a warning. Formatting
5283 # these files is somewhat slow, so it's important not to duplicate the work.
5284 if not opts.presubmit:
5285 for xml_dir in GetDirtyMetricsDirs(diff_files):
5286 tool_dir = os.path.join(top_dir, xml_dir)
5287 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5288 if opts.dry_run or opts.diff:
5289 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005290 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005291 if opts.diff:
5292 sys.stdout.write(stdout)
5293 if opts.dry_run and stdout:
5294 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005295
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005296 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005297
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005298
Steven Holte2e664bf2017-04-21 13:10:47 -07005299def GetDirtyMetricsDirs(diff_files):
5300 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5301 metrics_xml_dirs = [
5302 os.path.join('tools', 'metrics', 'actions'),
5303 os.path.join('tools', 'metrics', 'histograms'),
5304 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005305 os.path.join('tools', 'metrics', 'ukm'),
5306 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005307 for xml_dir in metrics_xml_dirs:
5308 if any(file.startswith(xml_dir) for file in xml_diff_files):
5309 yield xml_dir
5310
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005311
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005312@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005313@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005314def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005315 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005316 _, args = parser.parse_args(args)
5317
5318 if len(args) != 1:
5319 parser.print_help()
5320 return 1
5321
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005322 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005323 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005324 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005325
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005326 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005327
Edward Lemur52969c92020-02-06 18:15:28 +00005328 issueprefix = Changelist.IssueConfigKey()
5329 output = RunGit(['config', '--local', '--get-regexp',
5330 r'branch\..*\.%s' % issueprefix],
5331 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005332
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005333 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005334 for key, issue in [x.split() for x in output.splitlines()]:
5335 if issue == target_issue:
5336 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5337
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005338 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005339 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005340 return 1
5341 if len(branches) == 1:
5342 RunGit(['checkout', branches[0]])
5343 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005344 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005345 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005346 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005347 which = raw_input('Choose by index: ')
5348 try:
5349 RunGit(['checkout', branches[int(which)]])
5350 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005351 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005352 return 1
5353
5354 return 0
5355
5356
maruel@chromium.org29404b52014-09-08 22:58:00 +00005357def CMDlol(parser, args):
5358 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005359 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005360 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5361 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5362 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005363 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005364 return 0
5365
5366
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005367class OptionParser(optparse.OptionParser):
5368 """Creates the option parse and add --verbose support."""
5369 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005370 optparse.OptionParser.__init__(
5371 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005372 self.add_option(
5373 '-v', '--verbose', action='count', default=0,
5374 help='Use 2 times for more debugging info')
5375
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005376 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005377 try:
5378 return self._parse_args(args)
5379 finally:
5380 # Regardless of success or failure of args parsing, we want to report
5381 # metrics, but only after logging has been initialized (if parsing
5382 # succeeded).
5383 global settings
5384 settings = Settings()
5385
5386 if not metrics.DISABLE_METRICS_COLLECTION:
5387 # GetViewVCUrl ultimately calls logging method.
5388 project_url = settings.GetViewVCUrl().strip('/+')
5389 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5390 metrics.collector.add('project_urls', [project_url])
5391
5392 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005393 # Create an optparse.Values object that will store only the actual passed
5394 # options, without the defaults.
5395 actual_options = optparse.Values()
5396 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5397 # Create an optparse.Values object with the default options.
5398 options = optparse.Values(self.get_default_values().__dict__)
5399 # Update it with the options passed by the user.
5400 options._update_careful(actual_options.__dict__)
5401 # Store the options passed by the user in an _actual_options attribute.
5402 # We store only the keys, and not the values, since the values can contain
5403 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005404 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005405
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005406 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005407 logging.basicConfig(
5408 level=levels[min(options.verbose, len(levels) - 1)],
5409 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5410 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005411
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005412 return options, args
5413
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005414
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005415def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005416 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005417 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005418 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005419 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005420
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005421 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005422 dispatcher = subcommand.CommandDispatcher(__name__)
5423 try:
5424 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005425 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005426 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005427 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005428 if e.code != 500:
5429 raise
5430 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005431 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005432 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005433 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005434
5435
5436if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005437 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5438 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005439 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005440 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005441 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005442 sys.exit(main(sys.argv[1:]))