blob: 90818561fedaafd9bb87281282e8e6a1240bb040 [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
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010016import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000017import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000018import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010019import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000020import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000022import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000023import optparse
24import os
25import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010026import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000027import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070029import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000031import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000032import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000033import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000034import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000035
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000036from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000037import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000038import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000039import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000040import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000041import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000042import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000043import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000044import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000045import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000046import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000047import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000048import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000049import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000050import presubmit_support
51import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000052import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040053import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000054import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000055import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
Edward Lemur79d4f992019-11-11 23:49:02 +000058from third_party import six
59from six.moves import urllib
60
61
62if sys.version_info.major == 3:
63 basestring = (str,) # pylint: disable=redefined-builtin
64
Edward Lemurb9830242019-10-30 22:19:20 +000065
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
Edward Lemur0f58ae42019-04-30 17:24:12 +000068# Traces for git push will be stored in a traces directory inside the
69# depot_tools checkout.
70DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
71TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
72
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.has_description = False
1036 self.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."""
1288 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1289 return RunGitWithCode(args)[1].strip()
1290
Edward Lemur6c6827c2020-02-06 21:15:18 +00001291 def FetchDescription(self, pretty=False):
1292 assert self.GetIssue(), 'issue is required to query Gerrit'
1293
1294 if not self.has_description:
1295 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1296 current_rev = data['current_revision']
1297 self.description = data['revisions'][current_rev]['commit']['message']
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 self.has_description = True
Edward Lemur6c6827c2020-02-06 21:15:18 +00001299
1300 if not pretty:
1301 return self.description
1302
1303 # Set width to 72 columns + 2 space indent.
1304 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1305 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1306 lines = self.description.splitlines()
1307 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001308
1309 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001310 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001311 if self.patchset is None and not self.lookedup_patchset:
Edward Lemur85153282020-02-14 22:06:29 +00001312 self.patchset = self._GitGetBranchConfigValue(self.PatchsetConfigKey())
1313 if self.patchset is not None:
1314 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001315 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001316 return self.patchset
1317
1318 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001319 """Set this branch's patchset. If patchset=0, clears the patchset."""
1320 assert self.GetBranch()
1321 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001322 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001323 else:
1324 self.patchset = int(patchset)
1325 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001326 self.PatchsetConfigKey(), str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001327
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001328 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001329 """Set this branch's issue. If issue isn't given, clears the issue."""
1330 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001331 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001332 issue = int(issue)
1333 self._GitSetBranchConfigValue(
Edward Lemur85153282020-02-14 22:06:29 +00001334 self.IssueConfigKey(), str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001335 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001336 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001337 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001338 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001339 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001340 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001341 else:
tandrii5d48c322016-08-18 16:19:37 -07001342 # Reset all of these just to be clean.
1343 reset_suffixes = [
1344 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001345 self.IssueConfigKey(),
1346 self.PatchsetConfigKey(),
1347 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001348 ] + self._PostUnsetIssueProperties()
1349 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001350 try:
1351 self._GitSetBranchConfigValue(prop, None)
1352 except subprocess2.CalledProcessError:
1353 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001354 msg = RunGit(['log', '-1', '--format=%B']).strip()
1355 if msg and git_footers.get_footer_change_id(msg):
1356 print('WARNING: The change patched into this branch has a Change-Id. '
1357 'Removing it.')
1358 RunGit(['commit', '--amend', '-m',
1359 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001360 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001361 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001362 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001363
Edward Lemur7f6dec02020-02-06 20:23:58 +00001364 def GetChange(self, upstream_branch):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001365 if not self.GitSanityChecks(upstream_branch):
1366 DieWithError('\nGit sanity check failure')
1367
Edward Lemur7f6dec02020-02-06 20:23:58 +00001368 root = settings.GetRoot()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001369 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001370 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001371 try:
Edward Lemur7f6dec02020-02-06 20:23:58 +00001372 files = scm.GIT.CaptureStatus(root, upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001373 except subprocess2.CalledProcessError:
1374 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001375 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001376 'This branch probably doesn\'t exist anymore. To reset the\n'
1377 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001378 ' git branch --set-upstream-to origin/master %s\n'
1379 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001380 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001381
maruel@chromium.org52424302012-08-29 15:14:30 +00001382 issue = self.GetIssue()
1383 patchset = self.GetPatchset()
Edward Lemur7f6dec02020-02-06 20:23:58 +00001384 if issue:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001385 description = self.FetchDescription()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001386 else:
1387 # If the change was never uploaded, use the log messages of all commits
1388 # up to the branch point, as git cl upload will prefill the description
1389 # with these log messages.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001390 description = self.GetLocalDescription(upstream_branch)
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001391
Edward Lemur7f6dec02020-02-06 20:23:58 +00001392 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001393 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001394 name,
1395 description,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001396 root,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001397 files,
1398 issue,
1399 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001400 author,
1401 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001402
dsansomee2d6fd92016-09-08 00:10:47 -07001403 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001404 assert self.GetIssue(), 'issue is required to update description'
1405
1406 if gerrit_util.HasPendingChangeEdit(
1407 self._GetGerritHost(), self._GerritChangeIdentifier()):
1408 if not force:
1409 confirm_or_exit(
1410 'The description cannot be modified while the issue has a pending '
1411 'unpublished edit. Either publish the edit in the Gerrit web UI '
1412 'or delete it.\n\n', action='delete the unpublished edit')
1413
1414 gerrit_util.DeletePendingChangeEdit(
1415 self._GetGerritHost(), self._GerritChangeIdentifier())
1416 gerrit_util.SetCommitMessage(
1417 self._GetGerritHost(), self._GerritChangeIdentifier(),
1418 description, notify='NONE')
1419
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001420 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001421 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001422
Edward Lesmes8e282792018-04-03 18:50:29 -04001423 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001424 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1425 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001426 start = time_time()
1427 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001428 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1429 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001430 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001431 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001432 metrics.collector.add_repeated('sub_commands', {
1433 'command': 'presubmit',
1434 'execution_time': time_time() - start,
1435 'exit_code': 0 if result.should_continue() else 1,
1436 })
1437 return result
vapierfd77ac72016-06-16 08:33:57 -07001438 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001439 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001440
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001441 def CMDUpload(self, options, git_diff_args, orig_args):
1442 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001443 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001444 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001445 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001446 else:
1447 if self.GetBranch() is None:
1448 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1449
1450 # Default to diffing against common ancestor of upstream branch
1451 base_branch = self.GetCommonAncestorWithUpstream()
1452 git_diff_args = [base_branch, 'HEAD']
1453
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001454 # Fast best-effort checks to abort before running potentially expensive
1455 # hooks if uploading is likely to fail anyway. Passing these checks does
1456 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001457 self.EnsureAuthenticated(force=options.force)
1458 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001459
1460 # Apply watchlists on upload.
Edward Lemur7f6dec02020-02-06 20:23:58 +00001461 change = self.GetChange(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001462 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1463 files = [f.LocalPath() for f in change.AffectedFiles()]
1464 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001465 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001466
1467 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001468 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001469 # Set the reviewer list now so that presubmit checks can access it.
1470 change_description = ChangeDescription(change.FullDescriptionText())
1471 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001472 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001473 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001474 change)
1475 change.SetDescriptionText(change_description.description)
1476 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001477 may_prompt=not options.force,
1478 verbose=options.verbose,
1479 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001480 if not hook_results.should_continue():
1481 return 1
Daniel Cheng7227d212017-11-17 08:12:37 -08001482 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001483
Aaron Gable13101a62018-02-09 13:20:41 -08001484 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001485 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001486 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001487 self._GitSetBranchConfigValue(
1488 'last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001489 # Run post upload hooks, if specified.
1490 if settings.GetRunPostUploadHook():
1491 presubmit_support.DoPostUploadExecuter(
1492 change,
Edward Lemur016a0872020-02-04 22:13:28 +00001493 self.GetGerritObjForPresubmit(),
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001494 settings.GetRoot(),
1495 options.verbose,
1496 sys.stdout)
1497
1498 # Upload all dependencies if specified.
1499 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001500 print()
1501 print('--dependencies has been specified.')
1502 print('All dependent local branches will be re-uploaded.')
1503 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001504 # Remove the dependencies flag from args so that we do not end up in a
1505 # loop.
1506 orig_args.remove('--dependencies')
1507 ret = upload_branch_deps(self, orig_args)
1508 return ret
1509
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001510 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001511 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001512
1513 Issue must have been already uploaded and known.
1514 """
1515 assert new_state in _CQState.ALL_STATES
1516 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001517 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001518 vote_map = {
1519 _CQState.NONE: 0,
1520 _CQState.DRY_RUN: 1,
1521 _CQState.COMMIT: 2,
1522 }
1523 labels = {'Commit-Queue': vote_map[new_state]}
1524 notify = False if new_state == _CQState.DRY_RUN else None
1525 gerrit_util.SetReview(
1526 self._GetGerritHost(), self._GerritChangeIdentifier(),
1527 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001528 return 0
1529 except KeyboardInterrupt:
1530 raise
1531 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001532 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001533 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001534 ' * Your project has no CQ,\n'
1535 ' * You don\'t have permission to change the CQ state,\n'
1536 ' * There\'s a bug in this code (see stack trace below).\n'
1537 'Consider specifying which bots to trigger manually or asking your '
1538 'project owners for permissions or contacting Chrome Infra at:\n'
1539 'https://www.chromium.org/infra\n\n' %
1540 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001541 # Still raise exception so that stack trace is printed.
1542 raise
1543
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001544 def _GetGerritHost(self):
1545 # Lazy load of configs.
1546 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001547 if self._gerrit_host and '.' not in self._gerrit_host:
1548 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1549 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001550 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001551 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001552 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001553 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001554 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1555 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001556 return self._gerrit_host
1557
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001558 def _GetGitHost(self):
1559 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001560 remote_url = self.GetRemoteUrl()
1561 if not remote_url:
1562 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001563 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001564
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001565 def GetCodereviewServer(self):
1566 if not self._gerrit_server:
1567 # If we're on a branch then get the server potentially associated
1568 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001569 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001570 self._gerrit_server = self._GitGetBranchConfigValue(
1571 self.CodereviewServerConfigKey())
1572 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001573 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001574 if not self._gerrit_server:
1575 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1576 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001577 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001578 parts[0] = parts[0] + '-review'
1579 self._gerrit_host = '.'.join(parts)
1580 self._gerrit_server = 'https://%s' % self._gerrit_host
1581 return self._gerrit_server
1582
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001583 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001584 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001585 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001586 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001587 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001588 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001589 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001590 if project.endswith('.git'):
1591 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001592 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1593 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1594 # gitiles/git-over-https protocol. E.g.,
1595 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1596 # as
1597 # https://chromium.googlesource.com/v8/v8
1598 if project.startswith('a/'):
1599 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001600 return project
1601
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001602 def _GerritChangeIdentifier(self):
1603 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1604
1605 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001606 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001607 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001608 project = self._GetGerritProject()
1609 if project:
1610 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1611 # Fall back on still unique, but less efficient change number.
1612 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001613
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001614 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001615 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001616 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001617
tandrii5d48c322016-08-18 16:19:37 -07001618 @classmethod
1619 def PatchsetConfigKey(cls):
1620 return 'gerritpatchset'
1621
1622 @classmethod
1623 def CodereviewServerConfigKey(cls):
1624 return 'gerritserver'
1625
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001626 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001627 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001628 if settings.GetGerritSkipEnsureAuthenticated():
1629 # For projects with unusual authentication schemes.
1630 # See http://crbug.com/603378.
1631 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001632
1633 # Check presence of cookies only if using cookies-based auth method.
1634 cookie_auth = gerrit_util.Authenticator.get()
1635 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001636 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001637
Florian Mayerae510e82020-01-30 21:04:48 +00001638 remote_url = self.GetRemoteUrl()
1639 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001640 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001641 return
1642 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001643 logging.warning('Ignoring branch %(branch)s with non-https remote '
1644 '%(remote)s', {
1645 'branch': self.branch,
1646 'remote': self.GetRemoteUrl()
1647 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001648 return
1649
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001650 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001651 self.GetCodereviewServer()
1652 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001653 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001654
1655 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1656 git_auth = cookie_auth.get_auth_header(git_host)
1657 if gerrit_auth and git_auth:
1658 if gerrit_auth == git_auth:
1659 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001660 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001661 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001662 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001663 ' %s\n'
1664 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001665 ' Consider running the following command:\n'
1666 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001667 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001668 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001669 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001670 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001671 cookie_auth.get_new_password_message(git_host)))
1672 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001673 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001674 return
1675 else:
1676 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001677 ([] if gerrit_auth else [self._gerrit_host]) +
1678 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001679 DieWithError('Credentials for the following hosts are required:\n'
1680 ' %s\n'
1681 'These are read from %s (or legacy %s)\n'
1682 '%s' % (
1683 '\n '.join(missing),
1684 cookie_auth.get_gitcookies_path(),
1685 cookie_auth.get_netrc_path(),
1686 cookie_auth.get_new_password_message(git_host)))
1687
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001688 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001689 if not self.GetIssue():
1690 return
1691
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001692 status = self._GetChangeDetail()['status']
1693 if status in ('MERGED', 'ABANDONED'):
1694 DieWithError('Change %s has been %s, new uploads are not allowed' %
1695 (self.GetIssueURL(),
1696 'submitted' if status == 'MERGED' else 'abandoned'))
1697
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001698 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1699 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1700 # Apparently this check is not very important? Otherwise get_auth_email
1701 # could have been added to other implementations of Authenticator.
1702 cookies_auth = gerrit_util.Authenticator.get()
1703 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001704 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001705
1706 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001707 if self.GetIssueOwner() == cookies_user:
1708 return
1709 logging.debug('change %s owner is %s, cookies user is %s',
1710 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001711 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001712 # so ask what Gerrit thinks of this user.
1713 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1714 if details['email'] == self.GetIssueOwner():
1715 return
1716 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001717 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001718 'as %s.\n'
1719 'Uploading may fail due to lack of permissions.' %
1720 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1721 confirm_or_exit(action='upload')
1722
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001723 def _PostUnsetIssueProperties(self):
1724 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001725 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001726
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001727 def GetGerritObjForPresubmit(self):
1728 return presubmit_support.GerritAccessor(self._GetGerritHost())
1729
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001730 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001731 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001732 or CQ status, assuming adherence to a common workflow.
1733
1734 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001735 * 'error' - error from review tool (including deleted issues)
1736 * 'unsent' - no reviewers added
1737 * 'waiting' - waiting for review
1738 * 'reply' - waiting for uploader to reply to review
1739 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001740 * 'dry-run' - dry-running in the CQ
1741 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001742 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001743 """
1744 if not self.GetIssue():
1745 return None
1746
1747 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001748 data = self._GetChangeDetail([
1749 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001750 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001751 return 'error'
1752
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001753 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001754 return 'closed'
1755
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001756 cq_label = data['labels'].get('Commit-Queue', {})
1757 max_cq_vote = 0
1758 for vote in cq_label.get('all', []):
1759 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1760 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001761 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001762 if max_cq_vote == 1:
1763 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001764
Aaron Gable9ab38c62017-04-06 14:36:33 -07001765 if data['labels'].get('Code-Review', {}).get('approved'):
1766 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001767
1768 if not data.get('reviewers', {}).get('REVIEWER', []):
1769 return 'unsent'
1770
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001771 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001772 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001773 last_message_author = messages.pop().get('author', {})
1774 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001775 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1776 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001777 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001778 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001779 if last_message_author.get('_account_id') == owner:
1780 # Most recent message was by owner.
1781 return 'waiting'
1782 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001783 # Some reply from non-owner.
1784 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001785
1786 # Somehow there are no messages even though there are reviewers.
1787 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001788
1789 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001790 if not self.GetIssue():
1791 return None
1792
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001793 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001794 patchset = data['revisions'][data['current_revision']]['_number']
1795 self.SetPatchset(patchset)
1796 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001797
Aaron Gable636b13f2017-07-14 10:42:48 -07001798 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001799 gerrit_util.SetReview(
1800 self._GetGerritHost(), self._GerritChangeIdentifier(),
1801 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001802
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001803 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001804 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001805 # CURRENT_REVISION is included to get the latest patchset so that
1806 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001807 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001808 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1809 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001810 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001811 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001812 robot_file_comments = gerrit_util.GetChangeRobotComments(
1813 self._GetGerritHost(), self._GerritChangeIdentifier())
1814
1815 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001816 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001817 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001818 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001819 line_comments = file_comments.setdefault(path, [])
1820 line_comments.extend(
1821 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001822
1823 # Build dictionary of file comments for easy access and sorting later.
1824 # {author+date: {path: {patchset: {line: url+message}}}}
1825 comments = collections.defaultdict(
1826 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001827 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001828 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001829 tag = comment.get('tag', '')
1830 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001831 continue
1832 key = (comment['author']['email'], comment['updated'])
1833 if comment.get('side', 'REVISION') == 'PARENT':
1834 patchset = 'Base'
1835 else:
1836 patchset = 'PS%d' % comment['patch_set']
1837 line = comment.get('line', 0)
1838 url = ('https://%s/c/%s/%s/%s#%s%s' %
1839 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1840 'b' if comment.get('side') == 'PARENT' else '',
1841 str(line) if line else ''))
1842 comments[key][path][patchset][line] = (url, comment['message'])
1843
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001844 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001845 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001846 summary = self._BuildCommentSummary(msg, comments, readable)
1847 if summary:
1848 summaries.append(summary)
1849 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001850
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001851 @staticmethod
1852 def _BuildCommentSummary(msg, comments, readable):
1853 key = (msg['author']['email'], msg['date'])
1854 # Don't bother showing autogenerated messages that don't have associated
1855 # file or line comments. this will filter out most autogenerated
1856 # messages, but will keep robot comments like those from Tricium.
1857 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1858 if is_autogenerated and not comments.get(key):
1859 return None
1860 message = msg['message']
1861 # Gerrit spits out nanoseconds.
1862 assert len(msg['date'].split('.')[-1]) == 9
1863 date = datetime.datetime.strptime(msg['date'][:-3],
1864 '%Y-%m-%d %H:%M:%S.%f')
1865 if key in comments:
1866 message += '\n'
1867 for path, patchsets in sorted(comments.get(key, {}).items()):
1868 if readable:
1869 message += '\n%s' % path
1870 for patchset, lines in sorted(patchsets.items()):
1871 for line, (url, content) in sorted(lines.items()):
1872 if line:
1873 line_str = 'Line %d' % line
1874 path_str = '%s:%d:' % (path, line)
1875 else:
1876 line_str = 'File comment'
1877 path_str = '%s:0:' % path
1878 if readable:
1879 message += '\n %s, %s: %s' % (patchset, line_str, url)
1880 message += '\n %s\n' % content
1881 else:
1882 message += '\n%s ' % path_str
1883 message += '\n%s\n' % content
1884
1885 return _CommentSummary(
1886 date=date,
1887 message=message,
1888 sender=msg['author']['email'],
1889 autogenerated=is_autogenerated,
1890 # These could be inferred from the text messages and correlated with
1891 # Code-Review label maximum, however this is not reliable.
1892 # Leaving as is until the need arises.
1893 approval=False,
1894 disapproval=False,
1895 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001896
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001897 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001898 gerrit_util.AbandonChange(
1899 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001900
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001901 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001902 gerrit_util.SubmitChange(
1903 self._GetGerritHost(), self._GerritChangeIdentifier(),
1904 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001905
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001906 def _GetChangeDetail(self, options=None):
1907 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001908 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001909 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001910
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001911 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001912 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001913 options.append('CURRENT_COMMIT')
1914
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001915 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001916 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001917 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001918
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001919 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1920 # Assumption: data fetched before with extra options is suitable
1921 # for return for a smaller set of options.
1922 # For example, if we cached data for
1923 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1924 # and request is for options=[CURRENT_REVISION],
1925 # THEN we can return prior cached data.
1926 if options_set.issubset(cached_options_set):
1927 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001928
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001929 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001930 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001931 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001932 except gerrit_util.GerritError as e:
1933 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001934 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001935 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001936
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001937 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001938 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001939
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001940 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001941 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001942 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001943 data = gerrit_util.GetChangeCommit(
1944 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001945 except gerrit_util.GerritError as e:
1946 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001947 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001948 raise
agable32978d92016-11-01 12:55:02 -07001949 return data
1950
Karen Qian40c19422019-03-13 21:28:29 +00001951 def _IsCqConfigured(self):
1952 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001953 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001954
Olivier Robin75ee7252018-04-13 10:02:56 +02001955 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001956 if git_common.is_dirty_git_tree('land'):
1957 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001958
tandriid60367b2016-06-22 05:25:12 -07001959 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001960 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001961 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001962 'which can test and land changes for you. '
1963 'Are you sure you wish to bypass it?\n',
1964 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001965 differs = True
tandriic4344b52016-08-29 06:04:54 -07001966 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001967 # Note: git diff outputs nothing if there is no diff.
1968 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001969 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001970 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001971 if detail['current_revision'] == last_upload:
1972 differs = False
1973 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001974 print('WARNING: Local branch contents differ from latest uploaded '
1975 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001976 if differs:
1977 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001978 confirm_or_exit(
1979 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1980 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001981 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001982 elif not bypass_hooks:
1983 hook_results = self.RunHook(
1984 committing=True,
1985 may_prompt=not force,
1986 verbose=verbose,
Edward Lemur7f6dec02020-02-06 20:23:58 +00001987 change=self.GetChange(self.GetCommonAncestorWithUpstream()),
Olivier Robin75ee7252018-04-13 10:02:56 +02001988 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001989 if not hook_results.should_continue():
1990 return 1
1991
1992 self.SubmitIssue(wait_for_merge=True)
1993 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001994 links = self._GetChangeCommit().get('web_links', [])
1995 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001996 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001997 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001998 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001999 return 0
2000
Edward Lemurf38bc172019-09-03 21:02:13 +00002001 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002002 assert parsed_issue_arg.valid
2003
Edward Lemur125d60a2019-09-13 18:25:41 +00002004 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002005
2006 if parsed_issue_arg.hostname:
2007 self._gerrit_host = parsed_issue_arg.hostname
2008 self._gerrit_server = 'https://%s' % self._gerrit_host
2009
tandriic2405f52016-10-10 08:13:15 -07002010 try:
2011 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002012 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002013 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002014
2015 if not parsed_issue_arg.patchset:
2016 # Use current revision by default.
2017 revision_info = detail['revisions'][detail['current_revision']]
2018 patchset = int(revision_info['_number'])
2019 else:
2020 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002021 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002022 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2023 break
2024 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002025 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002026 (parsed_issue_arg.patchset, self.GetIssue()))
2027
Edward Lemur125d60a2019-09-13 18:25:41 +00002028 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002029 if remote_url.endswith('.git'):
2030 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002031 remote_url = remote_url.rstrip('/')
2032
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002033 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002034 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002035
2036 if remote_url != fetch_info['url']:
2037 DieWithError('Trying to patch a change from %s but this repo appears '
2038 'to be %s.' % (fetch_info['url'], remote_url))
2039
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002040 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002041
Aaron Gable62619a32017-06-16 08:22:09 -07002042 if force:
2043 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2044 print('Checked out commit for change %i patchset %i locally' %
2045 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002046 elif nocommit:
2047 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2048 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002049 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002050 RunGit(['cherry-pick', 'FETCH_HEAD'])
2051 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002052 (parsed_issue_arg.issue, patchset))
2053 print('Note: this created a local commit which does not have '
2054 'the same hash as the one uploaded for review. This will make '
2055 'uploading changes based on top of this branch difficult.\n'
2056 'If you want to do that, use "git cl patch --force" instead.')
2057
Stefan Zagerd08043c2017-10-12 12:07:02 -07002058 if self.GetBranch():
2059 self.SetIssue(parsed_issue_arg.issue)
2060 self.SetPatchset(patchset)
2061 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2062 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2063 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2064 else:
2065 print('WARNING: You are in detached HEAD state.\n'
2066 'The patch has been applied to your checkout, but you will not be '
2067 'able to upload a new patch set to the gerrit issue.\n'
2068 'Try using the \'-b\' option if you would like to work on a '
2069 'branch and/or upload a new patch set.')
2070
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002071 return 0
2072
tandrii16e0b4e2016-06-07 10:34:28 -07002073 def _GerritCommitMsgHookCheck(self, offer_removal):
2074 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2075 if not os.path.exists(hook):
2076 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002077 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2078 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002079 data = gclient_utils.FileRead(hook)
2080 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2081 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002082 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002083 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002084 'and may interfere with it in subtle ways.\n'
2085 'We recommend you remove the commit-msg hook.')
2086 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002087 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002088 gclient_utils.rm_file_or_tree(hook)
2089 print('Gerrit commit-msg hook removed.')
2090 else:
2091 print('OK, will keep Gerrit commit-msg hook in place.')
2092
Edward Lemur1b52d872019-05-09 21:12:12 +00002093 def _CleanUpOldTraces(self):
2094 """Keep only the last |MAX_TRACES| traces."""
2095 try:
2096 traces = sorted([
2097 os.path.join(TRACES_DIR, f)
2098 for f in os.listdir(TRACES_DIR)
2099 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2100 and not f.startswith('tmp'))
2101 ])
2102 traces_to_delete = traces[:-MAX_TRACES]
2103 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002104 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002105 except OSError:
2106 print('WARNING: Failed to remove old git traces from\n'
2107 ' %s'
2108 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002109
Edward Lemur5737f022019-05-17 01:24:00 +00002110 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002111 """Zip and write the git push traces stored in traces_dir."""
2112 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002113 traces_zip = trace_name + '-traces'
2114 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002115 # Create a temporary dir to store git config and gitcookies in. It will be
2116 # compressed and stored next to the traces.
2117 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002118 git_info_zip = trace_name + '-git-info'
2119
Edward Lemur5737f022019-05-17 01:24:00 +00002120 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002121 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002122 git_push_metadata['now'] = git_push_metadata['now'].decode(
2123 sys.stdin.encoding)
2124
Edward Lemur1b52d872019-05-09 21:12:12 +00002125 git_push_metadata['trace_name'] = trace_name
2126 gclient_utils.FileWrite(
2127 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2128
2129 # Keep only the first 6 characters of the git hashes on the packet
2130 # trace. This greatly decreases size after compression.
2131 packet_traces = os.path.join(traces_dir, 'trace-packet')
2132 if os.path.isfile(packet_traces):
2133 contents = gclient_utils.FileRead(packet_traces)
2134 gclient_utils.FileWrite(
2135 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2136 shutil.make_archive(traces_zip, 'zip', traces_dir)
2137
2138 # Collect and compress the git config and gitcookies.
2139 git_config = RunGit(['config', '-l'])
2140 gclient_utils.FileWrite(
2141 os.path.join(git_info_dir, 'git-config'),
2142 git_config)
2143
2144 cookie_auth = gerrit_util.Authenticator.get()
2145 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2146 gitcookies_path = cookie_auth.get_gitcookies_path()
2147 if os.path.isfile(gitcookies_path):
2148 gitcookies = gclient_utils.FileRead(gitcookies_path)
2149 gclient_utils.FileWrite(
2150 os.path.join(git_info_dir, 'gitcookies'),
2151 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2152 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2153
Edward Lemur1b52d872019-05-09 21:12:12 +00002154 gclient_utils.rmtree(git_info_dir)
2155
2156 def _RunGitPushWithTraces(
2157 self, change_desc, refspec, refspec_opts, git_push_metadata):
2158 """Run git push and collect the traces resulting from the execution."""
2159 # Create a temporary directory to store traces in. Traces will be compressed
2160 # and stored in a 'traces' dir inside depot_tools.
2161 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002162 trace_name = os.path.join(
2163 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002164
2165 env = os.environ.copy()
2166 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2167 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002168 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002169 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2170 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2171 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2172
2173 try:
2174 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002175 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002176 before_push = time_time()
2177 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002178 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002179 env=env,
2180 print_stdout=True,
2181 # Flush after every line: useful for seeing progress when running as
2182 # recipe.
2183 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002184 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002185 except subprocess2.CalledProcessError as e:
2186 push_returncode = e.returncode
2187 DieWithError('Failed to create a change. Please examine output above '
2188 'for the reason of the failure.\n'
2189 'Hint: run command below to diagnose common Git/Gerrit '
2190 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002191 ' git cl creds-check\n'
2192 '\n'
2193 'If git-cl is not working correctly, file a bug under the '
2194 'Infra>SDK component including the files below.\n'
2195 'Review the files before upload, since they might contain '
2196 'sensitive information.\n'
2197 'Set the Restrict-View-Google label so that they are not '
2198 'publicly accessible.\n'
2199 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002200 change_desc)
2201 finally:
2202 execution_time = time_time() - before_push
2203 metrics.collector.add_repeated('sub_commands', {
2204 'command': 'git push',
2205 'execution_time': execution_time,
2206 'exit_code': push_returncode,
2207 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2208 })
2209
Edward Lemur1b52d872019-05-09 21:12:12 +00002210 git_push_metadata['execution_time'] = execution_time
2211 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002212 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002213
Edward Lemur1b52d872019-05-09 21:12:12 +00002214 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002215 gclient_utils.rmtree(traces_dir)
2216
2217 return push_stdout
2218
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002219 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002220 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002221 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002222 # Load default for user, repo, squash=true, in this order.
2223 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002224
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002225 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002226 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002227 # This may be None; default fallback value is determined in logic below.
2228 title = options.title
2229
Dominic Battre7d1c4842017-10-27 09:17:28 +02002230 # Extract bug number from branch name.
2231 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002232 fixed = options.fixed
2233 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2234 self.GetBranch())
2235 if not bug and not fixed and match:
2236 if match.group('type') == 'bug':
2237 bug = match.group('bugnum')
2238 else:
2239 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002240
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002241 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002242 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002243 if self.GetIssue():
2244 # Try to get the message from a previous upload.
Edward Lemur6c6827c2020-02-06 21:15:18 +00002245 message = self.FetchDescription()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002246 if not message:
2247 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002248 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002249 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002250 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002251 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002252 # When uploading a subsequent patchset, -m|--message is taken
2253 # as the patchset title if --title was not provided.
2254 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002255 else:
2256 default_title = RunGit(
2257 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002258 if options.force:
2259 title = default_title
2260 else:
2261 title = ask_for_data(
2262 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002263
2264 # User requested to change description
2265 if options.edit_description:
2266 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2267 change_desc.prompt()
2268 message = change_desc.description
2269
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002270 change_id = self._GetChangeDetail()['change_id']
2271 while True:
2272 footer_change_ids = git_footers.get_footer_change_id(message)
2273 if footer_change_ids == [change_id]:
2274 break
2275 if not footer_change_ids:
2276 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002277 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002278 continue
2279 # There is already a valid footer but with different or several ids.
2280 # Doing this automatically is non-trivial as we don't want to lose
2281 # existing other footers, yet we want to append just 1 desired
2282 # Change-Id. Thus, just create a new footer, but let user verify the
2283 # new description.
2284 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002285 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002286 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002287 print(
2288 'WARNING: change %s has Change-Id footer(s):\n'
2289 ' %s\n'
2290 'but change has Change-Id %s, according to Gerrit.\n'
2291 'Please, check the proposed correction to the description, '
2292 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2293 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2294 change_id))
2295 confirm_or_exit(action='edit')
2296 change_desc.prompt()
2297
2298 message = change_desc.description
2299 if not message:
2300 DieWithError("Description is empty. Aborting...")
2301
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002302 # Continue the while loop.
2303 # Sanity check of this code - we should end up with proper message
2304 # footer.
2305 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002306 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002307 else: # if not self.GetIssue()
2308 if options.message:
2309 message = options.message
2310 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002311 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002312 if options.title:
2313 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002314 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002315 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002316 change_desc.prompt()
2317
Aaron Gableb56ad332017-01-06 15:24:31 -08002318 # On first upload, patchset title is always this string, while
2319 # --title flag gets converted to first line of message.
2320 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002321 if not change_desc.description:
2322 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002323 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002324 if len(change_ids) > 1:
2325 DieWithError('too many Change-Id footers, at most 1 allowed.')
2326 if not change_ids:
2327 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002328 change_desc.set_description(git_footers.add_footer_change_id(
2329 change_desc.description,
2330 GenerateGerritChangeId(change_desc.description)))
2331 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002332 assert len(change_ids) == 1
2333 change_id = change_ids[0]
2334
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002335 if options.reviewers or options.tbrs or options.add_owners_to:
2336 change_desc.update_reviewers(options.reviewers, options.tbrs,
2337 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002338 if options.preserve_tryjobs:
2339 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002340
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002341 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002342 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2343 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002344 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002345 with gclient_utils.temporary_file() as desc_tempfile:
2346 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2347 ref_to_push = RunGit(
2348 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002349 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002350 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002351 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002352 if not change_desc.description:
2353 DieWithError("Description is empty. Aborting...")
2354
2355 if not git_footers.get_footer_change_id(change_desc.description):
2356 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002357 change_desc.set_description(
2358 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002359 if options.reviewers or options.tbrs or options.add_owners_to:
2360 change_desc.update_reviewers(options.reviewers, options.tbrs,
2361 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002362 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002363 # For no-squash mode, we assume the remote called "origin" is the one we
2364 # want. It is not worthwhile to support different workflows for
2365 # no-squash mode.
2366 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002367 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2368
2369 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002370 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002371 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2372 ref_to_push)]).splitlines()
2373 if len(commits) > 1:
2374 print('WARNING: This will upload %d commits. Run the following command '
2375 'to see which commits will be uploaded: ' % len(commits))
2376 print('git log %s..%s' % (parent, ref_to_push))
2377 print('You can also use `git squash-branch` to squash these into a '
2378 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002379 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002380
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002381 if options.reviewers or options.tbrs or options.add_owners_to:
2382 change_desc.update_reviewers(options.reviewers, options.tbrs,
2383 options.add_owners_to, change)
2384
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002385 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002386 cc = []
2387 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2388 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2389 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002390 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002391 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002392 if options.cc:
2393 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002394 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002395 if change_desc.get_cced():
2396 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002397 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2398 valid_accounts = set(reviewers + cc)
2399 # TODO(crbug/877717): relax this for all hosts.
2400 else:
2401 valid_accounts = gerrit_util.ValidAccounts(
2402 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002403 logging.info('accounts %s are recognized, %s invalid',
2404 sorted(valid_accounts),
2405 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002406
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002407 # Extra options that can be specified at push time. Doc:
2408 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002409 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002410
Aaron Gable844cf292017-06-28 11:32:59 -07002411 # By default, new changes are started in WIP mode, and subsequent patchsets
2412 # don't send email. At any time, passing --send-mail will mark the change
2413 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002414 if options.send_mail:
2415 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002416 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002417 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002418 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002419 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002420 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002421
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002422 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002423 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002424
Aaron Gable9b713dd2016-12-14 16:04:21 -08002425 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002426 # Punctuation and whitespace in |title| must be percent-encoded.
2427 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002428
agablec6787972016-09-09 16:13:34 -07002429 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002430 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002431
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002432 for r in sorted(reviewers):
2433 if r in valid_accounts:
2434 refspec_opts.append('r=%s' % r)
2435 reviewers.remove(r)
2436 else:
2437 # TODO(tandrii): this should probably be a hard failure.
2438 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2439 % r)
2440 for c in sorted(cc):
2441 # refspec option will be rejected if cc doesn't correspond to an
2442 # account, even though REST call to add such arbitrary cc may succeed.
2443 if c in valid_accounts:
2444 refspec_opts.append('cc=%s' % c)
2445 cc.remove(c)
2446
rmistry9eadede2016-09-19 11:22:43 -07002447 if options.topic:
2448 # Documentation on Gerrit topics is here:
2449 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002450 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002451
Edward Lemur687ca902018-12-05 02:30:30 +00002452 if options.enable_auto_submit:
2453 refspec_opts.append('l=Auto-Submit+1')
2454 if options.use_commit_queue:
2455 refspec_opts.append('l=Commit-Queue+2')
2456 elif options.cq_dry_run:
2457 refspec_opts.append('l=Commit-Queue+1')
2458
2459 if change_desc.get_reviewers(tbr_only=True):
2460 score = gerrit_util.GetCodeReviewTbrScore(
2461 self._GetGerritHost(),
2462 self._GetGerritProject())
2463 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002464
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002465 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002466 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002467 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002468 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002469 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2470
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002471 refspec_suffix = ''
2472 if refspec_opts:
2473 refspec_suffix = '%' + ','.join(refspec_opts)
2474 assert ' ' not in refspec_suffix, (
2475 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2476 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2477
Edward Lemur1b52d872019-05-09 21:12:12 +00002478 git_push_metadata = {
2479 'gerrit_host': self._GetGerritHost(),
2480 'title': title or '<untitled>',
2481 'change_id': change_id,
2482 'description': change_desc.description,
2483 }
2484 push_stdout = self._RunGitPushWithTraces(
2485 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002486
2487 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002488 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002489 change_numbers = [m.group(1)
2490 for m in map(regex.match, push_stdout.splitlines())
2491 if m]
2492 if len(change_numbers) != 1:
2493 DieWithError(
2494 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002495 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002496 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002497 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002498
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002499 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002500 # GetIssue() is not set in case of non-squash uploads according to tests.
2501 # TODO(agable): non-squash uploads in git cl should be removed.
2502 gerrit_util.AddReviewers(
2503 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002504 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002505 reviewers, cc,
2506 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002507
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002508 return 0
2509
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002510 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2511 change_desc):
2512 """Computes parent of the generated commit to be uploaded to Gerrit.
2513
2514 Returns revision or a ref name.
2515 """
2516 if custom_cl_base:
2517 # Try to avoid creating additional unintended CLs when uploading, unless
2518 # user wants to take this risk.
2519 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2520 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2521 local_ref_of_target_remote])
2522 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002523 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002524 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2525 'If you proceed with upload, more than 1 CL may be created by '
2526 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2527 'If you are certain that specified base `%s` has already been '
2528 'uploaded to Gerrit as another CL, you may proceed.\n' %
2529 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2530 if not force:
2531 confirm_or_exit(
2532 'Do you take responsibility for cleaning up potential mess '
2533 'resulting from proceeding with upload?',
2534 action='upload')
2535 return custom_cl_base
2536
Aaron Gablef97e33d2017-03-30 15:44:27 -07002537 if remote != '.':
2538 return self.GetCommonAncestorWithUpstream()
2539
2540 # If our upstream branch is local, we base our squashed commit on its
2541 # squashed version.
2542 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2543
Aaron Gablef97e33d2017-03-30 15:44:27 -07002544 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002545 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002546
2547 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002548 # TODO(tandrii): consider checking parent change in Gerrit and using its
2549 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2550 # the tree hash of the parent branch. The upside is less likely bogus
2551 # requests to reupload parent change just because it's uploadhash is
2552 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002553 parent = RunGit(['config',
2554 'branch.%s.gerritsquashhash' % upstream_branch_name],
2555 error_ok=True).strip()
2556 # Verify that the upstream branch has been uploaded too, otherwise
2557 # Gerrit will create additional CLs when uploading.
2558 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2559 RunGitSilent(['rev-parse', parent + ':'])):
2560 DieWithError(
2561 '\nUpload upstream branch %s first.\n'
2562 'It is likely that this branch has been rebased since its last '
2563 'upload, so you just need to upload it again.\n'
2564 '(If you uploaded it with --no-squash, then branch dependencies '
2565 'are not supported, and you should reupload with --squash.)'
2566 % upstream_branch_name,
2567 change_desc)
2568 return parent
2569
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002570 def _AddChangeIdToCommitMessage(self, options, args):
2571 """Re-commits using the current message, assumes the commit hook is in
2572 place.
2573 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002574 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002575 git_command = ['commit', '--amend', '-m', log_desc]
2576 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002577 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002578 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002579 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002580 return new_log_desc
2581 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002582 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002583
tandriie113dfd2016-10-11 10:20:12 -07002584 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002585 try:
2586 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002587 except GerritChangeNotExists:
2588 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002589
2590 if data['status'] in ('ABANDONED', 'MERGED'):
2591 return 'CL %s is closed' % self.GetIssue()
2592
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002593 def GetGerritChange(self, patchset=None):
2594 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002595 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002596 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002597 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002598 data = self._GetChangeDetail(['ALL_REVISIONS'])
2599
2600 assert host and issue and patchset, 'CL must be uploaded first'
2601
2602 has_patchset = any(
2603 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002604 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002605 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002606 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002607 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002608
tandrii8c5a3532016-11-04 07:52:02 -07002609 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002610 'host': host,
2611 'change': issue,
2612 'project': data['project'],
2613 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002614 }
tandriie113dfd2016-10-11 10:20:12 -07002615
tandriide281ae2016-10-12 06:02:30 -07002616 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002617 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002618
Edward Lemur707d70b2018-02-07 00:50:14 +01002619 def GetReviewers(self):
2620 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002621 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002622
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002623
tandriif9aefb72016-07-01 09:06:51 -07002624def _get_bug_line_values(default_project, bugs):
2625 """Given default_project and comma separated list of bugs, yields bug line
2626 values.
2627
2628 Each bug can be either:
2629 * a number, which is combined with default_project
2630 * string, which is left as is.
2631
2632 This function may produce more than one line, because bugdroid expects one
2633 project per line.
2634
2635 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2636 ['v8:123', 'chromium:789']
2637 """
2638 default_bugs = []
2639 others = []
2640 for bug in bugs.split(','):
2641 bug = bug.strip()
2642 if bug:
2643 try:
2644 default_bugs.append(int(bug))
2645 except ValueError:
2646 others.append(bug)
2647
2648 if default_bugs:
2649 default_bugs = ','.join(map(str, default_bugs))
2650 if default_project:
2651 yield '%s:%s' % (default_project, default_bugs)
2652 else:
2653 yield default_bugs
2654 for other in sorted(others):
2655 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2656 yield other
2657
2658
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002659class ChangeDescription(object):
2660 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002661 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002662 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002663 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002664 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002665 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002666 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2667 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002668 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002669 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002670
Dan Beamd8b04ca2019-10-10 21:23:26 +00002671 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002672 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002673 if bug:
2674 regexp = re.compile(self.BUG_LINE)
2675 prefix = settings.GetBugPrefix()
2676 if not any((regexp.match(line) for line in self._description_lines)):
2677 values = list(_get_bug_line_values(prefix, bug))
2678 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002679 if fixed:
2680 regexp = re.compile(self.FIXED_LINE)
2681 prefix = settings.GetBugPrefix()
2682 if not any((regexp.match(line) for line in self._description_lines)):
2683 values = list(_get_bug_line_values(prefix, fixed))
2684 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002685
agable@chromium.org42c20792013-09-12 17:34:49 +00002686 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002687 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002688 return '\n'.join(self._description_lines)
2689
2690 def set_description(self, desc):
2691 if isinstance(desc, basestring):
2692 lines = desc.splitlines()
2693 else:
2694 lines = [line.rstrip() for line in desc]
2695 while lines and not lines[0]:
2696 lines.pop(0)
2697 while lines and not lines[-1]:
2698 lines.pop(-1)
2699 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002700
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002701 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2702 """Rewrites the R=/TBR= line(s) as a single line each.
2703
2704 Args:
2705 reviewers (list(str)) - list of additional emails to use for reviewers.
2706 tbrs (list(str)) - list of additional emails to use for TBRs.
2707 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2708 the change that are missing OWNER coverage. If this is not None, you
2709 must also pass a value for `change`.
2710 change (Change) - The Change that should be used for OWNERS lookups.
2711 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002712 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002713 assert isinstance(tbrs, list), tbrs
2714
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002715 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002716 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002717
2718 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002719 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002720
2721 reviewers = set(reviewers)
2722 tbrs = set(tbrs)
2723 LOOKUP = {
2724 'TBR': tbrs,
2725 'R': reviewers,
2726 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002727
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002728 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002729 regexp = re.compile(self.R_LINE)
2730 matches = [regexp.match(line) for line in self._description_lines]
2731 new_desc = [l for i, l in enumerate(self._description_lines)
2732 if not matches[i]]
2733 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002734
agable@chromium.org42c20792013-09-12 17:34:49 +00002735 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002736
2737 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002738 for match in matches:
2739 if not match:
2740 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002741 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2742
2743 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002744 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002745 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002746 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002747 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002748 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002749 LOOKUP[add_owners_to].update(
2750 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002751
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002752 # If any folks ended up in both groups, remove them from tbrs.
2753 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002754
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002755 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2756 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002757
2758 # Put the new lines in the description where the old first R= line was.
2759 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2760 if 0 <= line_loc < len(self._description_lines):
2761 if new_tbr_line:
2762 self._description_lines.insert(line_loc, new_tbr_line)
2763 if new_r_line:
2764 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002765 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002766 if new_r_line:
2767 self.append_footer(new_r_line)
2768 if new_tbr_line:
2769 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002770
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002771 def set_preserve_tryjobs(self):
2772 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2773 footers = git_footers.parse_footers(self.description)
2774 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2775 if v.lower() == 'true':
2776 return
2777 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2778
Anthony Polito8b955342019-09-24 19:01:36 +00002779 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002780 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002781 self.set_description([
2782 '# Enter a description of the change.',
2783 '# This will be displayed on the codereview site.',
2784 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002785 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002786 '--------------------',
2787 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002788 bug_regexp = re.compile(self.BUG_LINE)
2789 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002790 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002791 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2792 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002793 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002794
agable@chromium.org42c20792013-09-12 17:34:49 +00002795 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002796 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002797 if not content:
2798 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002799 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002800
Bruce Dawson2377b012018-01-11 16:46:49 -08002801 # Strip off comments and default inserted "Bug:" line.
2802 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002803 (line.startswith('#') or
2804 line.rstrip() == "Bug:" or
2805 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002806 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002807 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002808 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002809
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002810 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002811 """Adds a footer line to the description.
2812
2813 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2814 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2815 that Gerrit footers are always at the end.
2816 """
2817 parsed_footer_line = git_footers.parse_footer(line)
2818 if parsed_footer_line:
2819 # Line is a gerrit footer in the form: Footer-Key: any value.
2820 # Thus, must be appended observing Gerrit footer rules.
2821 self.set_description(
2822 git_footers.add_footer(self.description,
2823 key=parsed_footer_line[0],
2824 value=parsed_footer_line[1]))
2825 return
2826
2827 if not self._description_lines:
2828 self._description_lines.append(line)
2829 return
2830
2831 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2832 if gerrit_footers:
2833 # git_footers.split_footers ensures that there is an empty line before
2834 # actual (gerrit) footers, if any. We have to keep it that way.
2835 assert top_lines and top_lines[-1] == ''
2836 top_lines, separator = top_lines[:-1], top_lines[-1:]
2837 else:
2838 separator = [] # No need for separator if there are no gerrit_footers.
2839
2840 prev_line = top_lines[-1] if top_lines else ''
2841 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2842 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2843 top_lines.append('')
2844 top_lines.append(line)
2845 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002846
tandrii99a72f22016-08-17 14:33:24 -07002847 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002848 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002849 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002850 reviewers = [match.group(2).strip()
2851 for match in matches
2852 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002853 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002854
bradnelsond975b302016-10-23 12:20:23 -07002855 def get_cced(self):
2856 """Retrieves the list of reviewers."""
2857 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2858 cced = [match.group(2).strip() for match in matches if match]
2859 return cleanup_list(cced)
2860
Nodir Turakulov23b82142017-11-16 11:04:25 -08002861 def get_hash_tags(self):
2862 """Extracts and sanitizes a list of Gerrit hashtags."""
2863 subject = (self._description_lines or ('',))[0]
2864 subject = re.sub(
2865 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2866
2867 tags = []
2868 start = 0
2869 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2870 while True:
2871 m = bracket_exp.match(subject, start)
2872 if not m:
2873 break
2874 tags.append(self.sanitize_hash_tag(m.group(1)))
2875 start = m.end()
2876
2877 if not tags:
2878 # Try "Tag: " prefix.
2879 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2880 if m:
2881 tags.append(self.sanitize_hash_tag(m.group(1)))
2882 return tags
2883
2884 @classmethod
2885 def sanitize_hash_tag(cls, tag):
2886 """Returns a sanitized Gerrit hash tag.
2887
2888 A sanitized hashtag can be used as a git push refspec parameter value.
2889 """
2890 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2891
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002892 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2893 """Updates this commit description given the parent.
2894
2895 This is essentially what Gnumbd used to do.
2896 Consult https://goo.gl/WMmpDe for more details.
2897 """
2898 assert parent_msg # No, orphan branch creation isn't supported.
2899 assert parent_hash
2900 assert dest_ref
2901 parent_footer_map = git_footers.parse_footers(parent_msg)
2902 # This will also happily parse svn-position, which GnumbD is no longer
2903 # supporting. While we'd generate correct footers, the verifier plugin
2904 # installed in Gerrit will block such commit (ie git push below will fail).
2905 parent_position = git_footers.get_position(parent_footer_map)
2906
2907 # Cherry-picks may have last line obscuring their prior footers,
2908 # from git_footers perspective. This is also what Gnumbd did.
2909 cp_line = None
2910 if (self._description_lines and
2911 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2912 cp_line = self._description_lines.pop()
2913
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002914 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002915
2916 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2917 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002918 for i, line in enumerate(footer_lines):
2919 k, v = git_footers.parse_footer(line) or (None, None)
2920 if k and k.startswith('Cr-'):
2921 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002922
2923 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01002924 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002925 if parent_position[0] == dest_ref:
2926 # Same branch as parent.
2927 number = int(parent_position[1]) + 1
2928 else:
2929 number = 1 # New branch, and extra lineage.
2930 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
2931 int(parent_position[1])))
2932
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002933 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
2934 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002935
2936 self._description_lines = top_lines
2937 if cp_line:
2938 self._description_lines.append(cp_line)
2939 if self._description_lines[-1] != '':
2940 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002941 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002942
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002943
Aaron Gablea1bab272017-04-11 16:38:18 -07002944def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002945 """Retrieves the reviewers that approved a CL from the issue properties with
2946 messages.
2947
2948 Note that the list may contain reviewers that are not committer, thus are not
2949 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07002950
2951 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002952 """
Aaron Gablea1bab272017-04-11 16:38:18 -07002953 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002954 return sorted(
2955 set(
2956 message['sender']
2957 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07002958 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002959 )
2960 )
2961
2962
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002963def FindCodereviewSettingsFile(filename='codereview.settings'):
2964 """Finds the given file starting in the cwd and going up.
2965
2966 Only looks up to the top of the repository unless an
2967 'inherit-review-settings-ok' file exists in the root of the repository.
2968 """
2969 inherit_ok_file = 'inherit-review-settings-ok'
2970 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002971 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002972 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2973 root = '/'
2974 while True:
2975 if filename in os.listdir(cwd):
2976 if os.path.isfile(os.path.join(cwd, filename)):
2977 return open(os.path.join(cwd, filename))
2978 if cwd == root:
2979 break
2980 cwd = os.path.dirname(cwd)
2981
2982
2983def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002984 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002985 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002986
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002987 def SetProperty(name, setting, unset_error_ok=False):
2988 fullname = 'rietveld.' + name
2989 if setting in keyvals:
2990 RunGit(['config', fullname, keyvals[setting]])
2991 else:
2992 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2993
tandrii48df5812016-10-17 03:55:37 -07002994 if not keyvals.get('GERRIT_HOST', False):
2995 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002996 # Only server setting is required. Other settings can be absent.
2997 # In that case, we ignore errors raised during option deletion attempt.
2998 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2999 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3000 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003001 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003002 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3003 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003004 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3005 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003006 SetProperty(
3007 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003008
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003009 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003010 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003011
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003012 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003013 RunGit(['config', 'gerrit.squash-uploads',
3014 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003015
tandrii@chromium.org28253532016-04-14 13:46:56 +00003016 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003017 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003018 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3019
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003020 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003021 # should be of the form
3022 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3023 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003024 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3025 keyvals['ORIGIN_URL_CONFIG']])
3026
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003027
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003028def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003029 """Downloads a network object to a local file, like urllib.urlretrieve.
3030
3031 This is necessary because urllib is broken for SSL connections via a proxy.
3032 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003033 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003034 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003035
3036
ukai@chromium.org712d6102013-11-27 00:52:58 +00003037def hasSheBang(fname):
3038 """Checks fname is a #! script."""
3039 with open(fname) as f:
3040 return f.read(2).startswith('#!')
3041
3042
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003043# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3044def DownloadHooks(*args, **kwargs):
3045 pass
3046
3047
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003048def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003049 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003050
3051 Args:
3052 force: True to update hooks. False to install hooks if not present.
3053 """
3054 if not settings.GetIsGerrit():
3055 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003056 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003057 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3058 if not os.access(dst, os.X_OK):
3059 if os.path.exists(dst):
3060 if not force:
3061 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003062 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003063 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003064 if not hasSheBang(dst):
3065 DieWithError('Not a script: %s\n'
3066 'You need to download from\n%s\n'
3067 'into .git/hooks/commit-msg and '
3068 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003069 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3070 except Exception:
3071 if os.path.exists(dst):
3072 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003073 DieWithError('\nFailed to download hooks.\n'
3074 'You need to download from\n%s\n'
3075 'into .git/hooks/commit-msg and '
3076 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003077
3078
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003079class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003080 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003081
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003082 _GOOGLESOURCE = 'googlesource.com'
3083
3084 def __init__(self):
3085 # Cached list of [host, identity, source], where source is either
3086 # .gitcookies or .netrc.
3087 self._all_hosts = None
3088
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003089 def ensure_configured_gitcookies(self):
3090 """Runs checks and suggests fixes to make git use .gitcookies from default
3091 path."""
3092 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3093 configured_path = RunGitSilent(
3094 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003095 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003096 if configured_path:
3097 self._ensure_default_gitcookies_path(configured_path, default)
3098 else:
3099 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003100
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003101 @staticmethod
3102 def _ensure_default_gitcookies_path(configured_path, default_path):
3103 assert configured_path
3104 if configured_path == default_path:
3105 print('git is already configured to use your .gitcookies from %s' %
3106 configured_path)
3107 return
3108
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003109 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003110 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3111 (configured_path, default_path))
3112
3113 if not os.path.exists(configured_path):
3114 print('However, your configured .gitcookies file is missing.')
3115 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3116 action='reconfigure')
3117 RunGit(['config', '--global', 'http.cookiefile', default_path])
3118 return
3119
3120 if os.path.exists(default_path):
3121 print('WARNING: default .gitcookies file already exists %s' %
3122 default_path)
3123 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3124 default_path)
3125
3126 confirm_or_exit('Move existing .gitcookies to default location?',
3127 action='move')
3128 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003129 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003130 print('Moved and reconfigured git to use .gitcookies from %s' %
3131 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003132
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003133 @staticmethod
3134 def _configure_gitcookies_path(default_path):
3135 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3136 if os.path.exists(netrc_path):
3137 print('You seem to be using outdated .netrc for git credentials: %s' %
3138 netrc_path)
3139 print('This tool will guide you through setting up recommended '
3140 '.gitcookies store for git credentials.\n'
3141 '\n'
3142 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3143 ' git config --global --unset http.cookiefile\n'
3144 ' mv %s %s.backup\n\n' % (default_path, default_path))
3145 confirm_or_exit(action='setup .gitcookies')
3146 RunGit(['config', '--global', 'http.cookiefile', default_path])
3147 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003148
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003149 def get_hosts_with_creds(self, include_netrc=False):
3150 if self._all_hosts is None:
3151 a = gerrit_util.CookiesAuthenticator()
3152 self._all_hosts = [
3153 (h, u, s)
3154 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003155 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3156 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003157 )
3158 if h.endswith(self._GOOGLESOURCE)
3159 ]
3160
3161 if include_netrc:
3162 return self._all_hosts
3163 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3164
3165 def print_current_creds(self, include_netrc=False):
3166 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3167 if not hosts:
3168 print('No Git/Gerrit credentials found')
3169 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003170 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003171 header = [('Host', 'User', 'Which file'),
3172 ['=' * l for l in lengths]]
3173 for row in (header + hosts):
3174 print('\t'.join((('%%+%ds' % l) % s)
3175 for l, s in zip(lengths, row)))
3176
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003177 @staticmethod
3178 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003179 """Parses identity "git-<username>.domain" into <username> and domain."""
3180 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003181 # distinguishable from sub-domains. But we do know typical domains:
3182 if identity.endswith('.chromium.org'):
3183 domain = 'chromium.org'
3184 username = identity[:-len('.chromium.org')]
3185 else:
3186 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003187 if username.startswith('git-'):
3188 username = username[len('git-'):]
3189 return username, domain
3190
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003191 def _canonical_git_googlesource_host(self, host):
3192 """Normalizes Gerrit hosts (with '-review') to Git host."""
3193 assert host.endswith(self._GOOGLESOURCE)
3194 # Prefix doesn't include '.' at the end.
3195 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3196 if prefix.endswith('-review'):
3197 prefix = prefix[:-len('-review')]
3198 return prefix + '.' + self._GOOGLESOURCE
3199
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003200 def _canonical_gerrit_googlesource_host(self, host):
3201 git_host = self._canonical_git_googlesource_host(host)
3202 prefix = git_host.split('.', 1)[0]
3203 return prefix + '-review.' + self._GOOGLESOURCE
3204
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003205 def _get_counterpart_host(self, host):
3206 assert host.endswith(self._GOOGLESOURCE)
3207 git = self._canonical_git_googlesource_host(host)
3208 gerrit = self._canonical_gerrit_googlesource_host(git)
3209 return git if gerrit == host else gerrit
3210
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003211 def has_generic_host(self):
3212 """Returns whether generic .googlesource.com has been configured.
3213
3214 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3215 """
3216 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3217 if host == '.' + self._GOOGLESOURCE:
3218 return True
3219 return False
3220
3221 def _get_git_gerrit_identity_pairs(self):
3222 """Returns map from canonic host to pair of identities (Git, Gerrit).
3223
3224 One of identities might be None, meaning not configured.
3225 """
3226 host_to_identity_pairs = {}
3227 for host, identity, _ in self.get_hosts_with_creds():
3228 canonical = self._canonical_git_googlesource_host(host)
3229 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3230 idx = 0 if canonical == host else 1
3231 pair[idx] = identity
3232 return host_to_identity_pairs
3233
3234 def get_partially_configured_hosts(self):
3235 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003236 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003237 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003238 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003239
3240 def get_conflicting_hosts(self):
3241 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003242 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003243 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003244 if None not in (i1, i2) and i1 != i2)
3245
3246 def get_duplicated_hosts(self):
3247 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003248 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003249
3250 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3251 'chromium.googlesource.com': 'chromium.org',
3252 'chrome-internal.googlesource.com': 'google.com',
3253 }
3254
3255 def get_hosts_with_wrong_identities(self):
3256 """Finds hosts which **likely** reference wrong identities.
3257
3258 Note: skips hosts which have conflicting identities for Git and Gerrit.
3259 """
3260 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003261 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003262 pair = self._get_git_gerrit_identity_pairs().get(host)
3263 if pair and pair[0] == pair[1]:
3264 _, domain = self._parse_identity(pair[0])
3265 if domain != expected:
3266 hosts.add(host)
3267 return hosts
3268
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003269 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003270 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003271 hosts = sorted(hosts)
3272 assert hosts
3273 if extra_column_func is None:
3274 extras = [''] * len(hosts)
3275 else:
3276 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003277 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3278 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003279 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003280 lines.append(tmpl % he)
3281 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003282
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003283 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003284 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003285 yield ('.googlesource.com wildcard record detected',
3286 ['Chrome Infrastructure team recommends to list full host names '
3287 'explicitly.'],
3288 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003289
3290 dups = self.get_duplicated_hosts()
3291 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003292 yield ('The following hosts were defined twice',
3293 self._format_hosts(dups),
3294 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003295
3296 partial = self.get_partially_configured_hosts()
3297 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003298 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3299 'These hosts are missing',
3300 self._format_hosts(partial, lambda host: 'but %s defined' %
3301 self._get_counterpart_host(host)),
3302 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003303
3304 conflicting = self.get_conflicting_hosts()
3305 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003306 yield ('The following Git hosts have differing credentials from their '
3307 'Gerrit counterparts',
3308 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3309 tuple(self._get_git_gerrit_identity_pairs()[host])),
3310 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003311
3312 wrong = self.get_hosts_with_wrong_identities()
3313 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003314 yield ('These hosts likely use wrong identity',
3315 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3316 (self._get_git_gerrit_identity_pairs()[host][0],
3317 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3318 wrong)
3319
3320 def find_and_report_problems(self):
3321 """Returns True if there was at least one problem, else False."""
3322 found = False
3323 bad_hosts = set()
3324 for title, sublines, hosts in self._find_problems():
3325 if not found:
3326 found = True
3327 print('\n\n.gitcookies problem report:\n')
3328 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003329 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003330 if sublines:
3331 print()
3332 print(' %s' % '\n '.join(sublines))
3333 print()
3334
3335 if bad_hosts:
3336 assert found
3337 print(' You can manually remove corresponding lines in your %s file and '
3338 'visit the following URLs with correct account to generate '
3339 'correct credential lines:\n' %
3340 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3341 print(' %s' % '\n '.join(sorted(set(
3342 gerrit_util.CookiesAuthenticator().get_new_password_url(
3343 self._canonical_git_googlesource_host(host))
3344 for host in bad_hosts
3345 ))))
3346 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003347
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003348
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003349@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003350def CMDcreds_check(parser, args):
3351 """Checks credentials and suggests changes."""
3352 _, _ = parser.parse_args(args)
3353
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003354 # Code below checks .gitcookies. Abort if using something else.
3355 authn = gerrit_util.Authenticator.get()
3356 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3357 if isinstance(authn, gerrit_util.GceAuthenticator):
3358 DieWithError(
3359 'This command is not designed for GCE, are you on a bot?\n'
3360 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3361 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003362 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003363 'This command is not designed for bot environment. It checks '
3364 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003365
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003366 checker = _GitCookiesChecker()
3367 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003368
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003369 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003370 checker.print_current_creds(include_netrc=True)
3371
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003372 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003373 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003374 return 0
3375 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003376
3377
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003378@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003379def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003380 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003381 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
Edward Lemur85153282020-02-14 22:06:29 +00003382 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003383 _, args = parser.parse_args(args)
3384 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003385 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003386 return RunGit(['config', 'branch.%s.base-url' % branch],
3387 error_ok=False).strip()
3388 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003389 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003390 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3391 error_ok=False).strip()
3392
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003393
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003394def color_for_status(status):
3395 """Maps a Changelist status to color, for CMDstatus and other tools."""
3396 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003397 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003398 'waiting': Fore.BLUE,
3399 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003400 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003401 'lgtm': Fore.GREEN,
3402 'commit': Fore.MAGENTA,
3403 'closed': Fore.CYAN,
3404 'error': Fore.WHITE,
3405 }.get(status, Fore.WHITE)
3406
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003407
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003408def get_cl_statuses(changes, fine_grained, max_processes=None):
3409 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003410
3411 If fine_grained is true, this will fetch CL statuses from the server.
3412 Otherwise, simply indicate if there's a matching url for the given branches.
3413
3414 If max_processes is specified, it is used as the maximum number of processes
3415 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3416 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003417
3418 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003419 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003420 if not changes:
3421 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003422
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003423 if not fine_grained:
3424 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003425 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003426 for cl in changes:
3427 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003428 return
3429
3430 # First, sort out authentication issues.
3431 logging.debug('ensuring credentials exist')
3432 for cl in changes:
3433 cl.EnsureAuthenticated(force=False, refresh=True)
3434
3435 def fetch(cl):
3436 try:
3437 return (cl, cl.GetStatus())
3438 except:
3439 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003440 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003441 raise
3442
3443 threads_count = len(changes)
3444 if max_processes:
3445 threads_count = max(1, min(threads_count, max_processes))
3446 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3447
3448 pool = ThreadPool(threads_count)
3449 fetched_cls = set()
3450 try:
3451 it = pool.imap_unordered(fetch, changes).__iter__()
3452 while True:
3453 try:
3454 cl, status = it.next(timeout=5)
3455 except multiprocessing.TimeoutError:
3456 break
3457 fetched_cls.add(cl)
3458 yield cl, status
3459 finally:
3460 pool.close()
3461
3462 # Add any branches that failed to fetch.
3463 for cl in set(changes) - fetched_cls:
3464 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003465
rmistry@google.com2dd99862015-06-22 12:22:18 +00003466
3467def upload_branch_deps(cl, args):
3468 """Uploads CLs of local branches that are dependents of the current branch.
3469
3470 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003471
3472 test1 -> test2.1 -> test3.1
3473 -> test3.2
3474 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003475
3476 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3477 run on the dependent branches in this order:
3478 test2.1, test3.1, test3.2, test2.2, test3.3
3479
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003480 Note: This function does not rebase your local dependent branches. Use it
3481 when you make a change to the parent branch that will not conflict
3482 with its dependent branches, and you would like their dependencies
3483 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003484 """
3485 if git_common.is_dirty_git_tree('upload-branch-deps'):
3486 return 1
3487
3488 root_branch = cl.GetBranch()
3489 if root_branch is None:
3490 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3491 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003492 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003493 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3494 'patchset dependencies without an uploaded CL.')
3495
3496 branches = RunGit(['for-each-ref',
3497 '--format=%(refname:short) %(upstream:short)',
3498 'refs/heads'])
3499 if not branches:
3500 print('No local branches found.')
3501 return 0
3502
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003503 # Create a dictionary of all local branches to the branches that are
3504 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003505 tracked_to_dependents = collections.defaultdict(list)
3506 for b in branches.splitlines():
3507 tokens = b.split()
3508 if len(tokens) == 2:
3509 branch_name, tracked = tokens
3510 tracked_to_dependents[tracked].append(branch_name)
3511
vapiera7fbd5a2016-06-16 09:17:49 -07003512 print()
3513 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003514 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003515
rmistry@google.com2dd99862015-06-22 12:22:18 +00003516 def traverse_dependents_preorder(branch, padding=''):
3517 dependents_to_process = tracked_to_dependents.get(branch, [])
3518 padding += ' '
3519 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003520 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003521 dependents.append(dependent)
3522 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003523
rmistry@google.com2dd99862015-06-22 12:22:18 +00003524 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003525 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003526
3527 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003528 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003529 return 0
3530
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003531 confirm_or_exit('This command will checkout all dependent branches and run '
3532 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003533
rmistry@google.com2dd99862015-06-22 12:22:18 +00003534 # Record all dependents that failed to upload.
3535 failures = {}
3536 # Go through all dependents, checkout the branch and upload.
3537 try:
3538 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003539 print()
3540 print('--------------------------------------')
3541 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003542 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003543 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003544 try:
3545 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003546 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003547 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003548 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003549 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003550 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003551 finally:
3552 # Swap back to the original root branch.
3553 RunGit(['checkout', '-q', root_branch])
3554
vapiera7fbd5a2016-06-16 09:17:49 -07003555 print()
3556 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003557 for dependent_branch in dependents:
3558 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003559 print(' %s : %s' % (dependent_branch, upload_status))
3560 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003561
3562 return 0
3563
3564
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003565def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3566 """Given a proposed tag name, returns a tag name that is guaranteed to be
3567 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3568 or 'foo-3', and so on."""
3569
3570 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3571 for suffix_num in itertools.count(1):
3572 if suffix_num == 1:
3573 to_check = proposed_tag
3574 else:
3575 to_check = '%s-%d' % (proposed_tag, suffix_num)
3576
3577 if to_check not in existing_tags:
3578 return to_check
3579
3580
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003581@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003582def CMDarchive(parser, args):
3583 """Archives and deletes branches associated with closed changelists."""
3584 parser.add_option(
3585 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003586 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003587 parser.add_option(
3588 '-f', '--force', action='store_true',
3589 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003590 parser.add_option(
3591 '-d', '--dry-run', action='store_true',
3592 help='Skip the branch tagging and removal steps.')
3593 parser.add_option(
3594 '-t', '--notags', action='store_true',
3595 help='Do not tag archived branches. '
3596 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003597
kmarshall3bff56b2016-06-06 18:31:47 -07003598 options, args = parser.parse_args(args)
3599 if args:
3600 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003601
3602 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3603 if not branches:
3604 return 0
3605
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003606 tags = RunGit(['for-each-ref', '--format=%(refname)',
3607 'refs/tags']).splitlines() or []
3608 tags = [t.split('/')[-1] for t in tags]
3609
vapiera7fbd5a2016-06-16 09:17:49 -07003610 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003611 changes = [Changelist(branchref=b)
3612 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003613 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3614 statuses = get_cl_statuses(changes,
3615 fine_grained=True,
3616 max_processes=options.maxjobs)
3617 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003618 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3619 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003620 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003621 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003622 proposal.sort()
3623
3624 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003625 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003626 return 0
3627
Edward Lemur85153282020-02-14 22:06:29 +00003628 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003629
vapiera7fbd5a2016-06-16 09:17:49 -07003630 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003631 if options.notags:
3632 for next_item in proposal:
3633 print(' ' + next_item[0])
3634 else:
3635 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3636 for next_item in proposal:
3637 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003638
kmarshall9249e012016-08-23 12:02:16 -07003639 # Quit now on precondition failure or if instructed by the user, either
3640 # via an interactive prompt or by command line flags.
3641 if options.dry_run:
3642 print('\nNo changes were made (dry run).\n')
3643 return 0
3644 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003645 print('You are currently on a branch \'%s\' which is associated with a '
3646 'closed codereview issue, so archive cannot proceed. Please '
3647 'checkout another branch and run this command again.' %
3648 current_branch)
3649 return 1
kmarshall9249e012016-08-23 12:02:16 -07003650 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003651 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3652 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003653 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003654 return 1
3655
3656 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003657 if not options.notags:
3658 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003659
3660 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3661 # Clean up the tag if we failed to delete the branch.
3662 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003663
vapiera7fbd5a2016-06-16 09:17:49 -07003664 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003665
3666 return 0
3667
3668
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003669@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003670def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003671 """Show status of changelists.
3672
3673 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003674 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003675 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003676 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003677 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003678 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003679 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003680 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003681
3682 Also see 'git cl comments'.
3683 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003684 parser.add_option(
3685 '--no-branch-color',
3686 action='store_true',
3687 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003688 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003689 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003690 parser.add_option('-f', '--fast', action='store_true',
3691 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003692 parser.add_option(
3693 '-j', '--maxjobs', action='store', type=int,
3694 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003695 parser.add_option(
3696 '-i', '--issue', type=int,
3697 help='Operate on this issue instead of the current branch\'s implicit '
3698 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003699 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003700 if args:
3701 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003702
iannuccie53c9352016-08-17 14:40:40 -07003703 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003704 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003705
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003706 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003707 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003708 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003709 if cl.GetIssue():
3710 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003711 elif options.field == 'id':
3712 issueid = cl.GetIssue()
3713 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003714 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003715 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003716 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003717 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003718 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003719 elif options.field == 'status':
3720 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003721 elif options.field == 'url':
3722 url = cl.GetIssueURL()
3723 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003724 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003725 return 0
3726
3727 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3728 if not branches:
3729 print('No local branch found.')
3730 return 0
3731
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003732 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003733 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003734 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003735 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003736 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003737 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003738 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003739
Edward Lemur85153282020-02-14 22:06:29 +00003740 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003741
3742 def FormatBranchName(branch, colorize=False):
3743 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3744 an asterisk when it is the current branch."""
3745
3746 asterisk = ""
3747 color = Fore.RESET
3748 if branch == current_branch:
3749 asterisk = "* "
3750 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003751 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003752
3753 if colorize:
3754 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003755 return asterisk + branch_name
3756
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003757 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003758
3759 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003760 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3761 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003762 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003763 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003764 branch_statuses[c.GetBranch()] = status
3765 status = branch_statuses.pop(branch)
3766 url = cl.GetIssueURL()
3767 if url and (not status or status == 'error'):
3768 # The issue probably doesn't exist anymore.
3769 url += ' (broken)'
3770
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003771 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003772 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003773 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003774 color = ''
3775 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003776 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003777
Alan Cuttera3be9a52019-03-04 18:50:33 +00003778 branch_display = FormatBranchName(branch)
3779 padding = ' ' * (alignment - len(branch_display))
3780 if not options.no_branch_color:
3781 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003782
Alan Cuttera3be9a52019-03-04 18:50:33 +00003783 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3784 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003785
vapiera7fbd5a2016-06-16 09:17:49 -07003786 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003787 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003788 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003789 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003790 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003791 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003792 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003793 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003794 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003795 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003796 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003797 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003798 return 0
3799
3800
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003801def colorize_CMDstatus_doc():
3802 """To be called once in main() to add colors to git cl status help."""
3803 colors = [i for i in dir(Fore) if i[0].isupper()]
3804
3805 def colorize_line(line):
3806 for color in colors:
3807 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003808 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003809 indent = len(line) - len(line.lstrip(' ')) + 1
3810 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3811 return line
3812
3813 lines = CMDstatus.__doc__.splitlines()
3814 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3815
3816
phajdan.jre328cf92016-08-22 04:12:17 -07003817def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003818 if path == '-':
3819 json.dump(contents, sys.stdout)
3820 else:
3821 with open(path, 'w') as f:
3822 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003823
3824
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003825@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003826@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003827def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003828 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003829
3830 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003831 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003832 parser.add_option('-r', '--reverse', action='store_true',
3833 help='Lookup the branch(es) for the specified issues. If '
3834 'no issues are specified, all branches with mapped '
3835 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003836 parser.add_option('--json',
3837 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003838 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003839
dnj@chromium.org406c4402015-03-03 17:22:28 +00003840 if options.reverse:
3841 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003842 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003843 # Reverse issue lookup.
3844 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003845
3846 git_config = {}
3847 for config in RunGit(['config', '--get-regexp',
3848 r'branch\..*issue']).splitlines():
3849 name, _space, val = config.partition(' ')
3850 git_config[name] = val
3851
dnj@chromium.org406c4402015-03-03 17:22:28 +00003852 for branch in branches:
Edward Lemur85153282020-02-14 22:06:29 +00003853 config_key = _git_branch_config_key(scm.GIT.ShortBranchName(branch),
Edward Lemur52969c92020-02-06 18:15:28 +00003854 Changelist.IssueConfigKey())
3855 issue = git_config.get(config_key)
3856 if issue:
3857 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003858 if not args:
3859 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003860 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003861 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003862 try:
3863 issue_num = int(issue)
3864 except ValueError:
3865 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003866 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003867 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003868 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003869 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003870 if options.json:
3871 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003872 return 0
3873
3874 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003875 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003876 if not issue.valid:
3877 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3878 'or no argument to list it.\n'
3879 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003880 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003881 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003882 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003883 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003884 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3885 if options.json:
3886 write_json(options.json, {
3887 'issue': cl.GetIssue(),
3888 'issue_url': cl.GetIssueURL(),
3889 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003890 return 0
3891
3892
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003893@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003894def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003895 """Shows or posts review comments for any changelist."""
3896 parser.add_option('-a', '--add-comment', dest='comment',
3897 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003898 parser.add_option('-p', '--publish', action='store_true',
3899 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003900 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003901 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003902 parser.add_option('-m', '--machine-readable', dest='readable',
3903 action='store_false', default=True,
3904 help='output comments in a format compatible with '
3905 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003906 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003907 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003908 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003909
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003910 issue = None
3911 if options.issue:
3912 try:
3913 issue = int(options.issue)
3914 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003915 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003916
Edward Lemur934836a2019-09-09 20:16:54 +00003917 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003918
3919 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003920 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003921 return 0
3922
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003923 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3924 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003925 for comment in summary:
3926 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003927 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003928 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003929 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003930 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003931 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003932 elif comment.autogenerated:
3933 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003934 else:
3935 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003936 print('\n%s%s %s%s\n%s' % (
3937 color,
3938 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3939 comment.sender,
3940 Fore.RESET,
3941 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3942
smut@google.comc85ac942015-09-15 16:34:43 +00003943 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003944 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003945 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003946 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3947 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003948 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003949 return 0
3950
3951
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003952@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003953@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003954def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003955 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003956 parser.add_option('-d', '--display', action='store_true',
3957 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003958 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003959 help='New description to set for this issue (- for stdin, '
3960 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003961 parser.add_option('-f', '--force', action='store_true',
3962 help='Delete any unpublished Gerrit edits for this issue '
3963 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003964
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003965 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003966
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003967 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003968 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003969 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003970 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003971 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003972
Edward Lemur934836a2019-09-09 20:16:54 +00003973 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003974 if target_issue_arg:
3975 kwargs['issue'] = target_issue_arg.issue
3976 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003977
3978 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003979 if not cl.GetIssue():
3980 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003981
Edward Lemur678a6842019-10-03 22:25:05 +00003982 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003983 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003984
Edward Lemur6c6827c2020-02-06 21:15:18 +00003985 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003986
smut@google.com34fb6b12015-07-13 20:03:26 +00003987 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003988 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003989 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003990
3991 if options.new_description:
3992 text = options.new_description
3993 if text == '-':
3994 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003995 elif text == '+':
3996 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00003997 text = cl.GetLocalDescription(base_branch)
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003998
3999 description.set_description(text)
4000 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004001 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004002 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004003 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004004 return 0
4005
4006
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004007@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004008def CMDlint(parser, args):
4009 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004010 parser.add_option('--filter', action='append', metavar='-x,+y',
4011 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004012 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004013
4014 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004015 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004016 try:
4017 import cpplint
4018 import cpplint_chromium
4019 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004020 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004021 return 1
4022
4023 # Change the current working directory before calling lint so that it
4024 # shows the correct base.
4025 previous_cwd = os.getcwd()
4026 os.chdir(settings.GetRoot())
4027 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004028 cl = Changelist()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004029 change = cl.GetChange(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004030 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004031 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004032 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004033 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004034
4035 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004036 command = args + files
4037 if options.filter:
4038 command = ['--filter=' + ','.join(options.filter)] + command
4039 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004040
4041 white_regex = re.compile(settings.GetLintRegex())
4042 black_regex = re.compile(settings.GetLintIgnoreRegex())
4043 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4044 for filename in filenames:
4045 if white_regex.match(filename):
4046 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004047 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004048 else:
4049 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4050 extra_check_functions)
4051 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004052 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004053 finally:
4054 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004055 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004056 if cpplint._cpplint_state.error_count != 0:
4057 return 1
4058 return 0
4059
4060
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004061@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004062def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004063 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004064 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004065 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004066 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004067 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004068 parser.add_option('--all', action='store_true',
4069 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004070 parser.add_option('--parallel', action='store_true',
4071 help='Run all tests specified by input_api.RunTests in all '
4072 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004073 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004074
sbc@chromium.org71437c02015-04-09 19:29:40 +00004075 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004076 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004077 return 1
4078
Edward Lemur934836a2019-09-09 20:16:54 +00004079 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004080 if args:
4081 base_branch = args[0]
4082 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004083 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004084 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004085
Aaron Gable8076c282017-11-29 14:39:41 -08004086 if options.all:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004087 base_change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004088 files = [('M', f) for f in base_change.AllFiles()]
4089 change = presubmit_support.GitChange(
4090 base_change.Name(),
4091 base_change.FullDescriptionText(),
4092 base_change.RepositoryRoot(),
4093 files,
4094 base_change.issue,
4095 base_change.patchset,
4096 base_change.author_email,
4097 base_change._upstream)
4098 else:
Edward Lemur7f6dec02020-02-06 20:23:58 +00004099 change = cl.GetChange(base_branch)
Aaron Gable8076c282017-11-29 14:39:41 -08004100
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004101 cl.RunHook(
4102 committing=not options.upload,
4103 may_prompt=False,
4104 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004105 change=change,
4106 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004107 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004108
4109
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004110def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004111 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004112
4113 Works the same way as
4114 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4115 but can be called on demand on all platforms.
4116
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004117 The basic idea is to generate git hash of a state of the tree, original
4118 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004119 """
4120 lines = []
4121 tree_hash = RunGitSilent(['write-tree'])
4122 lines.append('tree %s' % tree_hash.strip())
4123 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4124 if code == 0:
4125 lines.append('parent %s' % parent.strip())
4126 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4127 lines.append('author %s' % author.strip())
4128 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4129 lines.append('committer %s' % committer.strip())
4130 lines.append('')
4131 # Note: Gerrit's commit-hook actually cleans message of some lines and
4132 # whitespace. This code is not doing this, but it clearly won't decrease
4133 # entropy.
4134 lines.append(message)
4135 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004136 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004137 return 'I%s' % change_hash.strip()
4138
4139
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004140def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004141 """Computes the remote branch ref to use for the CL.
4142
4143 Args:
4144 remote (str): The git remote for the CL.
4145 remote_branch (str): The git remote branch for the CL.
4146 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004147 """
4148 if not (remote and remote_branch):
4149 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004150
wittman@chromium.org455dc922015-01-26 20:15:50 +00004151 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004152 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004153 # refs, which are then translated into the remote full symbolic refs
4154 # below.
4155 if '/' not in target_branch:
4156 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4157 else:
4158 prefix_replacements = (
4159 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4160 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4161 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4162 )
4163 match = None
4164 for regex, replacement in prefix_replacements:
4165 match = re.search(regex, target_branch)
4166 if match:
4167 remote_branch = target_branch.replace(match.group(0), replacement)
4168 break
4169 if not match:
4170 # This is a branch path but not one we recognize; use as-is.
4171 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004172 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4173 # Handle the refs that need to land in different refs.
4174 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004175
wittman@chromium.org455dc922015-01-26 20:15:50 +00004176 # Create the true path to the remote branch.
4177 # Does the following translation:
4178 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4179 # * refs/remotes/origin/master -> refs/heads/master
4180 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4181 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4182 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4183 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4184 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4185 'refs/heads/')
4186 elif remote_branch.startswith('refs/remotes/branch-heads'):
4187 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004188
wittman@chromium.org455dc922015-01-26 20:15:50 +00004189 return remote_branch
4190
4191
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004192def cleanup_list(l):
4193 """Fixes a list so that comma separated items are put as individual items.
4194
4195 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4196 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4197 """
4198 items = sum((i.split(',') for i in l), [])
4199 stripped_items = (i.strip() for i in items)
4200 return sorted(filter(None, stripped_items))
4201
4202
Aaron Gable4db38df2017-11-03 14:59:07 -07004203@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004204@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004205def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004206 """Uploads the current changelist to codereview.
4207
4208 Can skip dependency patchset uploads for a branch by running:
4209 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004210 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004211 git config --unset branch.branch_name.skip-deps-uploads
4212 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004213
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004214 If the name of the checked out branch starts with "bug-" or "fix-" followed
4215 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004216 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004217
4218 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004219 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004220 [git-cl] add support for hashtags
4221 Foo bar: implement foo
4222 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004223 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004224 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4225 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004226 parser.add_option('--bypass-watchlists', action='store_true',
4227 dest='bypass_watchlists',
4228 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004229 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004230 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004231 parser.add_option('--message', '-m', dest='message',
4232 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004233 parser.add_option('-b', '--bug',
4234 help='pre-populate the bug number(s) for this issue. '
4235 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004236 parser.add_option('--message-file', dest='message_file',
4237 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004238 parser.add_option('--title', '-t', dest='title',
4239 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004240 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004241 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004242 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004243 parser.add_option('--tbrs',
4244 action='append', default=[],
4245 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004246 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004247 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004248 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004249 parser.add_option('--hashtag', dest='hashtags',
4250 action='append', default=[],
4251 help=('Gerrit hashtag for new CL; '
4252 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004253 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004254 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004255 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004256 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004257 metavar='TARGET',
4258 help='Apply CL to remote ref TARGET. ' +
4259 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004260 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004261 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004262 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004263 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004264 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004265 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004266 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4267 const='TBR', help='add a set of OWNERS to TBR')
4268 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4269 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004270 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004271 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004272 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004273 'implies --send-mail')
4274 parser.add_option('-d', '--cq-dry-run',
4275 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004276 help='Send the patchset to do a CQ dry run right after '
4277 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004278 parser.add_option('--preserve-tryjobs', action='store_true',
4279 help='instruct the CQ to let tryjobs running even after '
4280 'new patchsets are uploaded instead of canceling '
4281 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004282 parser.add_option('--dependencies', action='store_true',
4283 help='Uploads CLs of all the local branches that depend on '
4284 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004285 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4286 help='Sends your change to the CQ after an approval. Only '
4287 'works on repos that have the Auto-Submit label '
4288 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004289 parser.add_option('--parallel', action='store_true',
4290 help='Run all tests specified by input_api.RunTests in all '
4291 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004292 parser.add_option('--no-autocc', action='store_true',
4293 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004294 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004295 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004296 parser.add_option('-R', '--retry-failed', action='store_true',
4297 help='Retry failed tryjobs from old patchset immediately '
4298 'after uploading new patchset. Cannot be used with '
4299 '--use-commit-queue or --cq-dry-run.')
4300 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4301 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004302 parser.add_option('--fixed', '-x',
4303 help='List of bugs that will be commented on and marked '
4304 'fixed (pre-populates "Fixed:" tag). Same format as '
4305 '-b option / "Bug:" tag. If fixing several issues, '
4306 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004307 parser.add_option('--edit-description', action='store_true', default=False,
4308 help='Modify description before upload. Cannot be used '
4309 'with --force. It is a noop when --no-squash is set '
4310 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004311
rmistry@google.com2dd99862015-06-22 12:22:18 +00004312 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004313 (options, args) = parser.parse_args(args)
4314
sbc@chromium.org71437c02015-04-09 19:29:40 +00004315 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004316 return 1
4317
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004318 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004319 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004320 options.cc = cleanup_list(options.cc)
4321
Josipe827b0f2020-01-30 00:07:20 +00004322 if options.edit_description and options.force:
4323 parser.error('Only one of --force and --edit-description allowed')
4324
tandriib80458a2016-06-23 12:20:07 -07004325 if options.message_file:
4326 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004327 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004328 options.message = gclient_utils.FileRead(options.message_file)
4329 options.message_file = None
4330
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004331 if ([options.cq_dry_run,
4332 options.use_commit_queue,
4333 options.retry_failed].count(True) > 1):
4334 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4335 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004336
Aaron Gableedbc4132017-09-11 13:22:28 -07004337 if options.use_commit_queue:
4338 options.send_mail = True
4339
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004340 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4341 settings.GetIsGerrit()
4342
Edward Lemur934836a2019-09-09 20:16:54 +00004343 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004344 # Warm change details cache now to avoid RPCs later, reducing latency for
4345 # developers.
4346 if cl.GetIssue():
4347 cl._GetChangeDetail(
4348 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4349
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004350 if options.retry_failed and not cl.GetIssue():
4351 print('No previous patchsets, so --retry-failed has no effect.')
4352 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004353
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004354 # cl.GetMostRecentPatchset uses cached information, and can return the last
4355 # patchset before upload. Calling it here makes it clear that it's the
4356 # last patchset before upload. Note that GetMostRecentPatchset will fail
4357 # if no CL has been uploaded yet.
4358 if options.retry_failed:
4359 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004360
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004361 ret = cl.CMDUpload(options, args, orig_args)
4362
4363 if options.retry_failed:
4364 if ret != 0:
4365 print('Upload failed, so --retry-failed has no effect.')
4366 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004367 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004368 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004369 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004370 if len(buckets) == 0:
4371 print('No failed tryjobs, so --retry-failed has no effect.')
4372 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004373 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004374
4375 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004376
4377
Francois Dorayd42c6812017-05-30 15:10:20 -04004378@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004379@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004380def CMDsplit(parser, args):
4381 """Splits a branch into smaller branches and uploads CLs.
4382
4383 Creates a branch and uploads a CL for each group of files modified in the
4384 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004385 comment, '$directory' is replaced with the directory containing the changes
4386 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4387 sending out, and '$num_cls' is replaced with the total number of CLs that
4388 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004389 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004390 parser.add_option('-d', '--description', dest='description_file',
4391 help='A text file containing a CL description in which '
4392 '$directory will be replaced by each CL\'s directory.')
4393 parser.add_option('-c', '--comment', dest='comment_file',
4394 help='A text file containing a CL comment.')
4395 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004396 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004397 help='List the files and reviewers for each CL that would '
4398 'be created, but don\'t create branches or CLs.')
4399 parser.add_option('--cq-dry-run', action='store_true',
4400 help='If set, will do a cq dry run for each uploaded CL. '
4401 'Please be careful when doing this; more than ~10 CLs '
4402 'has the potential to overload our build '
4403 'infrastructure. Try to upload these not during high '
4404 'load times (usually 11-3 Mountain View time). Email '
4405 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004406 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4407 default=True,
4408 help='Sends your change to the CQ after an approval. Only '
4409 'works on repos that have the Auto-Submit label '
4410 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004411 options, _ = parser.parse_args(args)
4412
4413 if not options.description_file:
4414 parser.error('No --description flag specified.')
4415
4416 def WrappedCMDupload(args):
4417 return CMDupload(OptionParser(), args)
4418
4419 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004420 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004421 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004422
4423
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004424@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004425@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004426def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004427 """DEPRECATED: Used to commit the current changelist via git-svn."""
4428 message = ('git-cl no longer supports committing to SVN repositories via '
4429 'git-svn. You probably want to use `git cl land` instead.')
4430 print(message)
4431 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004432
4433
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004434@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004435@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004436def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004437 """Commits the current changelist via git.
4438
4439 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4440 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004441 """
4442 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4443 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004444 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004445 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004446 parser.add_option('--parallel', action='store_true',
4447 help='Run all tests specified by input_api.RunTests in all '
4448 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004449 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004450
Edward Lemur934836a2019-09-09 20:16:54 +00004451 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004452
Robert Iannucci2e73d432018-03-14 01:10:47 -07004453 if not cl.GetIssue():
4454 DieWithError('You must upload the change first to Gerrit.\n'
4455 ' If you would rather have `git cl land` upload '
4456 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004457 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004458 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004459
4460
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004461@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004462@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004463def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004464 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004465 parser.add_option('-b', dest='newbranch',
4466 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004467 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004468 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004469 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004470 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004471
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004472 group = optparse.OptionGroup(
4473 parser,
4474 'Options for continuing work on the current issue uploaded from a '
4475 'different clone (e.g. different machine). Must be used independently '
4476 'from the other options. No issue number should be specified, and the '
4477 'branch must have an issue number associated with it')
4478 group.add_option('--reapply', action='store_true', dest='reapply',
4479 help='Reset the branch and reapply the issue.\n'
4480 'CAUTION: This will undo any local changes in this '
4481 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004482
4483 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004484 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004485 parser.add_option_group(group)
4486
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004487 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004488
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004489 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004490 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004491 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004492 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004493 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004494
Edward Lemur934836a2019-09-09 20:16:54 +00004495 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004496 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004497 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004498
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004499 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004500 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004501 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004502
4503 RunGit(['reset', '--hard', upstream])
4504 if options.pull:
4505 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004506
Edward Lemur678a6842019-10-03 22:25:05 +00004507 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4508 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004509
4510 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004511 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004512
Edward Lemurf38bc172019-09-03 21:02:13 +00004513 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004514 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004515 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004516
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004517 # We don't want uncommitted changes mixed up with the patch.
4518 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004519 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004520
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004521 if options.newbranch:
4522 if options.force:
4523 RunGit(['branch', '-D', options.newbranch],
4524 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004525 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004526
Edward Lemur678a6842019-10-03 22:25:05 +00004527 cl = Changelist(
4528 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004529
Edward Lemur678a6842019-10-03 22:25:05 +00004530 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004531 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004532
Edward Lemurf38bc172019-09-03 21:02:13 +00004533 return cl.CMDPatchWithParsedIssue(
4534 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004535
4536
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004537def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004538 """Fetches the tree status and returns either 'open', 'closed',
4539 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004540 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004541 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004542 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004543 if status.find('closed') != -1 or status == '0':
4544 return 'closed'
4545 elif status.find('open') != -1 or status == '1':
4546 return 'open'
4547 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004548 return 'unset'
4549
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004550
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004551def GetTreeStatusReason():
4552 """Fetches the tree status from a json url and returns the message
4553 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004554 url = settings.GetTreeStatusUrl()
4555 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004556 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004557 status = json.loads(connection.read())
4558 connection.close()
4559 return status['message']
4560
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004561
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004562@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004563def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004564 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004565 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004566 status = GetTreeStatus()
4567 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004568 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004569 return 2
4570
vapiera7fbd5a2016-06-16 09:17:49 -07004571 print('The tree is %s' % status)
4572 print()
4573 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004574 if status != 'open':
4575 return 1
4576 return 0
4577
4578
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004579@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004580def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004581 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4582 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004583 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004584 '-b', '--bot', action='append',
4585 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4586 'times to specify multiple builders. ex: '
4587 '"-b win_rel -b win_layout". See '
4588 'the try server waterfall for the builders name and the tests '
4589 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004590 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004591 '-B', '--bucket', default='',
4592 help=('Buildbucket bucket to send the try requests.'))
4593 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004594 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004595 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004596 'be determined by the try recipe that builder runs, which usually '
4597 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004598 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004599 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004600 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004601 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004602 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004603 '--category', default='git_cl_try', help='Specify custom build category.')
4604 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004605 '--project',
4606 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004607 'in recipe to determine to which repository or directory to '
4608 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004609 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004610 '-p', '--property', dest='properties', action='append', default=[],
4611 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004612 'key2=value2 etc. The value will be treated as '
4613 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004614 'NOTE: using this may make your tryjob not usable for CQ, '
4615 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004616 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004617 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4618 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004619 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004620 parser.add_option(
4621 '-R', '--retry-failed', action='store_true', default=False,
4622 help='Retry failed jobs from the latest set of tryjobs. '
4623 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004624 parser.add_option(
4625 '-i', '--issue', type=int,
4626 help='Operate on this issue instead of the current branch\'s implicit '
4627 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004628 options, args = parser.parse_args(args)
4629
machenbach@chromium.org45453142015-09-15 08:45:22 +00004630 # Make sure that all properties are prop=value pairs.
4631 bad_params = [x for x in options.properties if '=' not in x]
4632 if bad_params:
4633 parser.error('Got properties with missing "=": %s' % bad_params)
4634
maruel@chromium.org15192402012-09-06 12:38:29 +00004635 if args:
4636 parser.error('Unknown arguments: %s' % args)
4637
Edward Lemur934836a2019-09-09 20:16:54 +00004638 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004639 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004640 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004641
Edward Lemurf38bc172019-09-03 21:02:13 +00004642 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004643 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004644
tandriie113dfd2016-10-11 10:20:12 -07004645 error_message = cl.CannotTriggerTryJobReason()
4646 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004647 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004648
Quinten Yearsley983111f2019-09-26 17:18:48 +00004649 if options.retry_failed:
4650 if options.bot or options.bucket:
4651 print('ERROR: The option --retry-failed is not compatible with '
4652 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4653 return 1
4654 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004655 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004656 if options.verbose:
4657 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004658 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004659 if not buckets:
4660 print('There are no failed jobs in the latest set of jobs '
4661 '(patchset #%d), doing nothing.' % patchset)
4662 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004663 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004664 if num_builders > 10:
4665 confirm_or_exit('There are %d builders with failed builds.'
4666 % num_builders, action='continue')
4667 else:
4668 buckets = _get_bucket_map(cl, options, parser)
4669 if buckets and any(b.startswith('master.') for b in buckets):
4670 print('ERROR: Buildbot masters are not supported.')
4671 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004672
qyearsleydd49f942016-10-28 11:57:22 -07004673 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4674 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004675 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004676 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004677 print('git cl try with no bots now defaults to CQ dry run.')
4678 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4679 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004680
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004681 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004682 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004683 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004684 'of bot requires an initial job from a parent (usually a builder). '
4685 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004686 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004687 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004688
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004689 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004690 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004691 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004692 except BuildbucketResponseException as ex:
4693 print('ERROR: %s' % ex)
4694 return 1
4695 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004696
4697
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004698@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004699def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004700 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004701 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004702 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004703 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004704 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004705 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004706 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004707 '--color', action='store_true', default=setup_color.IS_TTY,
4708 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004709 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004710 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4711 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004712 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004713 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004714 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004715 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004716 parser.add_option(
4717 '-i', '--issue', type=int,
4718 help='Operate on this issue instead of the current branch\'s implicit '
4719 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004720 options, args = parser.parse_args(args)
4721 if args:
4722 parser.error('Unrecognized args: %s' % ' '.join(args))
4723
Edward Lemur934836a2019-09-09 20:16:54 +00004724 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004725 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004726 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004727
tandrii221ab252016-10-06 08:12:04 -07004728 patchset = options.patchset
4729 if not patchset:
4730 patchset = cl.GetMostRecentPatchset()
4731 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004732 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004733 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004734 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004735 cl.GetIssue())
4736
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004737 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004738 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004739 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004740 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004741 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004742 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004743 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004744 else:
4745 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004746 return 0
4747
4748
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004749@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004750@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004751def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004752 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004753 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004754 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004755 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004756
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004757 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004758 if args:
4759 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004760 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004761 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004762 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004763 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004764
4765 # Clear configured merge-base, if there is one.
4766 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004767 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004768 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004769 return 0
4770
4771
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004772@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004773def CMDweb(parser, args):
4774 """Opens the current CL in the web browser."""
4775 _, args = parser.parse_args(args)
4776 if args:
4777 parser.error('Unrecognized args: %s' % ' '.join(args))
4778
4779 issue_url = Changelist().GetIssueURL()
4780 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004781 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004782 return 1
4783
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004784 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004785 # allows us to hide the "Created new window in existing browser session."
4786 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004787 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004788 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004789 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004790 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004791 os.open(os.devnull, os.O_RDWR)
4792 try:
4793 webbrowser.open(issue_url)
4794 finally:
4795 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004796 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004797 return 0
4798
4799
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004800@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004801def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004802 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004803 parser.add_option('-d', '--dry-run', action='store_true',
4804 help='trigger in dry run mode')
4805 parser.add_option('-c', '--clear', action='store_true',
4806 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004807 parser.add_option(
4808 '-i', '--issue', type=int,
4809 help='Operate on this issue instead of the current branch\'s implicit '
4810 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004811 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004812 if args:
4813 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004814 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004815 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004816
Edward Lemur934836a2019-09-09 20:16:54 +00004817 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004818 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004819 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004820 elif options.dry_run:
4821 state = _CQState.DRY_RUN
4822 else:
4823 state = _CQState.COMMIT
4824 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004825 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004826 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004827 return 0
4828
4829
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004830@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004831def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004832 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004833 parser.add_option(
4834 '-i', '--issue', type=int,
4835 help='Operate on this issue instead of the current branch\'s implicit '
4836 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004837 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004838 if args:
4839 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004840 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004841 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004842 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004843 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004844 cl.CloseIssue()
4845 return 0
4846
4847
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004848@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004849def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004850 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004851 parser.add_option(
4852 '--stat',
4853 action='store_true',
4854 dest='stat',
4855 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004856 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004857 if args:
4858 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004859
Edward Lemur934836a2019-09-09 20:16:54 +00004860 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004861 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004862 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004863 if not issue:
4864 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004865
Aaron Gablea718c3e2017-08-28 17:47:28 -07004866 base = cl._GitGetBranchConfigValue('last-upload-hash')
4867 if not base:
4868 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4869 if not base:
4870 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4871 revision_info = detail['revisions'][detail['current_revision']]
4872 fetch_info = revision_info['fetch']['http']
4873 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4874 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004875
Aaron Gablea718c3e2017-08-28 17:47:28 -07004876 cmd = ['git', 'diff']
4877 if options.stat:
4878 cmd.append('--stat')
4879 cmd.append(base)
4880 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004881
4882 return 0
4883
4884
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004885@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004886def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004887 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004888 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004889 '--ignore-current',
4890 action='store_true',
4891 help='Ignore the CL\'s current reviewers and start from scratch.')
4892 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004893 '--ignore-self',
4894 action='store_true',
4895 help='Do not consider CL\'s author as an owners.')
4896 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004897 '--no-color',
4898 action='store_true',
4899 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004900 parser.add_option(
4901 '--batch',
4902 action='store_true',
4903 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004904 # TODO: Consider moving this to another command, since other
4905 # git-cl owners commands deal with owners for a given CL.
4906 parser.add_option(
4907 '--show-all',
4908 action='store_true',
4909 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004910 options, args = parser.parse_args(args)
4911
4912 author = RunGit(['config', 'user.email']).strip() or None
4913
Edward Lemur934836a2019-09-09 20:16:54 +00004914 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004915
Yang Guo6e269a02019-06-26 11:17:02 +00004916 if options.show_all:
4917 for arg in args:
4918 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemur7f6dec02020-02-06 20:23:58 +00004919 database = owners.Database(settings.GetRoot(), file, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004920 database.load_data_needed_for([arg])
4921 print('Owners for %s:' % arg)
4922 for owner in sorted(database.all_possible_owners([arg], None)):
4923 print(' - %s' % owner)
4924 return 0
4925
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004926 if args:
4927 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004928 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004929 base_branch = args[0]
4930 else:
4931 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004932 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004933
Edward Lemur7f6dec02020-02-06 20:23:58 +00004934 change = cl.GetChange(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004935 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4936
4937 if options.batch:
4938 db = owners.Database(change.RepositoryRoot(), file, os.path)
4939 print('\n'.join(db.reviewers_for(affected_files, author)))
4940 return 0
4941
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004942 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004943 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004944 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004945 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004946 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004947 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004948 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004949 override_files=change.OriginalOwnersFiles(),
4950 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004951
4952
Aiden Bennerc08566e2018-10-03 17:52:42 +00004953def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004954 """Generates a diff command."""
4955 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004956 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4957
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004958 if allow_prefix:
4959 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4960 # case that diff.noprefix is set in the user's git config.
4961 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4962 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004963 diff_cmd += ['--no-prefix']
4964
4965 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004966
4967 if args:
4968 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004969 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004970 diff_cmd.append(arg)
4971 else:
4972 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004973
4974 return diff_cmd
4975
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004976
Jamie Madill5e96ad12020-01-13 16:08:35 +00004977def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4978 """Runs clang-format-diff and sets a return value if necessary."""
4979
4980 if not clang_diff_files:
4981 return 0
4982
4983 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4984 # formatted. This is used to block during the presubmit.
4985 return_value = 0
4986
4987 # Locate the clang-format binary in the checkout
4988 try:
4989 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4990 except clang_format.NotFoundError as e:
4991 DieWithError(e)
4992
4993 if opts.full or settings.GetFormatFullByDefault():
4994 cmd = [clang_format_tool]
4995 if not opts.dry_run and not opts.diff:
4996 cmd.append('-i')
4997 if opts.dry_run:
4998 for diff_file in clang_diff_files:
4999 with open(diff_file, 'r') as myfile:
5000 code = myfile.read().replace('\r\n', '\n')
5001 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5002 stdout = stdout.replace('\r\n', '\n')
5003 if opts.diff:
5004 sys.stdout.write(stdout)
5005 if code != stdout:
5006 return_value = 2
5007 else:
5008 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5009 if opts.diff:
5010 sys.stdout.write(stdout)
5011 else:
5012 env = os.environ.copy()
5013 env['PATH'] = str(os.path.dirname(clang_format_tool))
5014 try:
5015 script = clang_format.FindClangFormatScriptInChromiumTree(
5016 'clang-format-diff.py')
5017 except clang_format.NotFoundError as e:
5018 DieWithError(e)
5019
5020 cmd = [sys.executable, script, '-p0']
5021 if not opts.dry_run and not opts.diff:
5022 cmd.append('-i')
5023
5024 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5025 diff_output = RunGit(diff_cmd)
5026
5027 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5028 if opts.diff:
5029 sys.stdout.write(stdout)
5030 if opts.dry_run and len(stdout) > 0:
5031 return_value = 2
5032
5033 return return_value
5034
5035
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005036def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005037 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005038 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005039
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005040
enne@chromium.org555cfe42014-01-29 18:21:39 +00005041@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005042@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005043def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005044 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005045 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005046 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005047 parser.add_option('--full', action='store_true',
5048 help='Reformat the full content of all touched files')
5049 parser.add_option('--dry-run', action='store_true',
5050 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005051 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005052 '--no-clang-format',
5053 dest='clang_format',
5054 action='store_false',
5055 default=True,
5056 help='Disables formatting of various file types using clang-format.')
5057 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005058 '--python',
5059 action='store_true',
5060 default=None,
5061 help='Enables python formatting on all python files.')
5062 parser.add_option(
5063 '--no-python',
5064 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005065 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005066 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005067 'If neither --python or --no-python are set, python files that have a '
5068 '.style.yapf file in an ancestor directory will be formatted. '
5069 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005070 parser.add_option(
5071 '--js',
5072 action='store_true',
5073 help='Format javascript code with clang-format. '
5074 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005075 parser.add_option('--diff', action='store_true',
5076 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005077 parser.add_option('--presubmit', action='store_true',
5078 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005079 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005080
Garrett Beaty91a6f332020-01-06 16:57:24 +00005081 if opts.python is not None and opts.no_python:
5082 raise parser.error('Cannot set both --python and --no-python')
5083 if opts.no_python:
5084 opts.python = False
5085
Daniel Chengc55eecf2016-12-30 03:11:02 -08005086 # Normalize any remaining args against the current path, so paths relative to
5087 # the current directory are still resolved as expected.
5088 args = [os.path.join(os.getcwd(), arg) for arg in args]
5089
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005090 # git diff generates paths against the root of the repository. Change
5091 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005092 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005093 if rel_base_path:
5094 os.chdir(rel_base_path)
5095
digit@chromium.org29e47272013-05-17 17:01:46 +00005096 # Grab the merge-base commit, i.e. the upstream commit of the current
5097 # branch when it was created or the last time it was rebased. This is
5098 # to cover the case where the user may have called "git fetch origin",
5099 # moving the origin branch to a newer commit, but hasn't rebased yet.
5100 upstream_commit = None
5101 cl = Changelist()
5102 upstream_branch = cl.GetUpstreamBranch()
5103 if upstream_branch:
5104 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5105 upstream_commit = upstream_commit.strip()
5106
5107 if not upstream_commit:
5108 DieWithError('Could not find base commit for this branch. '
5109 'Are you in detached state?')
5110
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005111 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5112 diff_output = RunGit(changed_files_cmd)
5113 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005114 # Filter out files deleted by this CL
5115 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005116
Andreas Haas417d89c2020-02-06 10:24:27 +00005117 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005118 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005119
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005120 clang_diff_files = []
5121 if opts.clang_format:
5122 clang_diff_files = [
5123 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5124 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005125 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5126 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005127 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005128
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005129 top_dir = os.path.normpath(
5130 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5131
Jamie Madill5e96ad12020-01-13 16:08:35 +00005132 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5133 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005134
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005135 # Similar code to above, but using yapf on .py files rather than clang-format
5136 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005137 py_explicitly_disabled = opts.python is not None and not opts.python
5138 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005139 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5140 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5141 if sys.platform.startswith('win'):
5142 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005143
Aiden Bennerc08566e2018-10-03 17:52:42 +00005144 # Used for caching.
5145 yapf_configs = {}
5146 for f in python_diff_files:
5147 # Find the yapf style config for the current file, defaults to depot
5148 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005149 _FindYapfConfigFile(f, yapf_configs, top_dir)
5150
5151 # Turn on python formatting by default if a yapf config is specified.
5152 # This breaks in the case of this repo though since the specified
5153 # style file is also the global default.
5154 if opts.python is None:
5155 filtered_py_files = []
5156 for f in python_diff_files:
5157 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5158 filtered_py_files.append(f)
5159 else:
5160 filtered_py_files = python_diff_files
5161
5162 # Note: yapf still seems to fix indentation of the entire file
5163 # even if line ranges are specified.
5164 # See https://github.com/google/yapf/issues/499
5165 if not opts.full and filtered_py_files:
5166 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5167
Brian Sheedyb4307d52019-12-02 19:18:17 +00005168 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5169 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5170 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005171
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005172 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005173 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5174 # Default to pep8 if not .style.yapf is found.
5175 if not yapf_style:
5176 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005177
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005178 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005179
5180 has_formattable_lines = False
5181 if not opts.full:
5182 # Only run yapf over changed line ranges.
5183 for diff_start, diff_len in py_line_diffs[f]:
5184 diff_end = diff_start + diff_len - 1
5185 # Yapf errors out if diff_end < diff_start but this
5186 # is a valid line range diff for a removal.
5187 if diff_end >= diff_start:
5188 has_formattable_lines = True
5189 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5190 # If all line diffs were removals we have nothing to format.
5191 if not has_formattable_lines:
5192 continue
5193
5194 if opts.diff or opts.dry_run:
5195 cmd += ['--diff']
5196 # Will return non-zero exit code if non-empty diff.
5197 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5198 if opts.diff:
5199 sys.stdout.write(stdout)
5200 elif len(stdout) > 0:
5201 return_value = 2
5202 else:
5203 cmd += ['-i']
5204 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005205
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005206 # Dart's formatter does not have the nice property of only operating on
5207 # modified chunks, so hard code full.
5208 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005209 try:
5210 command = [dart_format.FindDartFmtToolInChromiumTree()]
5211 if not opts.dry_run and not opts.diff:
5212 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005213 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005214
ppi@chromium.org6593d932016-03-03 15:41:15 +00005215 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005216 if opts.dry_run and stdout:
5217 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005218 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005219 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5220 'found in this checkout. Files in other languages are still '
5221 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005222
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005223 # Format GN build files. Always run on full build files for canonical form.
5224 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005225 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005226 if opts.dry_run or opts.diff:
5227 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005228 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005229 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5230 shell=sys.platform == 'win32',
5231 cwd=top_dir)
5232 if opts.dry_run and gn_ret == 2:
5233 return_value = 2 # Not formatted.
5234 elif opts.diff and gn_ret == 2:
5235 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005236 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005237 elif gn_ret != 0:
5238 # For non-dry run cases (and non-2 return values for dry-run), a
5239 # nonzero error code indicates a failure, probably because the file
5240 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005241 DieWithError('gn format failed on ' + gn_diff_file +
5242 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005243
Ilya Shermane081cbe2017-08-15 17:51:04 -07005244 # Skip the metrics formatting from the global presubmit hook. These files have
5245 # a separate presubmit hook that issues an error if the files need formatting,
5246 # whereas the top-level presubmit script merely issues a warning. Formatting
5247 # these files is somewhat slow, so it's important not to duplicate the work.
5248 if not opts.presubmit:
5249 for xml_dir in GetDirtyMetricsDirs(diff_files):
5250 tool_dir = os.path.join(top_dir, xml_dir)
5251 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5252 if opts.dry_run or opts.diff:
5253 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005254 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005255 if opts.diff:
5256 sys.stdout.write(stdout)
5257 if opts.dry_run and stdout:
5258 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005259
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005260 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005261
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005262
Steven Holte2e664bf2017-04-21 13:10:47 -07005263def GetDirtyMetricsDirs(diff_files):
5264 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5265 metrics_xml_dirs = [
5266 os.path.join('tools', 'metrics', 'actions'),
5267 os.path.join('tools', 'metrics', 'histograms'),
5268 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005269 os.path.join('tools', 'metrics', 'ukm'),
5270 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005271 for xml_dir in metrics_xml_dirs:
5272 if any(file.startswith(xml_dir) for file in xml_diff_files):
5273 yield xml_dir
5274
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005275
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005276@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005277@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005278def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005279 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005280 _, args = parser.parse_args(args)
5281
5282 if len(args) != 1:
5283 parser.print_help()
5284 return 1
5285
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005286 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005287 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005288 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005289
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005290 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005291
Edward Lemur52969c92020-02-06 18:15:28 +00005292 issueprefix = Changelist.IssueConfigKey()
5293 output = RunGit(['config', '--local', '--get-regexp',
5294 r'branch\..*\.%s' % issueprefix],
5295 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005296
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005297 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005298 for key, issue in [x.split() for x in output.splitlines()]:
5299 if issue == target_issue:
5300 branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key))
5301
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005302 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005303 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005304 return 1
5305 if len(branches) == 1:
5306 RunGit(['checkout', branches[0]])
5307 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005308 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005309 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005310 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005311 which = raw_input('Choose by index: ')
5312 try:
5313 RunGit(['checkout', branches[int(which)]])
5314 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005315 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005316 return 1
5317
5318 return 0
5319
5320
maruel@chromium.org29404b52014-09-08 22:58:00 +00005321def CMDlol(parser, args):
5322 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005323 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005324 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5325 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5326 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005327 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005328 return 0
5329
5330
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005331class OptionParser(optparse.OptionParser):
5332 """Creates the option parse and add --verbose support."""
5333 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005334 optparse.OptionParser.__init__(
5335 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005336 self.add_option(
5337 '-v', '--verbose', action='count', default=0,
5338 help='Use 2 times for more debugging info')
5339
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005340 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005341 try:
5342 return self._parse_args(args)
5343 finally:
5344 # Regardless of success or failure of args parsing, we want to report
5345 # metrics, but only after logging has been initialized (if parsing
5346 # succeeded).
5347 global settings
5348 settings = Settings()
5349
5350 if not metrics.DISABLE_METRICS_COLLECTION:
5351 # GetViewVCUrl ultimately calls logging method.
5352 project_url = settings.GetViewVCUrl().strip('/+')
5353 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5354 metrics.collector.add('project_urls', [project_url])
5355
5356 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005357 # Create an optparse.Values object that will store only the actual passed
5358 # options, without the defaults.
5359 actual_options = optparse.Values()
5360 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5361 # Create an optparse.Values object with the default options.
5362 options = optparse.Values(self.get_default_values().__dict__)
5363 # Update it with the options passed by the user.
5364 options._update_careful(actual_options.__dict__)
5365 # Store the options passed by the user in an _actual_options attribute.
5366 # We store only the keys, and not the values, since the values can contain
5367 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005368 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005369
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005370 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005371 logging.basicConfig(
5372 level=levels[min(options.verbose, len(levels) - 1)],
5373 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5374 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005375
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005376 return options, args
5377
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005378
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005379def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005380 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005381 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005382 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005383 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005384
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005385 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005386 dispatcher = subcommand.CommandDispatcher(__name__)
5387 try:
5388 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005389 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005390 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005391 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005392 if e.code != 500:
5393 raise
5394 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005395 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005396 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005397 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005398
5399
5400if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005401 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5402 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005403 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005404 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005405 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005406 sys.exit(main(sys.argv[1:]))